Merge pull request #886 from katzyn/misc

Fix building of documentation

h2/src/main/org/h2/engine/GeneratedKeys.java

@@ -120,6 +120,8 @@ public final class GeneratedKeys {
     /**
      * Returns generated keys.
      *
+     * @param session
+     *            session
      * @return local result with generated keys
      */
     public LocalResult getKeys(Session session) {

h2/src/main/org/h2/util/ToDateParser.java

@@ -215,7 +215,7 @@ public class ToDateParser {
         this.minute = minute;
     }
 
-    void setSecord(int second) {
+    void setSecond(int second) {
         this.second = second;
     }
 

h2/src/main/org/h2/util/ToDateTokenizer.java

@@ -389,7 +389,7 @@ class ToDateTokenizer {
                 inputFragmentStr = matchStringOrThrow(
                         PATTERN_TWO_DIGITS_OR_LESS, params, formatTokenEnum);
                 dateNr = Integer.parseInt(inputFragmentStr);
-                params.setSecord(dateNr);
+                params.setSecond(dateNr);
                 break;
             case SSSSS: {
                 inputFragmentStr = matchStringOrThrow(PATTERN_NUMBER, params,
@@ -402,7 +402,7 @@ class ToDateTokenizer {
                 int hour = dateNr % 24;
                 params.setHour(hour);
                 params.setMinute(minute);
-                params.setSecord(second);
+                params.setSecond(second);
                 break;
             }
             case FF:

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

@@ -1453,9 +1453,9 @@ public abstract class TestBase {
      *
      * @return the path to java
      */
-    private String getJVM() {
-        return System.getProperty("java.home") + File.separatorChar + "bin" +
-                                                 File.separator + "java";
+    private static String getJVM() {
+        return System.getProperty("java.home") + File.separatorChar + "bin"
+                + File.separator + "java";
     }
 
     /**

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

@@ -765,4 +765,4 @@ jacoco xdata invokes sourcefiles classfiles duplication crypto stacktraces prt d
 interpolated thead
 
 die weekdiff osx subprocess dow proleptic microsecond microseconds divisible cmp denormalized suppressed saturated mcs
-london
+london dfs weekdays intermittent looked