Cleanup:

- Mainly Javadoc changes.

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

-/*
- * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License, Version
- * 1.0, and under the Eclipse Public License, Version 1.0
- * (http://h2database.com/html/license.html). Initial Developer: James Moger
- */
-package org.h2.jaqu;
-
-import org.h2.jaqu.Table.JQDatabase;
-
-/**
- * Interface which defines a class to handle table changes based on model
- * versions. An implementation of <i>DbUpgrader</i> must be annotated with the
- * <i>JQDatabase</i> annotation, which defines the expected database version
- * number.
- */
-public interface DbUpgrader {
-
-    /**
-     * Defines method interface to handle database upgrades. This method is only
-     * called if your <i>DbUpgrader</i> implementation is annotated with
-     * JQDatabase.
-     *
-     * @param db the database
-     * @param fromVersion the old version
-     * @param toVersion the new version
-     * @return true for successful upgrade. If the upgrade is successful, the
-     *         version registry is automatically updated.
-     */
-    boolean upgradeDatabase(Db db, int fromVersion, int toVersion);
-
-    /**
-     * Defines method interface to handle table upgrades.
-     *
-     * @param db the database
-     * @param schema the schema
-     * @param table the table
-     * @param fromVersion the old version
-     * @param toVersion the new version
-     * @return true for successful upgrade. If the upgrade is successful, the
-     *         version registry is automatically updated.
-     */
-    boolean upgradeTable(Db db, String schema, String table, int fromVersion, int toVersion);
-
-    /**
-     * The default database upgrader. It throws runtime exception instead of
-     * handling upgrade requests.
-     */
-    @JQDatabase(version = 0)
-    public static class DefaultDbUpgrader implements DbUpgrader {
-
-        public boolean upgradeDatabase(Db db, int fromVersion, int toVersion) {
-            throw new RuntimeException("Please provide your own DbUpgrader implementation.");
-        }
-
-        public boolean upgradeTable(Db db, String schema, String table, int fromVersion, int toVersion) {
-            throw new RuntimeException("Please provide your own DbUpgrader implementation.");
-        }
-
-    }
-
-}
+/*
+ * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License, Version
+ * 1.0, and under the Eclipse Public License, Version 1.0
+ * (http://h2database.com/html/license.html). Initial Developer: James Moger
+ */
+package org.h2.jaqu;
+
+import org.h2.jaqu.Table.JQDatabase;
+
+/**
+ * Interface which defines a class to handle table changes based on model
+ * versions. An implementation of <i>DbUpgrader</i> must be annotated with the
+ * <i>JQDatabase</i> annotation, which defines the expected database version
+ * number.
+ */
+public interface DbUpgrader {
+
+    /**
+     * Defines method interface to handle database upgrades. This method is only
+     * called if your <i>DbUpgrader</i> implementation is annotated with
+     * JQDatabase.
+     *
+     * @param db the database
+     * @param fromVersion the old version
+     * @param toVersion the new version
+     * @return true for successful upgrade. If the upgrade is successful, the
+     *         version registry is automatically updated.
+     */
+    boolean upgradeDatabase(Db db, int fromVersion, int toVersion);
+
+    /**
+     * Defines method interface to handle table upgrades.
+     *
+     * @param db the database
+     * @param schema the schema
+     * @param table the table
+     * @param fromVersion the old version
+     * @param toVersion the new version
+     * @return true for successful upgrade. If the upgrade is successful, the
+     *         version registry is automatically updated.
+     */
+    boolean upgradeTable(Db db, String schema, String table, int fromVersion, int toVersion);
+
+    /**
+     * The default database upgrader. It throws runtime exception instead of
+     * handling upgrade requests.
+     */
+    @JQDatabase(version = 0)
+    public static class DefaultDbUpgrader implements DbUpgrader {
+
+        public boolean upgradeDatabase(Db db, int fromVersion, int toVersion) {
+            throw new RuntimeException("Please provide your own DbUpgrader implementation.");
+        }
+
+        public boolean upgradeTable(Db db, String schema, String table, int fromVersion, int toVersion) {
+            throw new RuntimeException("Please provide your own DbUpgrader implementation.");
+        }
+
+    }
+
+}

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

-/*
- * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License,
- * Version 1.0, and under the Eclipse Public License, Version 1.0
- * (http://h2database.com/html/license.html).
- * Initial Developer: James Moger
- */
-package org.h2.jaqu;
-
-import org.h2.jaqu.Table.JQColumn;
-import org.h2.jaqu.Table.JQTable;
-
-/**
- * Model class for JaQu to track db and table versions. 
- *
- */
-@JQTable(name = "_jq_versions", primaryKey = "schemaName tableName", memoryTable = true)
-public class DbVersion {
-    
-    @JQColumn(name = "schemaName", allowNull = false)
-    String schema;
-    
-    @JQColumn(name = "tableName", allowNull = false)
-    String table;
-    
-    @JQColumn(name = "version")
-    Integer version;
-    
-    public DbVersion() {        
-    }
-    
-    /**
-     * Constructor for defining a version entry.
-     * (SCHEMA="" && TABLE="") == DATABASE
-     * 
-     * @param version
-     */
-    public DbVersion(int version) {
-        this.schema = "";
-        this.table = "";
-        this.version = version;
-    }
-}
+/*
+ * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License,
+ * Version 1.0, and under the Eclipse Public License, Version 1.0
+ * (http://h2database.com/html/license.html).
+ * Initial Developer: James Moger
+ */
+package org.h2.jaqu;
+
+import org.h2.jaqu.Table.JQColumn;
+import org.h2.jaqu.Table.JQTable;
+
+/**
+ * A JaQu system table to track database and table versions.
+ */
+@JQTable(name = "_jq_versions", primaryKey = "schemaName tableName", memoryTable = true)
+public class DbVersion {
+
+    @JQColumn(name = "schemaName", allowNull = false)
+    String schema = "";
+
+    @JQColumn(name = "tableName", allowNull = false)
+    String table = "";
+
+    @JQColumn(name = "version")
+    Integer version;
+
+    private int todoReviewWholeClass;
+
+    public DbVersion() {
+        // nothing to do
+    }
+
+    /**
+     * Constructor for defining a version entry. Both the schema and the table
+     * are empty strings, which means this is the row for the 'database'.
+     *
+     * @param version the database version
+     */
+    public DbVersion(int version) {
+        this.schema = "";
+        this.table = "";
+        this.version = version;
+    }
+
+}

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

-/*
- * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License,
- * Version 1.0, and under the Eclipse Public License, Version 1.0
- * (http://h2database.com/html/license.html).
- * Initial Developer: James Moger
- */
-package org.h2.jaqu;
-
-/**
- * Classes implementing this interface can be used as a declaration in an 
- * update statement.
- */
-public interface Declaration {
-    /**
-     * Append the SQL to the given statement using the given query.
-     *
-     * @param stat the statement to append the SQL to
-     */
-//## Java 1.5 begin ##
-    void appendSQL(SQLStatement stat);
-//## Java 1.5 end ##
-}
+/*
+ * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License,
+ * Version 1.0, and under the Eclipse Public License, Version 1.0
+ * (http://h2database.com/html/license.html).
+ * Initial Developer: James Moger
+ */
+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;
+
+    /**
+     * Append the SQL to the given statement using the given query.
+     *
+     * @param stat the statement to append the SQL to
+     */
+//## Java 1.5 begin ##
+    void appendSQL(SQLStatement stat);
+//## Java 1.5 end ##
+
+}

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

@@ -27,17 +27,17 @@ public class Define {
         checkInDefine();
         currentTableDefinition.addIndex(IndexType.STANDARD, columns);
     }
-    
+
     public static void uniqueIndex(Object... columns) {
         checkInDefine();
         currentTableDefinition.addIndex(IndexType.UNIQUE, columns);
     }
-    
+
     public static void hashIndex(Object column) {
         checkInDefine();
         currentTableDefinition.addIndex(IndexType.HASH, new Object [] { column });
     }
-    
+
     public static void uniqueHashIndex(Object column) {
         checkInDefine();
         currentTableDefinition.addIndex(IndexType.UNIQUE_HASH, new Object [] { column });

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

-/*
- * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License,
- * Version 1.0, and under the Eclipse Public License, Version 1.0
- * (http://h2database.com/html/license.html).
- * Initial Developer: James Moger
- */
-package org.h2.jaqu;
-
-/**
- * This class represents "SET column = (column + 1)" 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 {
-
-    private Query<T> query;
-    private A x;
-    private A y;
-
-    IncrementColumn(Query<T> query, A x) {
-        this.query = query;
-        this.x = x;
-    }
-
-    public Query<T> by(A y) {
-        query.addDeclarationToken(this);
-        this.y = y;
-        return query;
-    }
-
-    public void appendSQL(SQLStatement stat) {
-        query.appendSQL(stat, x);
-        stat.appendSQL("=(");
-        query.appendSQL(stat, x);
-        int todoSomethingWrongHere;
-        if (y instanceof Number) {
-            Number n = (Number) y;
-            if (n.doubleValue() > 0) {
-                stat.appendSQL("+");
-            }
-        }
-        stat.appendSQL(y.toString());
-        stat.appendSQL(")");
-    }
-
-}
-//## Java 1.5 end ##
+/*
+ * Copyright 2004-2011 H2 Group. Multiple-Licensed under the H2 License,
+ * Version 1.0, and under the Eclipse Public License, Version 1.0
+ * (http://h2database.com/html/license.html).
+ * Initial Developer: James Moger
+ */
+package org.h2.jaqu;
+
+/**
+ * This class represents "SET column = (column + 1)" 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 {
+
+    private Query<T> query;
+    private A x;
+    private A y;
+
+    IncrementColumn(Query<T> query, A x) {
+        this.query = query;
+        this.x = x;
+    }
+
+    public Query<T> by(A y) {
+        query.addDeclarationToken(this);
+        this.y = y;
+        return query;
+    }
+
+    public void appendSQL(SQLStatement stat) {
+        query.appendSQL(stat, x);
+        stat.appendSQL("=(");
+        query.appendSQL(stat, x);
+        int todoSomethingWrongHere;
+        if (y instanceof Number) {
+            Number n = (Number) y;
+            if (n.doubleValue() > 0) {
+                stat.appendSQL("+");
+            }
+        }
+        stat.appendSQL(y.toString());
+        stat.appendSQL(")");
+    }
+
+}
+//## Java 1.5 end ##