db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1479972 - in /db/derby/code/trunk/java/engine/org/apache/derby/vti: ForeignTableVTI.java VTITemplate.java VTITemplateBase.java build.xml
Date Tue, 07 May 2013 16:27:12 GMT
Author: rhillegas
Date: Tue May  7 16:27:11 2013
New Revision: 1479972

URL: http://svn.apache.org/r1479972
Log:
DERBY-6213: Convert the org.apache.derby.vti package to Java 6.

Removed:
    db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplateBase.java
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java
    db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
    db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java?rev=1479972&r1=1479971&r2=1479972&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/ForeignTableVTI.java Tue May  7 16:27:11
2013
@@ -134,7 +134,7 @@ public	class   ForeignTableVTI extends V
     //
     ////////////////////////////////////////////////////////////////////////
 
-    private static  HashMap _connections = new HashMap();
+    private static  HashMap<String,Connection> _connections = new HashMap<String,Connection>();
 
     private String  _foreignSchemaName;
     private String  _foreignTableName;
@@ -339,7 +339,7 @@ public	class   ForeignTableVTI extends V
         ( String connectionURL )
         throws SQLException
     {
-        Connection  conn = (Connection) _connections.get( connectionURL );
+        Connection  conn = _connections.get( connectionURL );
 
         if ( conn == null )
         {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java?rev=1479972&r1=1479971&r2=1479972&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java Tue May  7 16:27:11
2013
@@ -21,15 +21,38 @@
 
 package org.apache.derby.vti;
 
-import java.sql.SQLException;
+import java.io.InputStream;
+import java.io.Reader;
 import java.math.BigDecimal;
+import java.net.URL;
+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.SQLData;
+import java.sql.SQLException;
+import java.sql.SQLInput;
+import java.sql.SQLOutput;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Map;
 
 /**
 	An abstract implementation of ResultSet that is useful
 	when writing table functions, read-only VTIs (virtual table interface), and
 	the ResultSets returned by executeQuery in read-write VTI classes.
 	
-	This class implements most of the methods of the JDBC 3.0 interface java.sql.ResultSet,
+	This class implements most of the methods of the JDBC 4.0 interface java.sql.ResultSet,
 	each one throwing a  SQLException with the name of the method. 
 	A concrete subclass can then just implement the methods not implemented here 
 	and override any methods it needs to implement for correct functionality.
@@ -38,23 +61,19 @@ import java.math.BigDecimal;
 	<UL>
 	<LI>next()
 	<LI>close()
-	<LI>getMetaData()
 	</UL>
 	<P>
 
 	For table functions and virtual tables, the database engine only calls methods defined
 	in the JDBC 2.0 definition of java.sql.ResultSet.
-	<BR>
-	Classes that implement a JDBC 2.0 conformant java.sql.ResultSet can be used
-	as table functions and virtual tables.
  */
-public abstract class VTITemplate extends VTITemplateBase
+public abstract class VTITemplate   implements ResultSet
 {
-    // Together with our superclass, the following overrides are a trick
-    // to allow subclasses to compile on both Java 5 and Java 6
-    public abstract boolean next() throws SQLException;
-    public abstract void close() throws SQLException;
+    public  boolean 	isWrapperFor(Class<?> iface) throws SQLException { throw notImplemented(
"isWrapperFor" ); }
+    public  <T> T unwrap(Class<T> iface) throws SQLException { throw notImplemented(
"unwrap" ); }
 
+    public  ResultSetMetaData   getMetaData() throws SQLException { throw notImplemented(
"getMetaData" ); }
+    
     // If you implement findColumn() yourself, then the following overrides
     // mean that you only have to implement the getXXX(int) methods. You
     // don't have to also implement the getXXX(String) methods.
@@ -74,4 +93,196 @@ public abstract class VTITemplate extend
     public Object getObject(String columnName) throws SQLException { return getObject(findColumn(columnName));
}
 	public BigDecimal getBigDecimal(String columnName) throws SQLException { return getBigDecimal(findColumn(columnName));
}
 
+    //
+    // java.sql.ResultSet calls, passed through to our result set.
+    //
+
+    public boolean wasNull() throws SQLException { throw notImplemented( "wasNull" ); }
+    public String getString(int columnIndex) throws SQLException { throw notImplemented(
"getString" ); }
+    public boolean getBoolean(int columnIndex) throws SQLException { throw notImplemented(
"getBoolean" ); }
+    public byte getByte(int columnIndex) throws SQLException { throw notImplemented( "getByte"
); }
+    public short getShort(int columnIndex) throws SQLException { throw notImplemented( "getShort"
); }
+    public int getInt(int columnIndex) throws SQLException { throw notImplemented( "getInt"
); }
+    public long getLong(int columnIndex) throws SQLException { throw notImplemented( "getLong"
); }
+    public float getFloat(int columnIndex) throws SQLException { throw notImplemented( "getFloat"
); }
+    public double getDouble(int columnIndex) throws SQLException { throw notImplemented(
"getDouble" ); }
+    public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { throw
notImplemented( "getBigDecimal" ); }
+    public byte[] getBytes(int columnIndex) throws SQLException { throw notImplemented( "]
getBytes" ); }
+    public java.sql.Date getDate(int columnIndex) throws SQLException { throw notImplemented(
"sql.Date getDate" ); }
+    public java.sql.Time getTime(int columnIndex) throws SQLException { throw notImplemented(
"sql.Time getTime" ); }
+    public java.sql.Timestamp getTimestamp(int columnIndex) throws SQLException { throw notImplemented(
"sql.Timestamp getTimestamp" ); }
+    public java.io.InputStream getAsciiStream(int columnIndex) throws SQLException { throw
notImplemented( "io.InputStream getAsciiStream" ); }
+    public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException { throw
notImplemented( "io.InputStream getUnicodeStream" ); }
+    public java.io.InputStream getBinaryStream(int columnIndex) throws SQLException { throw
notImplemented( "io.InputStream getBinaryStream" ); }
+    public java.io.InputStream getAsciiStream(String columnName) throws SQLException { throw
notImplemented( "io.InputStream getAsciiStream" ); }
+    public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
throw notImplemented( "io.InputStream getUnicodeStream" ); }
+    public java.io.InputStream getBinaryStream(String columnName) throws SQLException { throw
notImplemented( "io.InputStream getBinaryStream" ); }
+    public SQLWarning getWarnings() throws SQLException { return null; }
+    public void clearWarnings() throws SQLException { throw notImplemented( "clearWarnings"
); }
+    public String getCursorName() throws SQLException { throw notImplemented( "getCursorName"
); }
+    public Object getObject(int columnIndex) throws SQLException { throw notImplemented(
"getObject" ); }
+    public int findColumn(String columnName) throws SQLException { throw notImplemented(
"findColumn" ); }
+    public java.io.Reader getCharacterStream(int columnIndex) throws SQLException { throw
notImplemented( "io.Reader getCharacterStream" ); }
+    public java.io.Reader getCharacterStream(String columnName) throws SQLException { throw
notImplemented( "io.Reader getCharacterStream" ); }
+    public BigDecimal getBigDecimal(int columnIndex) throws SQLException { throw notImplemented(
"getBigDecimal" ); }
+    public boolean isBeforeFirst() throws SQLException { throw notImplemented( "isBeforeFirst"
); }
+    public boolean isAfterLast() throws SQLException { throw notImplemented( "isAfterLast"
); }
+    public boolean isFirst() throws SQLException { throw notImplemented( "isFirst" ); }
+    public boolean isLast() throws SQLException { throw notImplemented( "isLast" ); }
+    public void beforeFirst() throws SQLException { throw notImplemented( "beforeFirst" );
}
+    public void afterLast() throws SQLException { throw notImplemented( "afterLast" ); }
+    public boolean first() throws SQLException { throw notImplemented( "first" ); }
+    public boolean last() throws SQLException { throw notImplemented( "last" ); }
+    public boolean isClosed() throws SQLException { throw notImplemented( "isClosed" ); }
+    public int getHoldability() throws SQLException { throw notImplemented( "getHoldability"
); }
+    public int getRow() throws SQLException { throw notImplemented( "getRow" ); }
+    public boolean absolute(int row) throws SQLException { throw notImplemented( "absolute"
); }
+    public boolean relative(int rows) throws SQLException { throw notImplemented( "relative"
); }
+    public boolean previous() throws SQLException { throw notImplemented( "previous" ); }
+    public void setFetchDirection(int direction) throws SQLException { throw notImplemented(
"setFetchDirection" ); }
+    public int getFetchDirection() throws SQLException { throw notImplemented( "getFetchDirection"
); }
+    public void setFetchSize(int rows) throws SQLException { throw notImplemented( "setFetchSize"
); }
+    public int getFetchSize() throws SQLException { throw notImplemented( "getFetchSize"
); }
+    public int getType() throws SQLException { throw notImplemented( "getType" ); }
+    public int getConcurrency() throws SQLException { throw notImplemented( "getConcurrency"
); }
+    public boolean rowUpdated() throws SQLException { throw notImplemented( "rowUpdated"
); }
+    public boolean rowInserted() throws SQLException { throw notImplemented( "rowInserted"
); }
+    public boolean rowDeleted() throws SQLException { throw notImplemented( "rowDeleted"
); }
+    public void updateNull(int columnIndex) throws SQLException { throw notImplemented( "updateNull"
); }
+    public void updateBoolean(int columnIndex, boolean x) throws SQLException { throw notImplemented(
"updateBoolean" ); }
+    public void updateByte(int columnIndex, byte x) throws SQLException { throw notImplemented(
"updateByte" ); }
+    public void updateBytes(int columnIndex, byte[] x) throws SQLException { throw notImplemented(
"updateBytes" ); }
+    public void updateShort(int columnIndex, short x) throws SQLException { throw notImplemented(
"updateShort" ); }
+    public void updateInt(int columnIndex, int x) throws SQLException { throw notImplemented(
"updateInt" ); }
+    public void updateLong(int columnIndex, long x) throws SQLException { throw notImplemented(
"updateLong" ); }
+    public void updateFloat(int columnIndex, float x) throws SQLException { throw notImplemented(
"updateFloat" ); }
+    public void updateDouble(int columnIndex, double x) throws SQLException { throw notImplemented(
"updateDouble" ); }
+    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException { throw
notImplemented( "updateBigDecimal" ); }
+    public void updateString(int columnIndex, String x) throws SQLException { throw notImplemented(
"updateString" ); }
+    public void updateDate(int columnIndex, java.sql.Date x) throws SQLException { throw
notImplemented( "updateDate" ); }
+    public void updateTime(int columnIndex, java.sql.Time x) throws SQLException { throw
notImplemented( "updateTime" ); }
+    public void updateTimestamp(int columnIndex, java.sql.Timestamp x) throws SQLException
{ throw notImplemented( "updateTimestamp" ); }
+    public void updateAsciiStream(int columnIndex, InputStream x ) throws SQLException {
throw notImplemented( "updateAsciiStream" ); }
+    public void updateAsciiStream(int columnIndex, InputStream x, int length ) throws SQLException
{ throw notImplemented( "updateAsciiStream" ); }
+    public void updateAsciiStream(int columnIndex, InputStream x, long length ) throws SQLException
{ throw notImplemented( "updateAsciiStream" ); }
+	public void updateBinaryStream(int columnIndex, InputStream x)  throws SQLException { throw
notImplemented( "updateBinaryStream" ); }
+	public void updateBinaryStream(int columnIndex, InputStream x, int length)  throws SQLException
{ throw notImplemented( "updateBinaryStream" ); }
+	public void updateBinaryStream(int columnIndex, InputStream x, long length)  throws SQLException
{ throw notImplemented( "updateBinaryStream" ); }
+	public void updateCharacterStream(int columnIndex, java.io.Reader x ) throws SQLException
{ throw notImplemented( "updateCharacterStream" ); }
+	public void updateCharacterStream(int columnIndex, java.io.Reader x, long length ) throws
SQLException { throw notImplemented( "updateCharacterStream" ); }
+	public void updateCharacterStream(int columnIndex, java.io.Reader x, int length ) throws
SQLException { throw notImplemented( "updateCharacterStream" ); }
+	public void updateObject(int columnIndex, Object x, int scale) throws SQLException { throw
notImplemented( "updateObject" ); }
+	public void updateObject(int columnIndex, Object x) throws SQLException { throw notImplemented(
"updateObject" ); }
+	public void updateNull(String columnName) throws SQLException { throw notImplemented( "updateNull"
); }
+	public void updateBoolean(String columnName, boolean x) throws SQLException { throw notImplemented(
"updateBoolean" ); }
+	public void updateByte(String columnName, byte x) throws SQLException { throw notImplemented(
"updateByte" ); }
+	public void updateShort(String columnName, short x) throws SQLException { throw notImplemented(
"updateShort" ); }
+	public void updateInt(String columnName, int x) throws SQLException { throw notImplemented(
"updateInt" ); }
+	public void updateLong(String columnName, long x) throws SQLException { throw notImplemented(
"updateLong" ); }
+	public void updateFloat(String columnName, float x) throws SQLException { throw notImplemented(
"updateFloat" ); }
+	public void updateDouble(String columnName, double x) throws SQLException { throw notImplemented(
"updateDouble" ); }
+	public void updateBigDecimal(String columnName, BigDecimal x) throws SQLException { throw
notImplemented( "updateBigDecimal" ); }
+	public void updateString(String columnName, String x) throws SQLException { throw notImplemented(
"updateString" ); }
+	public void updateBytes(String columnName, byte[] x) throws SQLException { throw notImplemented(
"updateBytes" ); }
+	public void updateDate(String columnName, java.sql.Date x) throws SQLException { throw notImplemented(
"updateDate" ); }
+	public void updateTime(String columnName, java.sql.Time x) throws SQLException { throw notImplemented(
"updateTime" ); }
+	public void updateTimestamp(String columnName, java.sql.Timestamp x) throws SQLException
{ throw notImplemented( "updateTimestamp" ); }
+	public void updateAsciiStream(String columnName, java.io.InputStream x) throws SQLException
{ throw notImplemented( "updateAsciiStream" ); }
+	public void updateAsciiStream(String columnName, java.io.InputStream x, int length) throws
SQLException { throw notImplemented( "updateAsciiStream" ); }
+	public void updateAsciiStream(String columnName, java.io.InputStream x, long length) throws
SQLException { throw notImplemented( "updateAsciiStream" ); }
+	public void updateBinaryStream(String columnName, java.io.InputStream x) throws SQLException
{ throw notImplemented( "updateBinaryStream" ); }
+	public void updateBinaryStream(String columnName, java.io.InputStream x, int length) throws
SQLException { throw notImplemented( "updateBinaryStream" ); }
+	public void updateBinaryStream(String columnName, java.io.InputStream x, long length) throws
SQLException { throw notImplemented( "updateBinaryStream" ); }
+	public void updateCharacterStream(String columnName, java.io.Reader x) throws SQLException
{ throw notImplemented( "updateCharacterStream" ); }
+	public void updateCharacterStream(String columnName, java.io.Reader x, long length) throws
SQLException { throw notImplemented( "updateCharacterStream" ); }
+	public void updateCharacterStream(String columnName, java.io.Reader x, int length) throws
SQLException { throw notImplemented( "updateCharacterStream" ); }
+	public void updateObject(String columnName, Object x, int scale) throws SQLException { throw
notImplemented( "updateObject" ); }
+	public void updateObject(String columnName, Object x) throws SQLException { throw notImplemented(
"updateObject" ); }
+	public void insertRow() throws SQLException { throw notImplemented( "insertRow" ); }
+	public void updateRow() throws SQLException { throw notImplemented( "updateRow" ); }
+	public void deleteRow() throws SQLException { throw notImplemented( "deleteRow" ); }
+	public void refreshRow() throws SQLException { throw notImplemented( "refreshRow" ); }
+	public void cancelRowUpdates() throws SQLException { throw notImplemented( "cancelRowUpdates"
); }
+	public void moveToInsertRow() throws SQLException { throw notImplemented( "moveToInsertRow"
); }
+	public void moveToCurrentRow() throws SQLException { throw notImplemented( "moveToCurrentRow"
); }
+	public Statement getStatement() throws SQLException { throw notImplemented( "getStatement"
); }
+	public java.sql.Date getDate(int columnIndex, Calendar cal) throws SQLException { throw
notImplemented( "sql.Date getDate" ); }
+	public java.sql.Date getDate(String columnName, Calendar cal) throws SQLException { throw
notImplemented( "sql.Date getDate" ); }
+	public java.sql.Time getTime(int columnIndex, Calendar cal) throws SQLException { throw
notImplemented( "sql.Time getTime" ); }
+	public java.sql.Time getTime(String columnName, Calendar cal) throws SQLException { throw
notImplemented( "sql.Time getTime" ); }
+	public java.sql.Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException
{ throw notImplemented( "sql.Timestamp getTimestamp" ); }
+	public java.sql.Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException
{ throw notImplemented( "sql.Timestamp getTimestamp" ); }
+	public URL getURL(int columnIndex) throws SQLException { throw notImplemented( "getURL"
); }
+	public URL getURL(String columnName) throws SQLException { throw notImplemented( "getURL"
); }
+	public Object getObject(int i, java.util.Map map) throws SQLException { throw notImplemented(
"getObject" ); }
+	public Ref getRef(int i) throws SQLException { throw notImplemented( "getRef" ); }
+	public Blob getBlob(int i) throws SQLException { throw notImplemented( "getBlob" ); }
+	public Clob getClob(int i) throws SQLException { throw notImplemented( "getClob" ); }
+	public Array getArray(int i) throws SQLException { throw notImplemented( "getArray" ); }
+	public Object getObject(String colName, java.util.Map map) throws SQLException { throw notImplemented(
"getObject" ); }
+	public Ref getRef(String colName) throws SQLException { throw notImplemented( "getRef" );
}
+	public Blob getBlob(String colName) throws SQLException { throw notImplemented( "getBlob"
); }
+	public Clob getClob(String colName) throws SQLException { throw notImplemented( "getClob"
); }
+	public Array getArray(String colName) throws SQLException { throw notImplemented( "getArray"
); }
+    public SQLXML getSQLXML(int columnIndex) throws SQLException { throw notImplemented(
"getSQLXML" ); }
+    public SQLXML getSQLXML(String columnLabel) throws SQLException { throw notImplemented(
"getSQLXML" ); }
+	public void updateRef(int columnIndex, Ref x) throws SQLException { throw notImplemented(
"updateRef" ); }
+	public void updateRef(String columnName, Ref x) throws SQLException { throw notImplemented(
"updateRef" ); }
+	public void updateBlob(int columnIndex, Blob x) throws SQLException { throw notImplemented(
"updateBlob" ); }
+	public void updateBlob(String columnName, Blob x) throws SQLException { throw notImplemented(
"updateBlob" ); }
+	public void updateBlob(int columnIndex, InputStream x) throws SQLException { throw notImplemented(
"updateBlob" ); }
+	public void updateBlob(int columnIndex, InputStream x, long pos) throws SQLException { throw
notImplemented( "updateBlob" ); }
+	public void updateBlob(String columnName, InputStream x) throws SQLException { throw notImplemented(
"updateBlob" ); }
+	public void updateBlob(String columnName, InputStream x, long pos) throws SQLException {
throw notImplemented( "updateBlob" ); }
+	public void updateClob(int columnIndex, Clob x) throws SQLException { throw notImplemented(
"updateClob" ); }
+	public void updateClob(String columnName, Clob x) throws SQLException { throw notImplemented(
"updateClob" ); }
+	public void updateClob(int columnIndex, Reader x) throws SQLException { throw notImplemented(
"updateClob" ); }
+	public void updateClob(int columnIndex, Reader x, long pos) throws SQLException { throw
notImplemented( "updateClob" ); }
+	public void updateClob(String columnName, Reader x) throws SQLException { throw notImplemented(
"updateClob" ); }
+	public void updateClob(String columnName, Reader x, long pos) throws SQLException { throw
notImplemented( "updateClob" ); }
+	public void updateArray(int columnIndex, Array x) throws SQLException { throw notImplemented(
"updateArray" ); }
+	public void updateArray(String columnName, Array x) throws SQLException { throw notImplemented(
"updateArray" ); }
+
+    public  Reader 	getNCharacterStream(int columnIndex) throws SQLException { throw notImplemented(
"getNCharacterStream" ); }
+    public  Reader 	getNCharacterStream(String columnLabel) throws SQLException { throw notImplemented(
"getNCharacterStream" ); }
+    public  NClob 	getNClob(int columnIndex) throws SQLException { throw notImplemented(
"getNClob" ); }
+    public  NClob 	getNClob(String columnLabel) throws SQLException { throw notImplemented(
"getNClob" ); }
+    public  String 	getNString(int columnIndex) throws SQLException { throw notImplemented(
"getNString" ); }
+    public  String 	getNString(String columnLabel) throws SQLException { throw notImplemented(
"getNString" ); }
+    public  RowId 	getRowId(int columnIndex) throws SQLException { throw notImplemented(
"getRowId" ); }
+    public  RowId 	getRowId(String columnLabel) throws SQLException { throw notImplemented(
"getRowId" ); }
+    
+    public  void 	updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
throw notImplemented( "updateNCharacterStream" ); }
+    public  void 	updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException
{ throw notImplemented( "updateNCharacterStream" ); }
+    public  void 	updateNCharacterStream(String columnLabel, Reader reader) throws SQLException
{ throw notImplemented( "updateNCharacterStream" ); }
+    public  void 	updateNCharacterStream(String columnLabel, Reader reader, long length)
throws SQLException { throw notImplemented( "updateNCharacterStream" ); }
+    public  void 	updateNClob(int columnIndex, NClob nClob) throws SQLException { throw notImplemented(
"updateNClob" ); }
+    public  void 	updateNClob(int columnIndex, Reader reader) throws SQLException { throw
notImplemented( "updateNClob" ); }
+    public  void 	updateNClob(int columnIndex, Reader reader, long length) throws SQLException
{ throw notImplemented( "updateNClob" ); }
+    public  void 	updateNClob(String columnLabel, NClob nClob) throws SQLException { throw
notImplemented( "updateNClob" ); }
+    public  void 	updateNClob(String columnLabel, Reader reader) throws SQLException { throw
notImplemented( "updateNClob" ); }
+    public  void 	updateNClob(String columnLabel, Reader reader, long length) throws SQLException
{ throw notImplemented( "updateNClob" ); }
+    public  void 	updateNString(int columnIndex, String nString) throws SQLException { throw
notImplemented( "updateNString" ); }
+    public  void 	updateNString(String columnLabel, String nString) throws SQLException {
throw notImplemented( "updateNString" ); }
+    public  void 	updateRowId(int columnIndex, RowId x) throws SQLException { throw notImplemented(
"updateRowId" ); }
+    public  void 	updateRowId(String columnLabel, RowId x) throws SQLException { throw notImplemented(
"updateRowId" ); }
+    public  void 	updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { throw
notImplemented( "updateSQLXML" ); }
+    public  void 	updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException
{ throw notImplemented( "updateSQLXML" ); }
+    
+    /////////////////////////////////////////////////////////////////////////
+    //
+    //  MINIONS
+    //
+    /////////////////////////////////////////////////////////////////////////
+
+    /**
+     * <p>
+     * Create a SQLException saying that the calling method is not implemented.
+     * </p>
+     */
+    protected SQLException    notImplemented( String methodName )
+    {
+        return new SQLException( "Unimplemented method: " + methodName );
+    }
+    
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml?rev=1479972&r1=1479971&r2=1479972&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml Tue May  7 16:27:11 2013
@@ -38,8 +38,8 @@
   <target name="compile_vti">
 
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.6"
+      target="1.6"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,37 +51,10 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/vti/*.java"/>
-      <exclude name="${derby.dir}/vti/UpdatableVTITemplate.java"/>
-      <exclude name="${derby.dir}/vti/VTITemplate.java"/>
-      <exclude name="${derby.dir}/vti/VTITemplateBase.java"/>
-      <exclude name="${derby.dir}/vti/StringColumnVTI.java"/>
-      <exclude name="${derby.dir}/vti/ForeignTableVTI.java"/>
-
-    </javac>
-    <javac
-      source="1.4"
-      target="1.4"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}" 
-      srcdir="${derby.engine.src.dir}"
-      destdir="${out.dir}">
-      <classpath>
-        <pathelement path="${java15compile.classpath}"/>
-      </classpath>
-    	<include name="${derby.dir}/vti/UpdatableVTITemplate.java"/>
-    	<include name="${derby.dir}/vti/VTITemplate.java"/>
-    	<include name="${derby.dir}/vti/VTITemplateBase.java"/>
-    	<include name="${derby.dir}/vti/StringColumnVTI.java"/>
-    	<include name="${derby.dir}/vti/ForeignTableVTI.java"/>
+      <compilerarg value="-Xlint:unchecked"/>
     </javac>
   </target>
 



Mime
View raw message