--no commit message

--no commit message

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

@@ -13,14 +13,11 @@ import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Date;
-import java.sql.NClob;
 import java.sql.Ref;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
-import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
-import java.sql.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -29,6 +26,14 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Map;
 
+//#ifdef JDK16
+/*
+import java.sql.NClob;
+import java.sql.RowId;
+import java.sql.SQLXML;
+*/
+//#endif
+
 /**
  * This class is a simple result set and meta data implementation.
  * It can be used in Java functions that return a result set.
@@ -1561,36 +1566,44 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public RowId getRowId(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public RowId getRowId(String columnName) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public void updateRowId(int columnIndex, RowId x) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public void updateRowId(String columnName, RowId x) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /**
@@ -1631,74 +1644,90 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public void updateNClob(String columnName, NClob nClob) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public NClob getNClob(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public NClob getNClob(String columnName) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public SQLXML getSQLXML(String columnName) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public void updateSQLXML(int columnIndex, SQLXML xmlObject) 
             throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public void updateSQLXML(String columnName, SQLXML xmlObject) 
             throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
@@ -1747,18 +1776,22 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData {
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /** 
      * INTERNAL 
      */
 //#ifdef JDK16
+/*
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         throw getUnsupportedException();
     }
+*/
 //#endif
 
     /**