--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -16,7 +16,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The H2 Console replaced an empty user name with a single space. 
+<ul><li>Java methods with variable number of parameters can now be used (for Java 1.5 or newer).
+</li><li>The Japanese translation has been improved by Masahiro Ikemoto. Thanks a lot!
+</li><li>The H2 Console replaced an empty user name with a single space. 
 </li><li>The build target 'build jarSmall' now includes the embedded database.
 </li><li>JdbcDataSource now keeps the password in a char array where possible.
 </li><li>ResultSet.absolute did not always work with large result sets.

h2/src/main/org/h2/res/_messages_ja.properties

@@ -11,7 +11,7 @@
 23001=\u30E6\u30CB\u30FC\u30AF\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3001\u307E\u305F\u306F\u30D7\u30E9\u30A4\u30DE\u30EA\u30AD\u30FC\u9055\u53CD\: {0}
 23002=\u53C2\u7167\u6574\u5408\u6027\u5236\u7D04\u9055\u53CD\: {0}
 23003=\u53C2\u7167\u6574\u5408\u6027\u5236\u7D04\u9055\u53CD\: {0}
-40001=\#Deadlock detected. The current transaction was rolled back. Details\: {0}
+40001=\u30C7\u30C3\u30C9\u30ED\u30C3\u30AF\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u73FE\u5728\u306E\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3\u306F\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF\u3055\u308C\u307E\u3057\u305F\u3002\u8A73\u7D30\: {0}
 42000=SQL\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306B\u6587\u6CD5\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059 {0}
 42001=SQL\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306B\u6587\u6CD5\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059 {0}; \u671F\u5F85\u3055\u308C\u308B\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8 {1}
 42S01=\u30C6\u30FC\u30D6\u30EB {0} \u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
@@ -79,7 +79,7 @@
 90055={0} \u306F\u672A\u30B5\u30DD\u30FC\u30C8\u306E\u6697\u53F7\u3067\u3059
 90056=\u5217 {0} \u306B\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 90057=\u5236\u7D04 {0} \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-90058=\#Commit or rollback is not allowed within a trigger
+90058=\u30C8\u30EA\u30AC\u5185\u3067\u306E\u30B3\u30DF\u30C3\u30C8\u3001\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF\u306F\u8A31\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 90059=\u5217\u540D {0} \u304C\u3042\u3044\u307E\u3044\u3067\u3059
 90060={0} \u306F\u672A\u30B5\u30DD\u30FC\u30C8\u306E\u30D5\u30A1\u30A4\u30EB\u30ED\u30C3\u30AF\u65B9\u5F0F\u3067\u3059
 90061=\u30DD\u30FC\u30C8 {0} \u3092\u30AA\u30FC\u30D7\u30F3\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F (\u30DD\u30FC\u30C8\u304C\u4F7F\u7528\u4E2D\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059)
@@ -94,7 +94,7 @@
 90070=\u30ED\u30FC\u30EB {0} \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 90071=\u30E6\u30FC\u30B6\u3001\u307E\u305F\u306F\u30ED\u30FC\u30EB {0} \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 90072=\u30ED\u30FC\u30EB\u3068\u6A29\u9650\u306F\u6DF7\u5728\u3067\u304D\u307E\u305B\u3093
-90073=\#Matching Java methods must have different parameter counts\: {0} and {1}
+90073=\u9069\u5408\u3059\u308BJava\u30E1\u30BD\u30C3\u30C9\u306F\u7570\u306A\u308B\u30D1\u30E9\u30E1\u30FC\u30BF\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\: {0}, {1}
 90074=\u30ED\u30FC\u30EB {0} \u306F\u3059\u3067\u306B\u8A31\u53EF\u3055\u308C\u3066\u3044\u307E\u3059
 90075=\u5217\u306F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9 {0} \u306E\u4E00\u90E8\u3067\u3059
 90076=\u95A2\u6570\u306E\u5225\u540D {0} \u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059
@@ -129,7 +129,7 @@
 90105=\u30E6\u30FC\u30B6\u5B9A\u7FA9\u95A2\u6570\u3092\u5B9F\u884C\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 90106={0} \u3092\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093
 90107={1} \u304C\u4F9D\u5B58\u3057\u3066\u3044\u308B\u305F\u3081\u3001{0} \u3092\u30C9\u30ED\u30C3\u30D7\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
-90108=\#Out of memory. Size\: {0}
+90108=\u30E1\u30E2\u30EA\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\u30B5\u30A4\u30BA\: {0}
 90109=\u30D3\u30E5\u30FC {0} \u304C\u7121\u52B9\u3067\u3059\: {1}
 90110={0} \u306F\u7BC4\u56F2\u5916\u3067\u3059
 90111=SQL\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8 {0} \u306B\u3088\u308B\u7D50\u5408\u30C6\u30FC\u30D6\u30EB\u30A2\u30AF\u30BB\u30B9\u30A8\u30E9\u30FC
@@ -159,8 +159,8 @@
 90135=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u6392\u4ED6\u30E2\u30FC\u30C9\u3067\u30AA\u30FC\u30D7\u30F3\u3055\u308C\u3066\u3044\u307E\u3059; \u63A5\u7D9A\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
 90136=\u672A\u30B5\u30DD\u30FC\u30C8\u306E\u5916\u90E8\u7D50\u5408\u6761\u4EF6\: {0}
 90137=\u5272\u308A\u5F53\u3066\u306F\u5909\u6570\u306B\u306E\u307F\u53EF\u80FD\u3067\u3059\u3002{0} \u306B\u306F\u3067\u304D\u307E\u305B\u3093
-90138=\#Invalid database name\: {0}
-90139=\#The public static Java method was not found\: {0}
+90138=\u4E0D\u6B63\u306A\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u540D\: {0}
+90139=public static\u3067\u3042\u308BJava\u30E1\u30BD\u30C3\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\: {0}
 HY000=\u4E00\u822C\u30A8\u30E9\u30FC\: {0}
 HY004=\u4E0D\u660E\u306A\u30C7\u30FC\u30BF\u578B\: {0}
 HYC00=\u6A5F\u80FD\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093

h2/src/main/org/h2/server/web/res/_text_ja.properties

@@ -96,8 +96,8 @@ toolbar.run=\u5B9F\u884C (Ctrl+Enter)
 toolbar.sqlStatement=SQL\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8
 tools.backup=\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7
 tools.backup.help=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
-tools.changeFileEncryption=\#ChangeFileEncryption
-tools.changeFileEncryption.help=\#Allows changing the database file encryption password and algorithm.
+tools.changeFileEncryption=\u30D5\u30A1\u30A4\u30EB\u6697\u53F7\u5316\u8A2D\u5B9A\u306E\u5909\u66F4
+tools.changeFileEncryption.help=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306E\u6697\u53F7\u5316\u65B9\u5F0F\u3068\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059\u3002
 tools.cipher=\u6697\u53F7\u5316\u65B9\u5F0F (AES or XTEA)
 tools.commandLine=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3
 tools.convertTraceFile=\u30C8\u30EC\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u63DB

h2/src/test/org/h2/test/db/TestOutOfMemory.java

@@ -35,7 +35,7 @@ public class TestOutOfMemory extends TestBase {
         stat.execute("insert into stuff(id) select x from system_range(1, 1000)");
         PreparedStatement prep = conn.prepareStatement("update stuff set text = text || ' upd'");
         prep.execute();
-        eatMemory(100);
+        eatMemory(80);
         try {
             prep.execute();
             fail();

h2/src/tools/org/h2/build/doclet/Doclet.java

@@ -187,7 +187,7 @@ public class Doclet {
             writer.println("</table>");
         }
 
-        // message details
+        // method details
         for (int i = 0; i < methods.length; i++) {
             MethodDoc method = methods[i];
             String name = method.name();
@@ -362,6 +362,7 @@ public class Doclet {
             if (!doesOverride(method)) {
                 boolean setterOrGetter = name.startsWith("set") && method.parameters().length == 1;
                 setterOrGetter |= name.startsWith("get") && method.parameters().length == 0;
+                setterOrGetter |= name.startsWith("is") && method.parameters().length == 0 && method.returnType().toString().equals("boolean");
                 if (!setterOrGetter) {
                     addError("Undocumented method " + " (" + clazz.name() + ".java:" + method.position().line() +") " + clazz + "." + name + " " + raw);
                     return true;

h2/src/tools/org/h2/build/i18n/PrepareTranslation.java

@@ -456,7 +456,9 @@ public class PrepareTranslation {
                     if (AUTO_TRANSLATE) {
                         toTranslate.add(key);
                     } else {
-                        System.out.println(trans.getName() + ": key " + key + " not found in translation file; added dummy # 'translation'");
+                        // System.out.println(trans.getName() + 
+                        // ": key " + key + " not found in " + 
+                        // "translation file; added # 'translation'");
                         t = "#" + now;
                         p.put(key, t);
                     }