Documentation / formatting

h2/src/docsrc/html/changelog.html

@@ -43,7 +43,7 @@ Change Log
 </li><li>Lucene 2 is no longer supported.
 </li><li>Fix bug in calculating default MIN and MAX values for SEQUENCE.
 </li><li>Fix bug in performing IN queries with multiple values when IGNORECASE=TRUE
-</li><li>Add entrypoint to org.h2.tools.Shell so it can be called from inside an application.
+</li><li>Add entry-point to org.h2.tools.Shell so it can be called from inside an application.
     patch by Thomas Gillet.
 </li><li>Fix bug that prevented the PgServer from being stopped and started multiple times.
 </li></ul>

h2/src/docsrc/html/mvstore.html

@@ -495,12 +495,12 @@ As an example, the following code:
 </p>
 <pre>
 MVStore s = MVStore.open(fileName);
-MVMap<Integer, String> map = s.openMap("data");
-for (int i = 0; i < 400; i++) {
+MVMap&lt;Integer, String&gt; map = s.openMap("data");
+for (int i = 0; i &lt; 400; i++) {
     map.put(i, "Hello");
 }
 s.commit();
-for (int i = 0; i < 100; i++) {
+for (int i = 0; i &lt; 100; i++) {
     map.put(0, "Hi");
 }
 s.commit();

h2/src/main/org/h2/api/AggregateFunction.java

@@ -16,6 +16,7 @@ import java.sql.SQLException;
  * Please note this interface only has limited support for data types.
  * If you need data types that don't have a corresponding SQL type
  * (for example GEOMETRY), then use the {@link Aggregate} interface.
+ * </p>
  */
 public interface AggregateFunction {
 

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

@@ -91,7 +91,8 @@ public class UserAggregate extends DbObjectBase {
     }
 
     /**
-     * Wrap {@link AggregateFunction} in order to behave as {@link org.h2.api.Aggregate}
+     * Wrap {@link AggregateFunction} in order to behave as
+     * {@link org.h2.api.Aggregate}
      **/
     private static class AggregateWrapper implements Aggregate {
         private final AggregateFunction aggregateFunction;

h2/src/main/org/h2/mvstore/MVMap.java

@@ -982,6 +982,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
      * Remove the given page (make the space available).
      *
      * @param pos the position of the page to remove
+     * @param memory the number of bytes used for this page
      */
     protected void removePage(long pos, int memory) {
         store.removePage(this, pos, memory);

h2/src/main/org/h2/mvstore/MVStore.java

@@ -49,8 +49,6 @@ TransactionStore:
 
 MVStore:
 
-- console auto-complete: only tab to complete; remove newlines before autocomplete?
-
 - maybe change the length code to have lower gaps
 
 - improve memory calculation for transient and cache

h2/src/main/org/h2/store/LobStorageMap.java

@@ -96,12 +96,6 @@ public class LobStorageMap implements LobStorageInterface {
         dataMap = mvStore.openMap("lobData",
                 new MVMapConcurrent.Builder<Long, byte[]>());
         streamStore = new StreamStore(dataMap);
-        
-        ;; int todo; // test and then remove
-        // TODO currently needed to avoid out of memory,
-        // because memory usage is only measure in number of pages currently
-        // streamStore.setMaxBlockSize(32 * 1024);
-        
     }
 
     @Override

h2/src/main/org/h2/tools/Shell.java

@@ -171,6 +171,7 @@ public class Shell extends Tool implements Runnable {
      * <p>
      * Note: using the "-url" option in {@code args} doesn't make much sense
      * since it will override the {@code conn} parameter.
+     * </p>
      *
      * @param conn the connection
      * @param args the command line settings

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

@@ -646,7 +646,7 @@ public class TestSpatial extends TestBase {
         return rs;
     }
 
-    public void testAggregateWithGeometry() throws SQLException {
+    private void testAggregateWithGeometry() throws SQLException {
         deleteDb("spatialIndex");
         Connection conn = getConnection("spatialIndex");
         try {

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

@@ -752,4 +752,4 @@ maginatics jdbclint lint lsm unmappable adams douglas definer invoker
 fmrn fmxxx fmday fml syyyy tzd nov iyy iyyy fmc fmb fmxx tzr btc yyfxyy scc syear
 overwrote though randomize readability datagram rsync mongodb divides crypto
 predicted prediction wojtek hops jurczyk cbtree predict vast assumption upside
-adjusted lastly sgtatham
+adjusted lastly sgtatham cleaning gillet prevented