Projects >> realm-java >>0ee86ce2d94272b9f8031f0e033a304edce5b115

Chunk
Conflicting content 
        //TODO optimizeExample();
        //TODO setIndexExample();
        //TODO hasIndexExample();
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


        // Columns methods: 
        adjustExample();




=======
        
        // Columns methods: 
        addColumnExample();
        removeColumnExample();
        renameColumnExample();
        getColumnCountExample();
        getColumnNameExample();
        getColumnIndexExample();
        getColumnTypeExample();
        
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
        // Rows methods:
        addAtExample();
        addAtExample();
Solution content 
        //TODO optimizeExample();
        //TODO setIndexExample();
        //TODO hasIndexExample();


        // Columns methods: 
        adjustExample();


        // Rows methods:
        addAtExample();
        addAtExample();
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
        removeLastExample();
        addEmptyRowExample();
        addEmptyRowsExample();
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
        adjustExample();
        
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
        // Cells methods:
        getExamples();
        setExamples();
Solution content 
        removeLastExample();
        addEmptyRowExample();
        addEmptyRowsExample();


        // Cells methods:
        getExamples();
        setExamples();
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        setExamples();
        //TODO getSubtableSize();
        //TODO clearSubtable
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
        
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
        // Searching methods:
        findFirstExamples();
        findAllExample();
Solution content 
        setExamples();
        //TODO getSubtableSize();
        //TODO clearSubtable

        
        // Searching methods:
        findFirstExamples();
        findAllExample();
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    // Constructor methods
    // ******************************************
    
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
=======
    public static void isValidExample(){
        // @@Example: ex_java_dyn_table_is_valid @@
        // @@Show@@
        // Open a group from file
        Group fromFile = new Group( /* filepath.tightdb */);
        
        // Get table from group
        Table table = fromFile.getTable("peopleTable");
        
        // Group is closed
        fromFile.close();
        
        if( table.isValid()) {
           long size = table.size();
        } else {
            System.out.println("Group has been closed, table is no longer valid");
        }
        // @@EndShow@@
        // @@EndExample@@
    }
    
    
    public static void sizeExample(){
        // @@Example: ex_java_dyn_table_size @@
        // @@Show@@
        // Creates table with 2 columns
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java

    public static void constrcutorExample(){
        // @@Example: ex_java_dyn_table_constructor_plain @@
Solution content 
    // Constructor methods
    // ******************************************
    
    
    public static void constrcutorExample(){
        // @@Example: ex_java_dyn_table_constructor_plain @@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    }
    

<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
=======
        // Table.size is now 0
        Assert(table.size() == 0);
        // Table is empty
        Assert(table.isEmpty());
        // @@EndShow@@
        // @@EndExample@@
    }
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    // ******************************************
    // Table schema methods
    // ******************************************
Solution content 
    }
    


    
    

    
    // ******************************************
    // Table schema methods
    // ******************************************
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


    // ******************************************
    // Table methods
    // ******************************************



    public static void isValidExample(){
        // @@Example: ex_java_dyn_table_is_valid @@
        // @@Show@@
        // Open a group from file
        Group fromFile = new Group( /* filepath.tightdb */);

        // Get table from group
        Table table = fromFile.getTable("peopleTable");

        // Group is closed
        fromFile.close();

        if( table.isValid()) {
            long size = table.size();
        } else {
            System.out.println("Group has been closed, table is no longer valid");
        }
        // @@EndShow@@
        // @@EndExample@@
    }


    public static void sizeExample(){
        // @@Example: ex_java_dyn_table_size @@
        // @@Show@@
        // Creates table with 2 columns
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");

        // Add data to the table
        table.add(100, "Washington");
        table.add(200, "Los Angeles");

        // 2 rows have been added
        Assert(table.size() == 2);
        // @@EndShow@@
        // @@EndExample@@
    }


    public static void isEmptyExample(){
        // @@Example: ex_java_dyn_table_is_empty @@
        // @@Show@@
        // Creates table with 2 columns
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");

        // No data has been added to the table
        // Table is empty
        Assert(table.isEmpty());

        // Table.size is 0
        Assert(table.size() == 0);
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void clearExample(){
        // @@Example: ex_java_dyn_table_clear @@
        // @@Show@@
        // Create table with 2 columns and add data
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");
        table.add(100, "Washington");
        table.add(200, "Los Angeles");

        // Remove all rows in table
        table.clear();

        // Table.size is now 0
        Assert(table.size() == 0);
        // Table is empty
        Assert(table.isEmpty());
        // @@EndExample@@
    }




    // ******************************************
    // Columns methods
    // ******************************************


    public static void adjustExample(){
        // @@Example: ex_java_dyn_table_adjust @@
        // @@Show@@
        // Create table with 2 columns and add data
        Table table = new Table();
        table.addColumn(ColumnType.STRING, "username");
        table.addColumn(ColumnType.INTEGER, "score");
        table.add("user1", 420);
        table.add("user2", 770);

        // Reward all users 100 extra points using the adjust method
        table.adjust(1, 100);

        // Check that all scores are increased by 100
        Assert(table.getLong(1, 0) == 520);
        Assert(table.getLong(1, 1) == 870);
        // @@EndShow@@
        // @@EndExample@@
    }



=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    // ******************************************
    // Rows methods
    // ******************************************
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }


    // ******************************************
    // Table methods
    // ******************************************



    public static void isValidExample(){
        // @@Example: ex_java_dyn_table_is_valid @@
        // @@Show@@
        // Open a group from file
        Group fromFile = new Group( /* filepath.tightdb */);

        // Get table from group
        Table table = fromFile.getTable("peopleTable");

        // Group is closed
        fromFile.close();

        if( table.isValid()) {
            long size = table.size();
        } else {
            System.out.println("Group has been closed, table is no longer valid");
        }
        // @@EndShow@@
        // @@EndExample@@
    }


    public static void sizeExample(){
        // @@Example: ex_java_dyn_table_size @@
        // @@Show@@
        // Creates table with 2 columns
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");

        // Add data to the table
        table.add(100, "Washington");
        table.add(200, "Los Angeles");

        // 2 rows have been added
        Assert(table.size() == 2);
        // @@EndShow@@
        // @@EndExample@@
    }


    public static void isEmptyExample(){
        // @@Example: ex_java_dyn_table_is_empty @@
        // @@Show@@
        // Creates table with 2 columns
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");

        // No data has been added to the table
        // Table is empty
        Assert(table.isEmpty());

        // Table.size is 0
        Assert(table.size() == 0);
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void clearExample(){
        // @@Example: ex_java_dyn_table_clear @@
        // @@Show@@
        // Create table with 2 columns and add data
        Table table = new Table();
        table.addColumn(ColumnType.INTEGER, "ID");
        table.addColumn(ColumnType.STRING, "City");
        table.add(100, "Washington");
        table.add(200, "Los Angeles");

        // Remove all rows in table
        table.clear();

        // Table.size is now 0
        Assert(table.size() == 0);
        // Table is empty
        Assert(table.isEmpty());
        // @@EndShow@@
        // @@EndExample@@
    }




    // ******************************************
    // Columns methods
    // ******************************************


    public static void adjustExample(){
        // @@Example: ex_java_dyn_table_adjust @@
        // @@Show@@
        // Create table with 2 columns and add data
        Table table = new Table();
        table.addColumn(ColumnType.STRING, "username");
        table.addColumn(ColumnType.INTEGER, "score");
        table.add("user1", 420);
        table.add("user2", 770);

        // Reward all users 100 extra points using the adjust method
        table.adjust(1, 100);

        // Check that all scores are increased by 100
        Assert(table.getLong(1, 0) == 520);
        Assert(table.getLong(1, 1) == 870);
        // @@EndShow@@
        // @@EndExample@@
    }




    // ******************************************
    // Rows methods
    // ******************************************
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void addEmptyRowExample(){
        // @@Example: ex_java_dyn_table_add_empty_row @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void addEmptyRowExample(){
        // @@Example: ex_java_dyn_table_add_empty_row @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void addEmptyRowsExample(){
        // @@Example: ex_java_dyn_table_add_empty_rows @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void addEmptyRowsExample(){
        // @@Example: ex_java_dyn_table_add_empty_rows @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void setRowExample(){
        // @@Example: ex_java_dyn_table_set_row @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void setRowExample(){
        // @@Example: ex_java_dyn_table_set_row @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java



    /*public static void getSubtableSizeExample(){ }*/

    /*public static void clearSubtableExample(){ }*/



=======
    
    /*public static void getSubtableSizeExample(){ }*/

    /*public static void clearSubtableExample(){ }*/
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    // ******************************************
    // Searching methods
    // ******************************************
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    
    /*public static void getSubtableSizeExample(){ }*/

    /*public static void clearSubtableExample(){ }*/
    
    // ******************************************
    // Searching methods
    // ******************************************
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
        // @@EndExample@@
    }

<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java

=======
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void getDistinctViewExample(){
        // @@Example: ex_java_dyn_table_get_distinct_view @@
        // @@Show@@
Solution content 
        // @@EndExample@@
    }

    public static void getDistinctViewExample(){
        // @@Example: ex_java_dyn_table_get_distinct_view @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void whereExample(){
        // @@Example: ex_java_dyn_table_where @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void whereExample(){
        // @@Example: ex_java_dyn_table_where @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        
        table.add("user1", 420, false);
        table.add("user2", 770, true);
        table.add("user3", 327, false);
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
        table.add("user4", 770, false);
        table.add("user5", 564, true);
        table.add("user6", 875, false);
        table.add("user7", 420, true);
        table.add("user8", 770, true);

        // Get a query from the table
        TableQuery query = table.where();

        // USe the query object to query the table and get a table view with the results
        TableView view = query.equalTo(2, false).findAll();
        // @@EndShow@@
        // @@EndExample@@
    }



=======
        
        // where() returns a Query
        TableQuery query = table.where();
        // You can continue to build the query
        // Here you want all the rows where
        // column 2 contains false, and column 1 > 400
        query = query.equalTo(2, false);
        query = query.greaterThan(1, 400);
        // Now execute the query, and get the results in a TableView
        TableView view = query.findAll();

        // Expect 1 match
        Assert(view.size() == 1);
        Assert(view.getString(0,0).equals("user3"));
        // @@EndShow@@
        // @@EndExample@@
    }
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    // ******************************************
    // Aggregates methods
    // ******************************************
Solution content 
    
        table.add("user1", 420, false);
        table.add("user2", 770, true);
        table.add("user3", 327, false);
        // where() returns a Query
        TableQuery query = table.where();
        
        // You can continue to build the query
        // Here you want all the rows where
        // column 2 contains false, and column 1 > 400
        query = query.equalTo(2, false);
        query = query.greaterThan(1, 400);
        // Now execute the query, and get the results in a TableView
        TableView view = query.findAll();

        // Expect 1 match
        Assert(view.size() == 1);
        Assert(view.getString(0,0).equals("user1"));
        // @@EndShow@@
        // @@EndExample@@
    }
    
    // ******************************************
    // Aggregates methods
    // ******************************************
File
DynTableExamples.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
        table.add("user4", 770, false);
        table.add("user5", 564, true);
        table.add("user6", 875, false);
        table.add("user7", 420, true);
        table.add("user8", 770, true);
=======
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java

        // The sum of all values in column 1
        long totalScore = table.sumInt(1);
Solution content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);

        // The sum of all values in column 1
        long totalScore = table.sumInt(1);
File
DynTableExamples.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java



=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void maximumExample(){
        // @@Example: ex_java_dyn_table_maximum @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void maximumExample(){
        // @@Example: ex_java_dyn_table_maximum @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
=======
        
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
        table.add("user4", 770, false);
        table.add("user5", 564, true);
        table.add("user6", 875, false);
        table.add("user7", 420, true);
        table.add("user8", 770, true);

>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
        // The maximum score in column 1
        long maxScore = table.maximumInt(1);
        // @@EndShow@@
Solution content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);

        // The maximum score in column 1
        long maxScore = table.maximumInt(1);
        // @@EndShow@@
File
DynTableExamples.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java


=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void minimumExample(){
        // @@Example: ex_java_dyn_table_minimum @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void minimumExample(){
        // @@Example: ex_java_dyn_table_minimum @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
        table.add("user4", 770, false);
        table.add("user5", 564, true);
        table.add("user6", 875, false);
        table.add("user7", 420, true);
        table.add("user8", 770, true);

=======
        
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
        // The minimum score in column 1
        long minScore = table.minimumInt(1);
        // @@EndShow@@
Solution content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);

        // The minimum score in column 1
        long minScore = table.minimumInt(1);
        // @@EndShow@@
File
DynTableExamples.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java



=======
    
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    public static void averageExample(){
        // @@Example: ex_java_dyn_table_average @@
        // @@Show@@
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    public static void averageExample(){
        // @@Example: ex_java_dyn_table_average @@
        // @@Show@@
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java
        table.add("user4", 770, false);
        table.add("user5", 564, true);
        table.add("user6", 875, false);
        table.add("user7", 420, true);
        table.add("user8", 770, true);

=======
        
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
        // The average score in column 1
        double avgScore = table.averageInt(1); // Returns a double
        // @@EndShow@@
Solution content 
        table.add("user1", 420, false);
        table.add("user2", 770, false);
        table.add("user3", 327, false);

        // The average score in column 1
        double avgScore = table.averageInt(1); // Returns a double
        // @@EndShow@@
File
DynTableExamples.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java




=======
   
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java
    // ******************************************
    // Dump methods
    // ******************************************
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    // ******************************************
    // Dump methods
    // ******************************************
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        // @@EndShow@@
        // @@EndExample@@
    }
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/DynTableExamples.java

=======
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/DynTableExamples.java

    static void Assert(boolean check) {
        if (!check) {
Solution content 
        // @@EndShow@@
        // @@EndExample@@
    }

    static void Assert(boolean check) {
        if (!check) {
File
DynTableExamples.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
public class SharedGroupIntro {

    public static void main(String[] args) {
<<<<<<< HEAD:doc/ref/examples/src/main/java/com/tightdb/refdoc/SharedGroupIntro.java

=======
        // Delete file to start from scratch
        (new File("mydatabase.tightdb")).delete();
        
>>>>>>> 54b18e1aec06e8e463fa2bb8ac1005fe68e95ec0:doc/ref/examples/src/com/tightdb/refdoc/SharedGroupIntro.java
        // @@Show@@
        // Opens an existing database file or creates a
        // new database file and opens it into a shared group.
Solution content 
        // @@Show@@
public class SharedGroupIntro {

    public static void main(String[] args) {
        // Delete file to start from scratch
        (new File("mydatabase.tightdb")).delete();     

        // Opens an existing database file or creates a
        // new database file and opens it into a shared group.
File
SharedGroupIntro.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation