Documentation.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,7 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>DATABASE_TO_UPPER: when set to false, all identifier names (table names, column names) 
+<ul><li>DATABASE_TO_UPPER: when set to false, all identifier names (table names, column names)
     are case sensitive (except aggregate, built-in functions, data types, and keywords).
     This is for improved compatibility with MySQL and PostgreSQL.
 </li><li>When upgrading from an older 1.3.x version to version 1.3.157, when using BLOB or CLOB data,
@@ -32,7 +32,7 @@ Change Log
 </li><li>H2 Console: improved system tray icon for Mac OS X (transparent background).
 </li><li>String.toUpperCase() was used a few places, which is problematic when using the Turkish locale.
     The method has been replaced with toUpperCase(Locale.ENGLISH) to solve such problems.
-</li><li>Shell tool: the built-in command "distinct" has been removed 
+</li><li>Shell tool: the built-in command "distinct" has been removed
     (use the SQL statements "show tables" / "show columns from tableName" instead).
     The result set formatting has been improved.
 </li><li>MERGE: if a unique key was violated (but not the primary key or the key columns of the merge itself),

h2/src/docsrc/html/features.html

@@ -1031,7 +1031,7 @@ or the SQL statement <code>SET MODE Derby</code>.
     That means only one row with <code>NULL</code> in one of the columns is allowed.
 </li><li>Concatenating <code>NULL</code> with another value
     results in the other value.
-</li><li>Support the pseudo-table SYSIBM.SYSDUMMY1.    
+</li><li>Support the pseudo-table SYSIBM.SYSDUMMY1.
 </li></ul>
 
 <h3>HSQLDB Compatibility Mode</h3>

h2/src/docsrc/html/roadmap.html

@@ -552,7 +552,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Support [INNER | OUTER] JOIN USING(column [,...]).
 </li><li>Support NATURAL [ { LEFT | RIGHT } [ OUTER ] | INNER ] JOIN (Derby, Oracle)
 </li><li>GROUP BY columnNumber (similar to ORDER BY columnNumber) (MySQL, PostgreSQL, SQLite; not by HSQLDB and Derby).
-</li><li>Sybase / MS SQL Server compatiblitiy: CONVERT(..) parameters are swapped.
+</li><li>Sybase / MS SQL Server compatibility: CONVERT(..) parameters are swapped.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/test/org/h2/test/TestBase.java

@@ -1280,6 +1280,14 @@ public abstract class TestBase {
         memory.clear();
     }
 
+    /**
+     * Verify the next method call on the object will throw an exception.
+     *
+     * @param <T> the class of the object
+     * @param exceptionClass the expected exception class to be thrown
+     * @param obj the object to wrap
+     * @return a proxy for the object
+     */
     protected <T> T assertThrows(final Class<?> exceptionClass, final T obj) {
         return assertThrows(new Thread.UncaughtExceptionHandler() {
             public void uncaughtException(Thread t, Throwable e) {
@@ -1291,6 +1299,14 @@ public abstract class TestBase {
         }, exceptionClass.toString(), obj);
     }
 
+    /**
+     * Verify the next method call on the object will throw an exception.
+     *
+     * @param <T> the class of the object
+     * @param errorCode the expected error code
+     * @param obj the object to wrap
+     * @return a proxy for the object
+     */
     protected <T> T assertThrows(final int errorCode, final T obj) {
         return assertThrows(new Thread.UncaughtExceptionHandler() {
             public void uncaughtException(Thread t, Throwable e) {
@@ -1309,6 +1325,16 @@ public abstract class TestBase {
         }, "SQLException with error code " + errorCode, obj);
     }
 
+    /**
+     * Verify the next method call on the object will throw an exception.
+     *
+     * @param <T> the class of the object
+     * @param handler the exception handler to call
+     * @param expected the message to print if the method didn't throw an
+     *            exception
+     * @param obj the object to wrap
+     * @return a proxy for the object
+     */
     @SuppressWarnings("unchecked")
     protected <T> T assertThrows(final Thread.UncaughtExceptionHandler handler, final String expected, final T obj) {
         Class<?> c = obj.getClass();

h2/src/test/org/h2/test/utils/AssertThrows.java

@@ -19,6 +19,12 @@ import org.h2.message.DbException;
  */
 public abstract class AssertThrows {
 
+    /**
+     * Create a new assertion object, and call the test method to verify the
+     * expected exception is thrown.
+     *
+     * @param expectedExceptionClass the expected exception class
+     */
     public AssertThrows(final Class<? extends Exception> expectedExceptionClass) {
         this(new Thread.UncaughtExceptionHandler() {
             public void uncaughtException(Thread t, Throwable e) {
@@ -33,7 +39,7 @@ public abstract class AssertThrows {
                             expectedExceptionClass.getSimpleName() +
                             " to be thrown, but the method under test threw an exception of type\n" +
                             e.getClass().getSimpleName() +
-                            " (see in the 'Caused by' for the exception tha was thrown)");
+                            " (see in the 'Caused by' for the exception that was thrown)");
                     ae.initCause(e);
                     throw ae;
                 }
@@ -41,6 +47,10 @@ public abstract class AssertThrows {
         });
     }
 
+    /**
+     * Create a new assertion object, and call the test method to verify the
+     * expected exception is thrown.
+     */
     public AssertThrows() {
         this(new Thread.UncaughtExceptionHandler() {
             public void uncaughtException(Thread t, Throwable e) {
@@ -53,6 +63,12 @@ public abstract class AssertThrows {
         });
     }
 
+    /**
+     * Create a new assertion object, and call the test method to verify the
+     * expected exception is thrown.
+     *
+     * @param expectedErrorCode the error code of the exception
+     */
     public AssertThrows(final int expectedErrorCode) {
         this(new Thread.UncaughtExceptionHandler() {
             public void uncaughtException(Thread t, Throwable e) {
@@ -74,7 +90,6 @@ public abstract class AssertThrows {
         });
     }
 
-
     private AssertThrows(Thread.UncaughtExceptionHandler handler) {
         try {
             test();
@@ -84,6 +99,11 @@ public abstract class AssertThrows {
         }
     }
 
+    /**
+     * The test method that is called.
+     *
+     * @throws Exception the exception
+     */
     public abstract void test() throws Exception;
 
 }

h2/src/test/org/h2/test/utils/ProxyCodeGenerator.java

@@ -22,8 +22,8 @@ import org.h2.util.SourceCompiler;
  */
 public class ProxyCodeGenerator {
 
-    static SourceCompiler compiler = new SourceCompiler();
-    static HashMap<Class<?>, Class<?>> proxyMap = New.hashMap();
+    private static SourceCompiler compiler = new SourceCompiler();
+    private static HashMap<Class<?>, Class<?>> proxyMap = New.hashMap();
 
     private TreeSet<String> imports = new TreeSet<String>();
     private TreeMap<String, Method> methods = new TreeMap<String, Method>();
@@ -31,6 +31,12 @@ public class ProxyCodeGenerator {
     private String className;
     private Class<?> extendsClass;
 
+    /**
+     * Generate a proxy class. The returned class extends the given class.
+     *
+     * @param c the class to extend
+     * @return the proxy class
+     */
     public static Class<?> getClassProxy(Class<?> c) throws ClassNotFoundException {
         Class<?> p = proxyMap.get(c);
         if (p != null) {
@@ -53,10 +59,16 @@ public class ProxyCodeGenerator {
         return px;
     }
 
-    void setPackageName(String packageName) {
+    private void setPackageName(String packageName) {
         this.packageName = packageName;
     }
 
+    /**
+     * Generate a class that implements all static methods of the given class,
+     * but as non-static.
+     *
+     * @param c the class to extend
+     */
     void generateStaticProxy(Class<?> clazz) {
         imports.clear();
         addImport(InvocationHandler.class);
@@ -72,7 +84,7 @@ public class ProxyCodeGenerator {
         }
     }
 
-    void generateClassProxy(Class<?> clazz) {
+    private void generateClassProxy(Class<?> clazz) {
         imports.clear();
         addImport(InvocationHandler.class);
         addImport(Method.class);
@@ -90,7 +102,7 @@ public class ProxyCodeGenerator {
         }
     }
 
-    void addMethod(Method m) {
+    private void addMethod(Method m) {
         if (methods.containsKey(getMethodName(m))) {
             // already declared in a subclass
             return;
@@ -117,7 +129,7 @@ public class ProxyCodeGenerator {
         return buff.toString();
     }
 
-    void addImport(Class<?> c) {
+    private void addImport(Class<?> c) {
         while (c.isArray()) {
             c = c.getComponentType();
         }
@@ -127,6 +139,7 @@ public class ProxyCodeGenerator {
             }
         }
     }
+
     private static String getClassName(Class<?> c) {
         String s = c.getSimpleName();
         while (true) {
@@ -138,7 +151,8 @@ public class ProxyCodeGenerator {
         }
         return s;
     }
-    void write(PrintWriter writer) {
+
+    private void write(PrintWriter writer) {
         if (packageName != null) {
             writer.println("package " + packageName + ";");
         }

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -686,4 +686,4 @@ mcleod decade experience travel willing scjp himself routinely tsi retrieving
 multiplied ross judson closeable watcher enqueued referent refs watch tracked
 preserving disallowed restrictive dst regions kiritimati flow wider nanosecond
 march april cutover julian transitions enderbury kwajalein viewport onscroll
-umlaut reconstruct inclusive
+umlaut reconstruct inclusive proxies