Source code switching using //## has been simplified.

h2/src/main/org/h2/fulltext/FullTextLucene.java

@@ -38,11 +38,11 @@ import org.h2.util.New;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
 import org.h2.util.Utils;
-/*## LUCENE2 begin ##
+/*## LUCENE2 ##
 import org.apache.lucene.index.IndexModifier;
 import org.apache.lucene.search.Hits;
-## LUCENE2 end ##*/
-//## LUCENE3 begin ##
+//*/
+//## LUCENE3 ##
 import java.io.File;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopDocs;
@@ -50,7 +50,7 @@ import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.Version;
 import org.apache.lucene.index.IndexWriter;
-//## LUCENE3 end ##
+//*/
 
 /**
  * This class implements the full text search based on Apache Lucene.
@@ -255,13 +255,13 @@ public class FullTextLucene extends FullText {
             IndexAccess access = INDEX_ACCESS.get(path);
             if (access == null) {
                 try {
-                    /*## LUCENE2 begin ##
+                    /*## LUCENE2 ##
                     boolean recreate = !IndexReader.indexExists(path);
                     Analyzer analyzer = new StandardAnalyzer();
                     access = new IndexAccess();
                     access.modifier = new IndexModifier(path, analyzer, recreate);
-                    ## LUCENE2 end ##*/
-                    //## LUCENE3 begin ##
+                    //*/
+                    //## LUCENE3 ##
                     File f = new File(path);
                     Directory indexDir = FSDirectory.open(f);
                     boolean recreate = !IndexReader.indexExists(indexDir);
@@ -274,7 +274,7 @@ public class FullTextLucene extends FullText {
                     access.writer = writer;
                     access.reader = reader;
                     access.searcher = new IndexSearcher(reader);
-                    //## LUCENE3 end ##
+                    //*/
                 } catch (IOException e) {
                     throw convertException(e);
                 }
@@ -348,15 +348,15 @@ public class FullTextLucene extends FullText {
         synchronized (INDEX_ACCESS) {
             try {
                 INDEX_ACCESS.remove(indexPath);
-                /*## LUCENE2 begin ##
+                /*## LUCENE2 ##
                 access.modifier.flush();
                 access.modifier.close();
-                ## LUCENE2 end ##*/
-                //## LUCENE3 begin ##
+                //*/
+                //## LUCENE3 ##
                 access.searcher.close();
                 access.reader.close();
                 access.writer.close();
-                //## LUCENE3 end ##
+                //*/
             } catch (Exception e) {
                 throw convertException(e);
             }
@@ -385,7 +385,7 @@ public class FullTextLucene extends FullText {
         }
         try {
             IndexAccess access = getIndexAccess(conn);
-            /*## LUCENE2 begin ##
+            /*## LUCENE2 ##
             access.modifier.flush();
             String path = getIndexPath(conn);
             IndexReader reader = IndexReader.open(path);
@@ -401,8 +401,8 @@ public class FullTextLucene extends FullText {
             for (int i = 0; i < limit && i + offset < max; i++) {
                 Document doc = hits.doc(i + offset);
                 float score = hits.score(i + offset);
-            ## LUCENE2 end ##*/
-            //## LUCENE3 begin ##
+            //*/
+            //## LUCENE3 ##
             // take a reference as the searcher may change
             Searcher searcher = access.searcher;
             // reuse the same analyzer; it's thread-safe;
@@ -426,7 +426,7 @@ public class FullTextLucene extends FullText {
                 ScoreDoc sd = docs.scoreDocs[i + offset];
                 Document doc = searcher.doc(sd.doc);
                 float score = sd.score;
-                //## LUCENE3 end ##
+                //*/
                 String q = doc.get(LUCENE_FIELD_QUERY);
                 if (data) {
                     int idx = q.indexOf(" WHERE ");
@@ -449,10 +449,10 @@ public class FullTextLucene extends FullText {
                     result.addRow(q, score);
                 }
             }
-            /*## LUCENE2 begin ##
+            /*## LUCENE2 ##
             // TODO keep it open if possible
             reader.close();
-            ## LUCENE2 end ##*/
+            //*/
         } catch (Exception e) {
             throw convertException(e);
         }
@@ -582,7 +582,7 @@ public class FullTextLucene extends FullText {
          * @param row the row
          */
         protected void insert(Object[] row) throws SQLException {
-            /*## LUCENE2 begin ##
+            /*## LUCENE2 ##
             String query = getQuery(row);
             Document doc = new Document();
             doc.add(new Field(LUCENE_FIELD_QUERY, query,
@@ -614,8 +614,8 @@ public class FullTextLucene extends FullText {
             } catch (IOException e) {
                 throw convertException(e);
             }
-            ## LUCENE2 end ##*/
-            //## LUCENE3 begin ##
+            //*/
+            //## LUCENE3 ##
             String query = getQuery(row);
             Document doc = new Document();
             doc.add(new Field(LUCENE_FIELD_QUERY, query,
@@ -655,7 +655,7 @@ public class FullTextLucene extends FullText {
             } catch (IOException e) {
                 throw convertException(e);
             }
-            //## LUCENE3 end ##
+            //*/
         }
 
         /**
@@ -667,12 +667,12 @@ public class FullTextLucene extends FullText {
             String query = getQuery(row);
             try {
                 Term term = new Term(LUCENE_FIELD_QUERY, query);
-                /*## LUCENE2 begin ##
+                /*## LUCENE2 ##
                 indexAccess.modifier.deleteDocuments(term);
-                ## LUCENE2 end ##*/
-                //## LUCENE3 begin ##
+                //*/
+                //## LUCENE3 ##
                 indexAccess.writer.deleteDocuments(term);
-                //## LUCENE3 end ##
+                //*/
             } catch (IOException e) {
                 throw convertException(e);
             }
@@ -706,30 +706,30 @@ public class FullTextLucene extends FullText {
         /**
          * The index modified.
          */
-        /*## LUCENE2 begin ##
+        /*## LUCENE2 ##
         IndexModifier modifier;
-        ## LUCENE2 end ##*/
+        //*/
 
         /**
          * The index writer.
          */
-        //## LUCENE3 begin ##
+        //## LUCENE3 ##
         IndexWriter writer;
-        //## LUCENE3 end ##
+        //*/
 
         /**
          * The index reader.
          */
-        //## LUCENE3 begin ##
+        //## LUCENE3 ##
         IndexReader reader;
-        //## LUCENE3 end ##
+        //*/
 
         /**
          * The index searcher.
          */
-        //## LUCENE3 begin ##
+        //## LUCENE3 ##
         Searcher searcher;
-        //## LUCENE3 end ##
+        //*/
     }
 
 }

h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java

@@ -31,13 +31,13 @@ import javax.sql.DataSource;
 import javax.sql.PooledConnection;
 import org.h2.util.New;
 
-//## Java 1.6 begin ##
+//## Java 1.6 ##
 import org.h2.message.DbException;
-//## Java 1.6 end ##
+//*/
 
-/*## Java 1.7 begin ##
+/*## Java 1.7 ##
 import java.util.logging.Logger;
-## Java 1.7 end ##*/
+//*/
 
 /**
  * A simple standalone JDBC connection pool.
@@ -310,31 +310,31 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
      *
      * @param iface the class
      */
-//## Java 1.6 begin ##
+//## Java 1.6 ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw DbException.getUnsupportedException("unwrap");
     }
-//## Java 1.6 end ##
+//*/
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      *
      * @param iface the class
      */
-//## Java 1.6 begin ##
+//## Java 1.6 ##
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         throw DbException.getUnsupportedException("isWrapperFor");
     }
-//## Java 1.6 end ##
+//*/
 
     /**
      * [Not supported]
      */
-/*## Java 1.7 begin ##
+/*## Java 1.7 ##
     public Logger getParentLogger() {
         return null;
     }
-## Java 1.7 end ##*/
+//*/
 
 
 }

h2/src/main/org/h2/jdbcx/JdbcDataSource.java

@@ -26,9 +26,9 @@ import org.h2.jdbc.JdbcConnection;
 import org.h2.message.TraceObject;
 import org.h2.util.StringUtils;
 
-/*## Java 1.7 begin ##
+/*## Java 1.7 ##
 import java.util.logging.Logger;
-## Java 1.7 end ##*/
+//*/
 
 /**
  * A data source for H2 database connections. It is a factory for XAConnection
@@ -361,31 +361,31 @@ public class JdbcDataSource extends TraceObject
      *
      * @param iface the class
      */
-//## Java 1.6 begin ##
+//## Java 1.6 ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw unsupported("unwrap");
     }
-//## Java 1.6 end ##
+//*/
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      *
      * @param iface the class
      */
-//## Java 1.6 begin ##
+//## Java 1.6 ##
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         throw unsupported("isWrapperFor");
     }
-//## Java 1.6 end ##
+//*/
 
     /**
      * [Not supported]
      */
-/*## Java 1.7 begin ##
+/*## Java 1.7 ##
     public Logger getParentLogger() {
         return null;
     }
-## Java 1.7 end ##*/
+//*/
 
     /**
      * INTERNAL

h2/src/main/org/h2/jdbcx/JdbcXAConnection.java

@@ -25,9 +25,9 @@ import org.h2.util.New;
 import org.h2.message.DbException;
 import org.h2.message.TraceObject;
 
-//## Java 1.6 begin ##
+//## Java 1.6 ##
 import javax.sql.StatementEventListener;
-//## Java 1.6 end ##
+//*/
 
 /**
  * This class provides support for distributed transactions.
@@ -369,22 +369,22 @@ public class JdbcXAConnection extends TraceObject implements XAConnection, XARes
      *
      * @param listener the new statement event listener
      */
-//## Java 1.6 begin ##
+//## Java 1.6 ##
     public void addStatementEventListener(StatementEventListener listener) {
         throw new UnsupportedOperationException();
     }
-//## Java 1.6 end ##
+//*/
 
     /**
      * [Not supported] Remove a statement event listener.
      *
      * @param listener the statement event listener
      */
-//## Java 1.6 begin ##
+//## Java 1.6 ##
     public void removeStatementEventListener(StatementEventListener listener) {
         throw new UnsupportedOperationException();
     }
-//## Java 1.6 end ##
+//*/
 
     /**
      * INTERNAL