Introduced query-only columns for all column types (issue #11).

src/main/java/com/tightdb/example/Example.java

@@ -11,28 +11,28 @@
 
 public class Example {
 
-	//@NestedTable
+	// @NestedTable
 	class phone {
 		String type;
 		String number;
 	}
 
-	//@Table
+	// @Table
 	class person {
 		String firstName;
 		String lastName;
 		int salary;
 		phone phones;
 	}
-	
+
 	public static void main(String[] args) {
 		PersonTable persons = new PersonTable();
 
-		Person john = persons.add("John", "Doe", 23000, true, new byte[] {1,2,3}, new Date(), "extra");
+		Person john = persons.add("John", "Doe", 23000, true, new byte[] { 1, 2, 3 }, new Date(), "extra");
 		john.phones.get().add("home", "123456");
 		john.phones.get().add("mobile", "333444");
 
-		persons.insert(0, "Nikolche", "Mihajlovski", 28000, false, new byte[] {4,5}, new Date(), 1234.56);
+		persons.insert(0, "Nikolche", "Mihajlovski", 28000, false, new byte[] { 4, 5 }, new Date(), 1234.56);
 
 		// 2 ways to get the value
 		String name1 = persons.at(0).firstName.get();
@@ -96,6 +96,7 @@ public static void main(String[] args) {
 		persons.firstName.is("d").salary.sum(); // no problem without OR
 		persons.firstName.is("X").or().salary.set(1234); // problem - incorrect
 															// options
+
 		persons.firstName.is("X").or().salary.is(23).salary.sum(); // correct,
 																	// shorter
 																	// (query-based)

src/main/java/com/tightdb/lib/AbstractColumn.java

@@ -4,7 +4,6 @@
 
 import com.tightdb.TableBase;
 
-
 public abstract class AbstractColumn<Type, Cursor, Query> {
 
 	protected final TableBase table;
@@ -26,8 +25,13 @@ public AbstractColumn(TableBase table, int index, String name) {
 		this.name = name;
 	}
 
-	public abstract Type get();
-	public abstract void set(Type value);
+	protected Type get() {
+		throw new UnsupportedOperationException("Cannot get the column's value!");
+	}
+
+	protected void set(Type value) {
+		throw new UnsupportedOperationException("Cannot set the column's value!");
+	}
 
 	public List<Type> all() {
 		return null;
@@ -49,9 +53,13 @@ public String toString() {
 	public String getName() {
 		return name;
 	}
-	
+
 	public String getReadable() {
-		return String.valueOf(get());
+		try {
+			return String.valueOf(get());
+		} catch (Exception e) {
+			return "ERROR!";
+		}
 	}
-	
+
 }

src/main/java/com/tightdb/lib/BinaryColumn.java

@@ -2,7 +2,7 @@
 
 import com.tightdb.TableBase;
 
-public class BinaryColumn<Cursor, Query> extends AbstractColumn<byte[], Cursor, Query> {
+public class BinaryColumn<Cursor, Query> extends BinaryQueryColumn<Cursor, Query> {
 
 	public BinaryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
 		super(table, cursor, index, name);

src/main/java/com/tightdb/lib/BinaryQueryColumn.java

@@ -0,0 +1,15 @@
+package com.tightdb.lib;
+
+import com.tightdb.TableBase;
+
+public class BinaryQueryColumn<Cursor, Query> extends AbstractColumn<byte[], Cursor, Query> {
+
+	public BinaryQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
+		super(table, cursor, index, name);
+	}
+
+	public BinaryQueryColumn(TableBase table, int index, String name) {
+		super(table, index, name);
+	}
+
+}

src/main/java/com/tightdb/lib/BooleanColumn.java

@@ -2,7 +2,7 @@
 
 import com.tightdb.TableBase;
 
-public class BooleanColumn<Cursor, Query> extends AbstractColumn<Boolean, Cursor, Query> {
+public class BooleanColumn<Cursor, Query> extends BooleanQueryColumn<Cursor, Query> {
 
 	public BooleanColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
 		super(table, cursor, index, name);

src/main/java/com/tightdb/lib/BooleanQueryColumn.java

@@ -0,0 +1,15 @@
+package com.tightdb.lib;
+
+import com.tightdb.TableBase;
+
+public class BooleanQueryColumn<Cursor, Query> extends AbstractColumn<Boolean, Cursor, Query> {
+
+	public BooleanQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
+		super(table, cursor, index, name);
+	}
+
+	public BooleanQueryColumn(TableBase table, int index, String name) {
+		super(table, index, name);
+	}
+
+}

src/main/java/com/tightdb/lib/DateColumn.java

@@ -5,8 +5,7 @@
 
 import com.tightdb.TableBase;
 
-
-public class DateColumn<Cursor, Query> extends AbstractColumn<Date, Cursor, Query> {
+public class DateColumn<Cursor, Query> extends DateQueryColumn<Cursor, Query> {
 
 	private static final DateFormat FORMATTER = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
 

src/main/java/com/tightdb/lib/DateQueryColumn.java

@@ -0,0 +1,17 @@
+package com.tightdb.lib;
+
+import java.util.Date;
+
+import com.tightdb.TableBase;
+
+public class DateQueryColumn<Cursor, Query> extends AbstractColumn<Date, Cursor, Query> {
+
+	public DateQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
+		super(table, cursor, index, name);
+	}
+
+	public DateQueryColumn(TableBase table, int index, String name) {
+		super(table, index, name);
+	}
+
+}

src/main/java/com/tightdb/lib/LongColumn.java

@@ -2,8 +2,7 @@
 
 import com.tightdb.TableBase;
 
-
-public class LongColumn<Cursor, Query> extends AbstractColumn<Long, Cursor, Query> {
+public class LongColumn<Cursor, Query> extends LongQueryColumn<Cursor, Query> {
 
 	public LongColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
 		super(table, cursor, index, name);
@@ -13,18 +12,6 @@ public LongColumn(TableBase table, int index, String name) {
 		super(table, index, name);
 	}
 
-	public Query greaterThan(int value) {
-		return null;
-	}
-
-	public Query lessThan(int value) {
-		return null;
-	}
-
-	public Query between(int from, int to) {
-		return null;
-	}
-
 	public int sum() {
 		return 0;
 	}
@@ -55,10 +42,6 @@ public void set(Long value) {
 		table.setLong(columnIndex, (int) cursor.getPosition(), value);
 	}
 
-	public Query is(long value) {
-		return null;
-	}
-
 	public void set(long value) {
 		set(Long.valueOf(value));
 	}

src/main/java/com/tightdb/lib/LongQueryColumn.java

@@ -0,0 +1,31 @@
+package com.tightdb.lib;
+
+import com.tightdb.TableBase;
+
+public class LongQueryColumn<Cursor, Query> extends AbstractColumn<Long, Cursor, Query> {
+
+	public LongQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
+		super(table, cursor, index, name);
+	}
+
+	public LongQueryColumn(TableBase table, int index, String name) {
+		super(table, index, name);
+	}
+
+	public Query greaterThan(int value) {
+		return null;
+	}
+
+	public Query lessThan(int value) {
+		return null;
+	}
+
+	public Query between(int from, int to) {
+		return null;
+	}
+
+	public Query is(long value) {
+		return null;
+	}
+
+}

src/main/java/com/tightdb/lib/MixedColumn.java

@@ -4,7 +4,7 @@
 
 import com.tightdb.TableBase;
 
-public class MixedColumn<Cursor, Query> extends AbstractColumn<Serializable, Cursor, Query> {
+public class MixedColumn<Cursor, Query> extends MixedQueryColumn<Cursor, Query> {
 
 	public MixedColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
 		super(table, cursor, index, name);

src/main/java/com/tightdb/lib/MixedQueryColumn.java

@@ -0,0 +1,17 @@
+package com.tightdb.lib;
+
+import java.io.Serializable;
+
+import com.tightdb.TableBase;
+
+public class MixedQueryColumn<Cursor, Query> extends AbstractColumn<Serializable, Cursor, Query> {
+
+	public MixedQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
+		super(table, cursor, index, name);
+	}
+
+	public MixedQueryColumn(TableBase table, int index, String name) {
+		super(table, index, name);
+	}
+
+}

src/main/java/com/tightdb/lib/StringColumn.java

@@ -2,8 +2,7 @@
 
 import com.tightdb.TableBase;
 
-
-public class StringColumn<Cursor, Query> extends AbstractColumn<String, Cursor, Query> {
+public class StringColumn<Cursor, Query> extends StringQueryColumn<Cursor, Query> {
 
 	public StringColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
 		super(table, cursor, index, name);

src/main/java/com/tightdb/lib/StringQueryColumn.java

@@ -0,0 +1,31 @@
+package com.tightdb.lib;
+
+import com.tightdb.TableBase;
+
+public class StringQueryColumn<Cursor, Query> extends AbstractColumn<String, Cursor, Query> {
+
+	public StringQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name) {
+		super(table, cursor, index, name);
+	}
+
+	public StringQueryColumn(TableBase table, int index, String name) {
+		super(table, index, name);
+	}
+
+	public Query startsWith(String value) {
+		return null;
+	}
+
+	public Query endWith(String value) {
+		return null;
+	}
+
+	public Query contains(String value) {
+		return null;
+	}
+
+	public Query matches(String regex) {
+		return null;
+	}
+
+}

src/main/java/com/tightdb/lib/TableColumn.java

@@ -2,26 +2,14 @@
 
 import com.tightdb.TableBase;
 
-public class TableColumn<Cursor, Query, Subtable> extends AbstractColumn<Subtable, Cursor, Query> {
-
-	private Subtable subtable;
+public class TableColumn<Cursor, Query, Subtable> extends TableQueryColumn<Cursor, Query, Subtable> {
 
 	public TableColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name, Class<Subtable> subtableClass) {
-		super(table, cursor, index, name);
-		try {
-			subtable = subtableClass.newInstance();
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot create subtable instance!", e);
-		}
+		super(table, cursor, index, name, subtableClass);
 	}
 
 	public TableColumn(TableBase table, int index, String name, Class<Subtable> subtableClass) {
-		super(table, index, name);
-		try {
-			subtable = subtableClass.newInstance();
-		} catch (Exception e) {
-			throw new RuntimeException("Cannot create subtable instance!", e);
-		}
+		super(table, index, name, subtableClass);
 	}
 
 	@Override
@@ -34,9 +22,4 @@ public void set(Subtable value) {
 		throw new UnsupportedOperationException(); // FIXME: implement this
 	}
 
-	@Override
-	public String getReadable() {
-		return "subtable";
-	}
-
 }

src/main/java/com/tightdb/lib/TableQueryColumn.java

@@ -0,0 +1,32 @@
+package com.tightdb.lib;
+
+import com.tightdb.TableBase;
+
+public class TableQueryColumn<Cursor, Query, Subtable> extends AbstractColumn<Subtable, Cursor, Query> {
+
+	protected Subtable subtable;
+
+	public TableQueryColumn(TableBase table, AbstractCursor<Cursor> cursor, int index, String name, Class<Subtable> subtableClass) {
+		super(table, cursor, index, name);
+		try {
+			subtable = subtableClass.newInstance();
+		} catch (Exception e) {
+			throw new RuntimeException("Cannot create subtable instance!", e);
+		}
+	}
+
+	public TableQueryColumn(TableBase table, int index, String name, Class<Subtable> subtableClass) {
+		super(table, index, name);
+		try {
+			subtable = subtableClass.newInstance();
+		} catch (Exception e) {
+			throw new RuntimeException("Cannot create subtable instance!", e);
+		}
+	}
+
+	@Override
+	public String getReadable() {
+		return "subtable";
+	}
+
+}