Cleanup:

- Rename Declaration and related classes to UpdateColumn etc. 

h2/src/tools/org/h2/jaqu/Query.java

@@ -32,7 +32,7 @@ public class Query<T> {
     private Db db;
     private SelectTable<T> from;
     private ArrayList<Token> conditions = Utils.newArrayList();
-    private ArrayList<Declaration> declarations = Utils.newArrayList();
+    private ArrayList<UpdateColumn> declarations = Utils.newArrayList();
     private ArrayList<SelectTable<?>> joins = Utils.newArrayList();
     private final IdentityHashMap<Object, SelectColumn<T>> aliasMap = Utils.newIdentityHashMap();
     private ArrayList<OrderExpression<T>> orderByList = Utils.newArrayList();
@@ -121,14 +121,14 @@ public class Query<T> {
         return stat.executeUpdate();
     }
 
-    public <A> SetColumn<T, A> set(A field) {
+    public <A> UpdateColumnSet<T, A> set(A field) {
         int renameSetColumnClassToUpdateSetColumn;
-        return new SetColumn<T, A>(this, field);
+        return new UpdateColumnSet<T, A>(this, field);
     }
 
-    public <A> IncrementColumn<T, A> increment(A field) {
+    public <A> UpdateColumnIncrement<T, A> increment(A field) {
         int renameIncrementColumnClassToUpdateIncrementColumn;
-        return new IncrementColumn<T, A>(this, field);
+        return new UpdateColumnIncrement<T, A>(this, field);
     }
 
     public int update() {
@@ -140,7 +140,7 @@ public class Query<T> {
         from.appendSQL(stat);
         stat.appendSQL(" SET ");
         int i = 0;
-        for (Declaration declaration : declarations) {
+        for (UpdateColumn declaration : declarations) {
             if (i++ > 0) {
                 stat.appendSQL(", ");
             }
@@ -329,7 +329,7 @@ public class Query<T> {
         conditions.add(condition);
     }
 
-    void addDeclarationToken(Declaration declaration) {
+    void addDeclarationToken(UpdateColumn declaration) {
         int todoWhatIsDeclaration;
         declarations.add(declaration);
     }

h2/src/tools/org/h2/jaqu/Declaration.java → h2/src/tools/org/h2/jaqu/UpdateColumn.java

@@ -10,9 +10,7 @@ package org.h2.jaqu;
  * Classes implementing this interface can be used as a declaration in an
  * update statement.
  */
-public interface Declaration {
-
-    final static int renameClassToUpdateDeclaration = 0;
+public interface UpdateColumn {
 
     /**
      * Append the SQL to the given statement using the given query.

h2/src/tools/org/h2/jaqu/IncrementColumn.java → h2/src/tools/org/h2/jaqu/UpdateColumnIncrement.java

@@ -7,19 +7,19 @@
 package org.h2.jaqu;
 
 /**
- * This class represents "SET column = (column + 1)" in an UPDATE statement.
+ * This class represents "SET column = (column + x)" in an UPDATE statement.
  *
  * @param <T> the query type
  * @param <A> the new value data type
  */
 //## Java 1.5 begin ##
-public class IncrementColumn<T, A> implements Declaration {
+public class UpdateColumnIncrement<T, A> implements UpdateColumn {
 
     private Query<T> query;
     private A x;
     private A y;
 
-    IncrementColumn(Query<T> query, A x) {
+    UpdateColumnIncrement(Query<T> query, A x) {
         this.query = query;
         this.x = x;
     }

h2/src/tools/org/h2/jaqu/SetColumn.java → h2/src/tools/org/h2/jaqu/UpdateColumnSet.java

@@ -13,13 +13,13 @@ package org.h2.jaqu;
  * @param <A> the new value data type
  */
 //## Java 1.5 begin ##
-public class SetColumn<T, A> implements Declaration {
+public class UpdateColumnSet<T, A> implements UpdateColumn {
 
     private Query<T> query;
     private A x;
     private A y;
 
-    SetColumn(Query<T> query, A x) {
+    UpdateColumnSet(Query<T> query, A x) {
         this.query = query;
         this.x = x;
     }