switch to jdk 1.6 by default

h2/src/main/org/h2/jdbc/JdbcCallableStatement.java

@@ -16,11 +16,11 @@ import java.sql.CallableStatement;
 import java.sql.Clob;
 import java.sql.Date;
 import java.sql.Ref;
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.NClob;
 import java.sql.SQLXML;
 import java.sql.RowId;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -463,12 +463,12 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setAsciiStream(String parameterName, InputStream x, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
@@ -610,219 +610,219 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowId getRowId(int parameterIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowId getRowId(String parameterName) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setRowId(String parameterName, RowId x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNString(String parameterName, String value) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNCharacterStream(String parameterName, Reader value, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNClob(String parameterName, NClob value)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setClob(String parameterName, Reader reader, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setBlob(String parameterName, InputStream inputStream, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNClob(String parameterName, Reader reader, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob getNClob(int parameterIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob getNClob(String parameterName) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setSQLXML(String parameterName, SQLXML xmlObject) 
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML getSQLXML(int parameterIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML getSQLXML(String parameterName) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public String getNString(int parameterIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public String getNString(String parameterName) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Reader getNCharacterStream(int parameterIndex)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Reader getNCharacterStream(String parameterName)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Reader getCharacterStream(int parameterIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Reader getCharacterStream(String parameterName)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setBlob(String parameterName, Blob x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setClob(String parameterName, Clob x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setAsciiStream(String parameterName, InputStream x)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
@@ -834,79 +834,79 @@ public class JdbcCallableStatement extends JdbcPreparedStatement implements Call
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setBinaryStream(String parameterName, InputStream x)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setBinaryStream(String parameterName, InputStream x, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setBlob(String parameterName, InputStream x)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setCharacterStream(String parameterName, Reader x)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setCharacterStream(String parameterName, Reader x, long length)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setClob(String parameterName, Reader x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNCharacterStream(String parameterName, Reader x)
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNClob(String parameterName, Reader x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 }

h2/src/main/org/h2/jdbc/JdbcClob.java

@@ -21,17 +21,17 @@ import org.h2.message.TraceObject;
 import org.h2.util.IOUtils;
 import org.h2.value.Value;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.NClob;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 /**
  * Represents a CLOB value.
  */
 public class JdbcClob extends TraceObject implements Clob
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     , NClob
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 {
 
     private Value value;

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -42,13 +42,13 @@ import org.h2.value.ValueLob;
 import org.h2.value.ValueNull;
 import org.h2.value.ValueString;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.Array;
 import java.sql.NClob;
 import java.sql.Struct;
 import java.sql.SQLXML;
 import java.sql.SQLClientInfoException;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 /**
  * Represents a connection (session) to a database.
@@ -1350,7 +1350,7 @@ public class JdbcConnection extends TraceObject implements Connection {
      *
      * @return the object
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob createNClob() throws SQLException {
         try {
             int id = getNextId(TraceObject.CLOB);
@@ -1362,36 +1362,36 @@ public class JdbcConnection extends TraceObject implements Connection {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Create a new empty SQLXML object.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML createSQLXML() throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Create a new empty Array object.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Array createArrayOf(String typeName, Object[] elements) 
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Create a new empty Struct object.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Struct createStruct(String typeName, Object[] attributes) 
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns true if this connection is still valid.
@@ -1414,61 +1414,61 @@ public class JdbcConnection extends TraceObject implements Connection {
     /**
      * [Not supported] Set a client property.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setClientInfo(String name, String value) 
             throws SQLClientInfoException {
         throw new SQLClientInfoException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Set the client properties.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setClientInfo(Properties properties) throws SQLClientInfoException {
         throw new SQLClientInfoException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Get the client properties.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Properties getClientInfo() throws SQLClientInfoException {
         throw new SQLClientInfoException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Set a client property.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public String getClientInfo(String name) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Return an object of this class if possible.
      *
      * @param iface the class
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## 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 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     Value createClob(Reader x, long length) throws SQLException {
         if (x == null) {

h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java

@@ -10,9 +10,9 @@ import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.RowIdLifetime;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 import java.sql.SQLException;
 
 import org.h2.constant.SysProperties;
@@ -2647,23 +2647,23 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
      * Get the lifetime of a rowid.
      * @return ROWID_UNSUPPORTED
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowIdLifetime getRowIdLifetime() {
         debugCodeCall("getRowIdLifetime");
         return RowIdLifetime.ROWID_UNSUPPORTED;
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Gets the list of schemas.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public ResultSet getSchemas(String catalog, String schemaPattern)
             throws SQLException {
         debugCodeCall("getSchemas");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns whether the database supports calling functions using the call syntax.
@@ -2694,45 +2694,45 @@ public class JdbcDatabaseMetaData extends TraceObject implements DatabaseMetaDat
     /**
      * [Not supported] Return an object of this class if possible.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         debugCodeCall("unwrap");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCodeCall("isWrapperFor");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Gets the list of function columns.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public ResultSet getFunctionColumns(String catalog, String schemaPattern, 
             String functionNamePattern, String columnNamePattern) 
             throws SQLException {
         debugCodeCall("getFunctionColumns");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Gets the list of functions.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public ResultSet getFunctions(String catalog, String schemaPattern, 
             String functionNamePattern) throws SQLException {
         debugCodeCall("getFunctions");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * INTERNAL

h2/src/main/org/h2/jdbc/JdbcParameterMetaData.java

@@ -218,22 +218,22 @@ implements ParameterMetaData
     /**
      * [Not supported] Return an object of this class if possible.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         debugCodeCall("unwrap");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCodeCall("isWrapperFor");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
     
     /**
      * INTERNAL

h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java

@@ -50,11 +50,11 @@ import org.h2.value.ValueString;
 import org.h2.value.ValueTime;
 import org.h2.value.ValueTimestamp;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.RowId;
 import java.sql.NClob;
 import java.sql.SQLXML;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 /**
  * Represents a prepared statement.
@@ -1231,11 +1231,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
     /**
      * [Not supported] Sets the value of a parameter as a row id.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setRowId(int parameterIndex, RowId x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Sets the value of a parameter.
@@ -1295,7 +1295,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
      * @param x the value
      * @throws SQLException if this object is closed
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setNClob(int parameterIndex, NClob x) throws SQLException {
         try {
             if (isDebugEnabled()) {
@@ -1313,7 +1313,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Sets the value of a parameter as a Clob.
@@ -1398,11 +1398,11 @@ public class JdbcPreparedStatement extends JdbcStatement implements PreparedStat
     /**
      * [Not supported] Sets the value of a parameter as a SQLXML object.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void setSQLXML(int parameterIndex, SQLXML x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * INTERNAL

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -26,11 +26,11 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 import org.h2.constant.ErrorCode;
 import org.h2.constant.SysProperties;
@@ -3031,22 +3031,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
      *
      * @param columnIndex (1,2,...)
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowId getRowId(int columnIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Returns the value of the specified column as a row id.
      *
      * @param columnName the name of the column label
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowId getRowId(String columnName) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Updates a column in the current or insert row.
@@ -3054,11 +3054,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
      * @param columnIndex (1,2,...)
      * @param x the value
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateRowId(int columnIndex, RowId x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Updates a column in the current or insert row.
@@ -3066,11 +3066,11 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
      * @param columnName the name of the column label
      * @param x the value
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateRowId(String columnName, RowId x) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns the current result set holdability.
@@ -3141,7 +3141,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(int columnIndex, NClob x) throws SQLException {
         try {
             if (isDebugEnabled()) {
@@ -3152,12 +3152,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(int columnIndex, Reader x) throws SQLException {
         try {
             if (isDebugEnabled()) {
@@ -3168,12 +3168,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(int columnIndex, Reader x, long length) 
             throws SQLException {
         try {
@@ -3185,12 +3185,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(String columnName, Reader x) 
             throws SQLException {
         try {
@@ -3202,12 +3202,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(String columnName, Reader x, long length) 
             throws SQLException {
         try {
@@ -3219,12 +3219,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported]
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(String columnName, NClob x) throws SQLException {
         try {
             if (isDebugEnabled()) {
@@ -3235,7 +3235,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 
     /**
@@ -3245,7 +3245,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
      * @return the value
      * @throws SQLException if the column is not found or if the result set is closed
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob getNClob(int columnIndex) throws SQLException {
         try {
             int id = getNextId(TraceObject.CLOB);
@@ -3256,7 +3256,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns the value of the specified column as a Clob.
@@ -3265,7 +3265,7 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
      * @return the value
      * @throws SQLException if the column is not found or if the result set is closed
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob getNClob(String columnName) throws SQLException {
         try {
             int id = getNextId(TraceObject.CLOB);
@@ -3276,45 +3276,45 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
             throw logAndConvert(e);
         }
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Returns the value of the specified column as a SQLXML object.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Returns the value of the specified column as a SQLXML object.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML getSQLXML(String columnName) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Updates a column in the current or insert row.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateSQLXML(int columnIndex, SQLXML xmlObject) 
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Updates a column in the current or insert row.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateSQLXML(String columnName, SQLXML xmlObject) 
             throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns the value of the specified column as a String.
@@ -3451,22 +3451,22 @@ public class JdbcResultSet extends TraceObject implements ResultSet {
     /**
      * [Not supported] Return an object of this class if possible.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         debugCode("unwrap");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCode("isWrapperFor");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * INTERNAL

h2/src/main/org/h2/jdbc/JdbcResultSetMetaData.java

@@ -431,22 +431,22 @@ public class JdbcResultSetMetaData extends TraceObject implements ResultSetMetaD
     /**
      * [Not supported] Return an object of this class if possible.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         debugCodeCall("unwrap");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         debugCodeCall("isWrapperFor");
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
     
     /**
      * INTERNAL

h2/src/main/org/h2/jdbc/JdbcStatement.java

@@ -871,20 +871,20 @@ public class JdbcStatement extends TraceObject implements Statement {
     /**
      * [Not supported] Return an object of this class if possible.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * [Not supported] Checks if unwrap can return an object of this class.
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns whether this object is poolable.

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

@@ -31,9 +31,9 @@ import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
 import javax.sql.PooledConnection;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import org.h2.message.Message;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 /**
  * A simple standalone JDBC connection pool.
@@ -321,21 +321,21 @@ public class JdbcConnectionPool implements DataSource {
      *
      * @param iface the class
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## 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 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 }

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

@@ -25,9 +25,9 @@ import javax.sql.XADataSource;
 import org.h2.jdbc.JdbcConnection;
 import org.h2.message.TraceObject;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import org.h2.message.Message;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 /**
  * A data source for H2 database connections. It is a factory for XAConnection
@@ -320,22 +320,22 @@ implements XADataSource, DataSource, ConnectionPoolDataSource, Serializable, Ref
      *
      * @param iface the class
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## 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 begin ##
     public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw Message.getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * INTERNAL

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

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

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

@@ -27,11 +27,11 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Map;
 
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
 import java.sql.NClob;
 import java.sql.RowId;
 import java.sql.SQLXML;
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 /**
  * This class is a simple result set and meta data implementation.
@@ -1622,38 +1622,38 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowId getRowId(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public RowId getRowId(String columnName) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateRowId(int columnIndex, RowId x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateRowId(String columnName, RowId x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /**
      * Returns the current result set holdability.
@@ -1678,98 +1678,98 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNString(int columnIndex, String nString) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNString(String columnName, String nString) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(int columnIndex, NClob nClob) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(String columnName, NClob nClob) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob getNClob(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public NClob getNClob(String columnName) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public SQLXML getSQLXML(String columnName) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateSQLXML(int columnIndex, SQLXML xmlObject) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateSQLXML(String columnName, SQLXML xmlObject) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
@@ -1788,332 +1788,312 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Reader getNCharacterStream(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public Reader getNCharacterStream(String columnName) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
-    public void updateNCharacterStream(int columnIndex, Reader x, int length) 
-            throws SQLException {
-        throw getUnsupportedException();
-    }
-## Java 1.6 end ##*/
-
-    /** 
-     * INTERNAL 
-     */
-/*## Java 1.6 begin ##
-    public void updateNCharacterStream(String columnName, Reader x, int length) 
-            throws SQLException {
-        throw getUnsupportedException();
-    }
-## Java 1.6 end ##*/
-
-    /** 
-     * INTERNAL 
-     */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+//## Java 1.6 begin ##
+    public boolean isWrapperFor(Class< ? > iface) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateAsciiStream(int columnIndex, InputStream x) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateAsciiStream(String columnName, InputStream x) 
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateAsciiStream(int columnIndex, InputStream x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateAsciiStream(String columnName, InputStream x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBinaryStream(int columnName, InputStream x)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBinaryStream(String columnName, InputStream x)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBinaryStream(int columnIndex, InputStream x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBinaryStream(String columnName, InputStream x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBlob(int columnIndex, InputStream x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBlob(String columnName, InputStream x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBlob(int columnIndex, InputStream x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateBlob(String columnName, InputStream x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateCharacterStream(int columnIndex, Reader x)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateCharacterStream(String columnName, Reader x)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateCharacterStream(int columnIndex, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateCharacterStream(String columnName, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateClob(int columnIndex, Reader x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateClob(String columnName, Reader x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateClob(int columnIndex, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateClob(String columnName, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNCharacterStream(int columnIndex, Reader x)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNCharacterStream(String columnName, Reader x)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNCharacterStream(int columnIndex, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNCharacterStream(String columnName, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(int columnIndex, Reader x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(String columnName, Reader x) throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(int columnIndex, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
     /** 
      * INTERNAL 
      */
-/*## Java 1.6 begin ##
+//## Java 1.6 begin ##
     public void updateNClob(String columnName, Reader x, long length)
             throws SQLException {
         throw getUnsupportedException();
     }
-## Java 1.6 end ##*/
+//## Java 1.6 end ##
 
 }

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

@@ -39,11 +39,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Integer getInteger(int x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Integer.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         // NOPMD
         return new Integer(x); 
     }
@@ -55,11 +55,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Character getCharacter(char x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Character.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         return new Character(x);
     }
 
@@ -70,11 +70,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Long getLong(long x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Long.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         // NOPMD
         return new Long(x); 
     }
@@ -86,11 +86,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Short getShort(short x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Short.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         // NOPMD
         return new Short(x); 
     }
@@ -102,11 +102,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Byte getByte(byte x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Byte.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         // NOPMD
         return new Byte(x); 
     }
@@ -118,11 +118,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Float getFloat(float x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Float.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         return new Float(x);
     }
 
@@ -133,11 +133,11 @@ public class ObjectUtils {
      * @return the object
      */
     public static Double getDouble(double x) {
-/*## Java 1.5 begin ##
+//## Java 1.5 begin ##
         if (true) {
             return Double.valueOf(x);
         }
-## Java 1.5 end ##*/
+//## Java 1.5 end ##
         return new Double(x);
     }