--no commit message

--no commit message

--no commit message
d222cc6f · Thomas Mueller · ad52cce5 · d222cc6f · d222cc6f · d222cc6f
--- a/h2/src/docsrc/html/source.html
+++ b/h2/src/docsrc/html/source.html
@@ -2,12 +2,14 @@
 Copyright 2004-2008 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html).
 Initial Developer: H2 Group
 -->
-<html>
+<html><head>
+<title>Source Code Viewer</title>
+</head>
 <script type="text/javascript">
 // <!--
    var line = 0, file = '';
    var params = location.search.substring(1).split('&');
-	var tag = 'trunk/h2';
+    var tag = 'trunk/h2';
    for (var i = 0; i<params.length; i++) {
        var k = params[i].split('=');
        var key = k[0], value = k[1];
@@ -16,11 +18,11 @@ Initial Developer: H2 Group
        } else if (key == 'file') {
            file = value;
        } else if (key == 'build') {
-			if (value == 64) {
-	            tag = 'tags/version-1.0.' + value;
-			} else if (value >= 63) {
-	            tag = 'tags/version-1.0.' + value + '/h2';
-	        }
+            if (value == 64) {
+                tag = 'tags/version-1.0.' + value;
+            } else if (value >= 63) {
+                tag = 'tags/version-1.0.' + value + '/h2';
+            }
        }
    }
 // -->
@@ -29,7 +31,7 @@ Initial Developer: H2 Group
 <table width="100%">
    <tr>
        <td style="width: 50px; vertical-align: top">
-			<script type="text/javascript">
+            <script type="text/javascript">
 // <!--
                for(var i = 1; i <= 5000; i++) {
                    if (line == i) {

--- a/h2/src/docsrc/html/sourceError.html
+++ b/h2/src/docsrc/html/sourceError.html
@@ -24,7 +24,7 @@ a.disabled {
    color: lightGray;
 }
 input {
-	vertical-align: middle;
+    vertical-align: middle;
 }
 </style>

@@ -32,7 +32,7 @@ input {
 //<!--

 function $(id) {
-	return document.getElementById(id);
+    return document.getElementById(id);
 }

 var lastError = '';
@@ -41,28 +41,28 @@ var errorCode = '0';
 var build = '';

 function goDetails(code) {
-	code = code.replace('21S', '210');
-	code = code.replace('42S', '421');
-	code = code.replace('HY', '50');
-	code = code.replace('C', '1');
-	code = code.replace('T', '2');
-	$('more').src = 'http://h2database.com/javadoc/org/h2/constant/ErrorCode.html#c' + code;
+    code = code.replace('21S', '210');
+    code = code.replace('42S', '421');
+    code = code.replace('HY', '50');
+    code = code.replace('C', '1');
+    code = code.replace('T', '2');
+    $('more').src = 'http://h2database.com/javadoc/org/h2/constant/ErrorCode.html#c' + code;
 }

 function go(file, line) {
-	var url;
-	if ($('rawSource').checked == true) {
+    var url;
+    if ($('rawSource').checked == true) {
        url = "source.html?file=";
        url += file;
        url += "&line=";
        url += line;
        url += "&build=";
        url += build;
-	} else {
-		var tag = 'trunk/h2';
-		if (build == 64) {
+    } else {
+        var tag = 'trunk/h2';
+        if (build == 64) {
            tag = 'tags/version-1.0.' + build;
-		} else if (build >= 63) {
+        } else if (build >= 63) {
            tag = 'tags/version-1.0.' + build + '/h2';
        }
        url = 'http://code.google.com/p/h2database/source/browse/';
@@ -72,95 +72,95 @@ function go(file, line) {
        url += '#';
        url += line;
    }
-	$('file').innerHTML = file;
-	$('code').src = url;
+    $('file').innerHTML = file;
+    $('code').src = url;
 }

 function convert() {
-	try {
-		var s = $('error').value;
-		if(lastError == s) {
-			return;
-		}
-		lastError = s;
-	    var result = '';
-	    hasData = false;
-	    var idx = s.lastIndexOf("[");
-	    if (idx >= 0) {
-		    $('message').innerHTML = s.substring(0, idx);
-	    	var end = s.indexOf("]", idx);
-	    	errorCode = s.substring(idx + 1, end);
-	    	hasData = true;
-	    	idx = errorCode.indexOf("-");
-	    	build = errorCode.substring(idx + 1);
-	    	$('version').innerHTML = '1.0.' + build;
-	    	errorCode = errorCode.substring(0, idx);
-	    	while (errorCode.length > 1 && errorCode.charAt(0) == '0') {
-	    		errorCode = errorCode.substring(1);
-	    	}
-	    	$('errorCode').innerHTML = errorCode;
-	    	goDetails(errorCode);
-	    	s = s.substring(end + 1);
-	    }
-	    idx = 0;
-	    while (true) {
-	        var start = s.indexOf("at org.h2.", idx);
-	        if (start < 0) {
-	            result += s.substring(idx);
-	            break;
-	        }
-	        start += 3; // skip 'at '
-	        if (idx > 0) {
-		        result += s.substring(idx, start);
-		    }
-	        var end = s.indexOf(')', start);
-	        if (end < 0) {
-	            result += s.substring(idx);
-	            break;
-	        }
-	        var element = s.substring(start, end + 1);
-	        var open = element.lastIndexOf('(');
-	        var dotMethod = element.lastIndexOf('.', open - 1);
-	        var dotClass = element.lastIndexOf('.', dotMethod - 1);
-	        var packageName = element.substring(0, dotClass);
-	        var colon = element.lastIndexOf(':');
-	        var file = element.substring(open + 1, colon);
-	        var lineNumber = element.substring(colon + 1, element.length - 1);
-	        var fullFileName = packageName.replace(/\./g, '/') + "/" + file;
-	        result += "<a href='javascript:go(\"";
-	        result += fullFileName;
-	        result += "\",";
-	        result += lineNumber;
-	        result += ")'>";
-	        result += element;
-	        result += "</a>";
-	        hasData = true;
-	        idx = end + 1;
-	    }
-	    result = result.replace(/[\n\r]+/g, "<br/>");
-	    result = result.replace(/ at /g, "");
-		$('links').innerHTML = result;
-		select('input');
+    try {
+        var s = $('error').value;
+        if(lastError == s) {
+            return;
+        }
+        lastError = s;
+        var result = '';
+        hasData = false;
+        var idx = s.lastIndexOf("[");
+        if (idx >= 0) {
+            $('message').innerHTML = s.substring(0, idx);
+            var end = s.indexOf("]", idx);
+            errorCode = s.substring(idx + 1, end);
+            hasData = true;
+            idx = errorCode.indexOf("-");
+            build = errorCode.substring(idx + 1);
+            $('version').innerHTML = '1.0.' + build;
+            errorCode = errorCode.substring(0, idx);
+            while (errorCode.length > 1 && errorCode.charAt(0) == '0') {
+                errorCode = errorCode.substring(1);
+            }
+            $('errorCode').innerHTML = errorCode;
+            goDetails(errorCode);
+            s = s.substring(end + 1);
+        }
+        idx = 0;
+        while (true) {
+            var start = s.indexOf("at org.h2.", idx);
+            if (start < 0) {
+                result += s.substring(idx);
+                break;
+            }
+            start += 3; // skip 'at '
+            if (idx > 0) {
+                result += s.substring(idx, start);
+            }
+            var end = s.indexOf(')', start);
+            if (end < 0) {
+                result += s.substring(idx);
+                break;
+            }
+            var element = s.substring(start, end + 1);
+            var open = element.lastIndexOf('(');
+            var dotMethod = element.lastIndexOf('.', open - 1);
+            var dotClass = element.lastIndexOf('.', dotMethod - 1);
+            var packageName = element.substring(0, dotClass);
+            var colon = element.lastIndexOf(':');
+            var file = element.substring(open + 1, colon);
+            var lineNumber = element.substring(colon + 1, element.length - 1);
+            var fullFileName = packageName.replace(/\./g, '/') + "/" + file;
+            result += "<a href='javascript:go(\"";
+            result += fullFileName;
+            result += "\",";
+            result += lineNumber;
+            result += ")'>";
+            result += element;
+            result += "</a>";
+            hasData = true;
+            idx = end + 1;
+        }
+        result = result.replace(/[\n\r]+/g, "<br/>");
+        result = result.replace(/ at /g, "");
+        $('links').innerHTML = result;
+        select('input');
    } catch(e) {
-    	hasData = false;
-    	alert('Can not parse the stack trace: ' + e);
+        hasData = false;
+        alert('Can not parse the stack trace: ' + e);
    }

 }

 function select(id) {
-	$('input').style.display = 'none';
-	$('details').style.display = 'none';
-	$('source').style.display = 'none';
-	$('inputTab').className = '';
-	$('detailsTab').className = hasData ? '' : 'disabled';
-	$('sourceTab').className = hasData ? '' : 'disabled';
-	$(id + 'Tab').className = 'selected';
-	$(id).style.display = '';
-	if(id=='details') {
-		goDetails(errorCode);
-	}
-	sizeTextArea();
+    $('input').style.display = 'none';
+    $('details').style.display = 'none';
+    $('source').style.display = 'none';
+    $('inputTab').className = '';
+    $('detailsTab').className = hasData ? '' : 'disabled';
+    $('sourceTab').className = hasData ? '' : 'disabled';
+    $(id + 'Tab').className = 'selected';
+    $(id).style.display = '';
+    if(id=='details') {
+        goDetails(errorCode);
+    }
+    sizeTextArea();
 }

 function sizeTextArea() {
@@ -181,44 +181,44 @@ function sizeTextArea() {

 <h1>Online Error Analyzer</h1>
 <h2>
-	<a href="javascript:select('input')" id="inputTab">Input</a>&nbsp;
-	<a href="javascript:select('details')" id="detailsTab">Details</a>&nbsp;
-	<a href="javascript:select('source')" id="sourceTab">Source Code</a>
+    <a href="javascript:select('input')" id="inputTab">Input</a>&nbsp;
+    <a href="javascript:select('details')" id="detailsTab">Details</a>&nbsp;
+    <a href="javascript:select('source')" id="sourceTab">Source Code</a>
 </h2>
 <hr/>
 <div id="input">
-	<p>Fill in the error message and stack trace and click on 'Details' or 'Source Code': </p>
-	<textarea id="error" cols="100" style="width: 100%; overflow: auto;" rows="20"
-		onChange="convert()"
-		onSelect="convert()"
-		onKeyUp="convert()"
-		onKeyPress="convert()"
-		onFocus="convert()"
-		onBlur="convert()"
-	>
-	</textarea>
+    <p>Fill in the error message and stack trace and click on 'Details' or 'Source Code': </p>
+    <textarea id="error" cols="100" style="width: 100%; overflow: auto;" rows="20"
+        onChange="convert()"
+        onSelect="convert()"
+        onKeyUp="convert()"
+        onKeyPress="convert()"
+        onFocus="convert()"
+        onBlur="convert()"
+    >
+    </textarea>
 </div>
 <div id="details">
-	<p><b>Error Code: </b><span id="errorCode"></span></p>
-	<p><b>Product Version: </b><span id="version"></span></p>
-	<p><b>Message: </b></p>
-	<p id="message"></p>
-	<p><b>More Information:</b></p>
-	<iframe id="more" frameborder="0" marginwidth="0" marginheight="0" width="100%" height="100px" src="">
-	</iframe>
+    <p><b>Error Code: </b><span id="errorCode"></span></p>
+    <p><b>Product Version: </b><span id="version"></span></p>
+    <p><b>Message: </b></p>
+    <p id="message"></p>
+    <p><b>More Information:</b></p>
+    <iframe id="more" frameborder="0" marginwidth="0" marginheight="0" width="100%" height="100px" src="">
+    </iframe>
 </div>
 <div id="source">
-	<table id="sourceTable" style="border:0px" width="100%"><tr>
-	<td style="border:0px" width="30px">
-		<p><b>Stack Trace: </b></p>
-		<p id="links"></p>
-	</td><td style="border:0px" width="90%">
-		<p><b>Source File: </b><span id="file"></span><br />
-		Raw file <input type="checkbox" id="rawSource" /> (fast; only Firefox)</p>
-		<iframe id="code" frameborder="0" marginwidth="0" marginheight="0" width="100%" height="100px" src="">
-		</iframe>
-	</td>
-	</tr></table>
+    <table id="sourceTable" style="border:0px" width="100%"><tr>
+    <td style="border:0px" width="30px">
+        <p><b>Stack Trace: </b></p>
+        <p id="links"></p>
+    </td><td style="border:0px" width="90%">
+        <p><b>Source File: </b><span id="file"></span><br />
+        Raw file <input type="checkbox" id="rawSource" /> (fast; only Firefox)</p>
+        <iframe id="code" frameborder="0" marginwidth="0" marginheight="0" width="100%" height="100px" src="">
+        </iframe>
+    </td>
+    </tr></table>
 </div>
 <script type="text/javascript">
 //<!--

--- a/h2/src/docsrc/text/_docs_en.utf8.txt
+++ b/h2/src/docsrc/text/_docs_en.utf8.txt
@@ -4525,6 +4525,42 @@ FAQ and Known Bugs
 @search_1019_a
 License

+@sourceError_1000_h1
+Online Error Analyzer
+
+@sourceError_1001_a
+Input
+
+@sourceError_1002_h2
+&nbsp; <a href="javascript:select('details')" id="detailsTab">Details</a> &nbsp; <a href="javascript:select('source')" id="sourceTab">Source Code</a>
+
+@sourceError_1003_p
+Fill in the error message and stack trace and click on 'Details' or 'Source Code':
+
+@sourceError_1004_b
+Error Code:
+
+@sourceError_1005_b
+Product Version:
+
+@sourceError_1006_b
+Message:
+
+@sourceError_1007_b
+More Information:
+
+@sourceError_1008_b
+Stack Trace:
+
+@sourceError_1009_b
+Source File:
+
+@sourceError_1010_p
+Raw file
+
+@sourceError_1011_p
+(fast; only Firefox)
+
 @tutorial_1000_h1
 Tutorial


--- a/h2/src/docsrc/text/_docs_ja.utf8.txt
+++ b/h2/src/docsrc/text/_docs_ja.utf8.txt
@@ -4534,6 +4534,42 @@ FAQ
 @search_1019_a
 ライセンス

+@sourceError_1000_h1
+#Online Error Analyzer
+
+@sourceError_1001_a
+#Input
+
+@sourceError_1002_h2
+#&nbsp; <a href="javascript:select('details')" id="detailsTab">Details</a> &nbsp; <a href="javascript:select('source')" id="sourceTab">Source Code</a>
+
+@sourceError_1003_p
+#Fill in the error message and stack trace and click on 'Details' or 'Source Code':
+
+@sourceError_1004_b
+#Error Code:
+
+@sourceError_1005_b
+#Product Version:
+
+@sourceError_1006_b
+メッセージ:
+
+@sourceError_1007_b
+#More Information:
+
+@sourceError_1008_b
+#Stack Trace:
+
+@sourceError_1009_b
+#Source File:
+
+@sourceError_1010_p
+#Raw file
+
+@sourceError_1011_p
+#(fast; only Firefox)
+
 @tutorial_1000_h1
 チュートリアル


--- a/h2/src/docsrc/textbase/_docs_en.properties
+++ b/h2/src/docsrc/textbase/_docs_en.properties
@@ -1507,6 +1507,18 @@ search_1016_a=Build
 search_1017_a=History and Roadmap
 search_1018_a=FAQ and Known Bugs
 search_1019_a=License
+sourceError_1000_h1=Online Error Analyzer
+sourceError_1001_a=Input
+sourceError_1002_h2=&nbsp; <a href\="javascript\:select('details')" id\="detailsTab">Details</a> &nbsp; <a href\="javascript\:select('source')" id\="sourceTab">Source Code</a>
+sourceError_1003_p=Fill in the error message and stack trace and click on 'Details' or 'Source Code'\:
+sourceError_1004_b=Error Code\:
+sourceError_1005_b=Product Version\:
+sourceError_1006_b=Message\:
+sourceError_1007_b=More Information\:
+sourceError_1008_b=Stack Trace\:
+sourceError_1009_b=Source File\:
+sourceError_1010_p=Raw file
+sourceError_1011_p=(fast; only Firefox)
 tutorial_1000_h1=Tutorial
 tutorial_1001_a=Starting and Using the H2 Console
 tutorial_1002_a=Connecting to a Database using JDBC

--- a/h2/src/tools/org/h2/tools/doc/LinkChecker.java
+++ b/h2/src/tools/org/h2/tools/doc/LinkChecker.java
@@ -64,7 +64,8 @@ public class LinkChecker {
        ArrayList errors = new ArrayList();
        for (Iterator it = links.keySet().iterator(); it.hasNext();) {
            String link = (String) it.next();
-            if (!link.startsWith("http") && !link.endsWith("h2.pdf") && link.indexOf("_ja.") < 0) {
+            if (!link.startsWith("http") && !link.endsWith("h2.pdf")
+                    && link.indexOf("_ja.") < 0) {
                if (targets.get(link) == null) {
                    errors.add(links.get(link) + ": missing link " + link);
                }
@@ -161,6 +162,12 @@ public class LinkChecker {
            if (type.equals("href")) {
                if (ref.startsWith("http:") || ref.startsWith("https:")) {
                    // ok
+                } else if (ref.startsWith("javascript:")) {
+                    ref = null;
+                    // ok
+                } else if (ref.length() == 0) {
+                    ref = null;
+                    // ok
                } else if (ref.startsWith("#")) {
                    ref = path + ref;
                } else {
@@ -175,7 +182,9 @@ public class LinkChecker {
                    }
                    ref = p + "/" + ref;
                }
-                links.put(ref, path);
+                if (ref != null) {
+                    links.put(ref, path);
+                }
            } else if (type.equals("name")) {
                targets.put(path + "#" + ref, "name");
            } else {

--- a/h2/src/tools/org/h2/tools/doc/dictionary.txt
+++ b/h2/src/tools/org/h2/tools/doc/dictionary.txt
@@ -523,4 +523,4 @@ thousands ridvan incremented slots debugging inherit agar fulvio invisible biond
 turkish fulfils iapi filesync
 compares packets destroying echo homed hosts clock countries validated catches turning staging kills distance morning performs internationalization simulator constructed nicer
 echo callablestatement procid homed getstart staging prices meantime qujd qujdra qui divided quaere restrictions hudson scoped design inverting newlines
-violate verysmallint eremainder iee cgi adjust estimation consumption occupy ikvm
+violate verysmallint eremainder iee cgi adjust estimation consumption occupy ikvm light gray viewer
--- a/h2/src/tools/org/h2/tools/i18n/PrepareTranslation.java
+++ b/h2/src/tools/org/h2/tools/i18n/PrepareTranslation.java
@@ -259,7 +259,7 @@ public class PrepareTranslation {
                    } else {
                        buff.append(clean(trim));
                    }
-                } else if ("pre".equals(tag) || "title".equals(tag) || "script".equals(tag)) {
+                } else if ("pre".equals(tag) || "title".equals(tag) || "script".equals(tag) || "style".equals(tag)) {
                    // ignore, don't translate
                    template.append(s);
                } else {