Documentation, formatting.

h2/src/docsrc/html/advanced.html

@@ -486,9 +486,9 @@ H2 Database Engine Service. This service contains the TCP Server and the H2 Cons
 The batch files are located in the directory <code>h2/service</code>.
 </p>
 <p>
-The service wrapper bundled with H2 is a 32-bit version. 
+The service wrapper bundled with H2 is a 32-bit version.
 To use a 64-bit version of Windows (x64), you need to use a 64-bit version of the wrapper,
-for example the one from 
+for example the one from
 <a href="http://www.krenger.ch/blog/java-service-wrapper-3-5-14-for-windows-x64/">
 Simon Krenger</a>.
 </p>

h2/src/docsrc/html/links.html

@@ -701,7 +701,7 @@ Event (stream) processing kernel.
 
 <p><a href="http://www.suse.com/products/suse-manager">
 SUSE Manager, part of Linux Enterprise Server 11</a><br />
-The SUSE Manager 
+The SUSE Manager
 <a href="http://www.suse.com/blogs/suse-manager-eases-the-buden-of-compliance">
 eases the burden of compliance</a> with regulatory requirements and corporate policies.
 </p>

h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java

@@ -75,8 +75,10 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
     }
 
     /**
-     * Looking up the column index can sometimes show up on the performance profile,
-     * so cache the map.
+     * Cache the column labels (looking up the column index can sometimes show
+     * up on the performance profile).
+     *
+     * @param cachedColumnLabelMap the column map
      */
     void setCachedColumnLabelMap(HashMap<String, Integer> cachedColumnLabelMap) {
         this.cachedColumnLabelMap = cachedColumnLabelMap;

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -105,14 +105,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
         this.updatable = updatable;
     }
 
-    /**
-     * Overload used to explicitly set the column-mapping.
-     */
     JdbcResultSet(JdbcConnection conn, JdbcPreparedStatement preparedStatement, ResultInterface result, int id,
             boolean closeStatement, boolean scrollable, boolean updatable, HashMap<String, Integer> columnLabelMap) {
-    	  this(conn, preparedStatement, result, id, closeStatement, scrollable, updatable);
-    	  this.columnLabelMap = columnLabelMap;
-    	  this.preparedStatement = preparedStatement;
+        this(conn, preparedStatement, result, id, closeStatement, scrollable, updatable);
+        this.columnLabelMap = columnLabelMap;
+        this.preparedStatement = preparedStatement;
     }
 
     /**

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -872,7 +872,7 @@ public class TestPreparedStatement extends TestBase {
         ResultSet rs;
         stat.execute("CREATE TABLE TEST(ID INT)");
         stat.execute("INSERT INTO TEST VALUES(1)");
-        
+
         prep = conn.prepareStatement("SELECT * FROM TEST");
         // just to check if it doesn't throw an exception - it may be null
         prep.getMetaData();
@@ -883,7 +883,7 @@ public class TestPreparedStatement extends TestBase {
         // supposed to be closed now
         assertThrows(ErrorCode.OBJECT_CLOSED, rs).next();
         assertEquals(-1, prep.getUpdateCount());
-        
+
         prep = conn.prepareStatement("UPDATE TEST SET ID = 2");
         assertFalse(prep.execute());
         assertEquals(1, prep.getUpdateCount());
@@ -892,7 +892,7 @@ public class TestPreparedStatement extends TestBase {
         // supposed to be closed now
         assertThrows(ErrorCode.OBJECT_CLOSED, rs).next();
         assertEquals(-1, prep.getUpdateCount());
-        
+
         prep = conn.prepareStatement("DELETE FROM TEST");
         prep.executeUpdate();
         assertFalse(prep.getMoreResults());

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

@@ -698,4 +698,7 @@ minecraft videos youtube dataflyer bukkit alessio adamo jacopo angel leon frost
 deserializing eckenfelder daniel serodio dirname semicolons whose stretch
 stabilize succeeded widening optimise deprecate increasing leaning rotate git
 hub rewind spawn shimizu fumiyuki nelson github laird rollover millions
-ljnelson edugility sormula pushed backslashes slashes
+ljnelson edugility sormula pushed backslashes slashes lukas batched typesafe
\ No newline at end of file
+bundled jacob terrence policies periodic eases eder corporate regulatory
+burden isnull periodically suse optimisation krenger qvortrup huang jmxremote
+clusterable
\ No newline at end of file