db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r957386 - in /db/derby/code/branches/10.3: ./ java/build/org/apache/derbyBuild/ java/client/org/apache/derby/client/am/ java/engine/org/apache/derby/iapi/jdbc/ java/engine/org/apache/derby/impl/db/ java/engine/org/apache/derby/impl/jdbc/ ja...
Date Wed, 23 Jun 2010 23:27:10 GMT
Author: kmarsden
Date: Wed Jun 23 23:27:09 2010
New Revision: 957386

URL: http://svn.apache.org/viewvc?rev=957386&view=rev
Log:
DERBY-3132 deprecation warnings when building with jdk15 and build.compiler modern
Contributed by Knut Anders Hatlen


Modified:
    db/derby/code/branches/10.3/   (props changed)
    db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/propertyconfig.java
    db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/splitmessages.java
    db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/CallableStatement.java
    db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/PreparedStatement.java
    db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/ResultSet.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/db/BasicDatabase.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
    db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/VTITemplate.java
    db/derby/code/branches/10.3/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
    db/derby/code/branches/10.3/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java

Propchange: db/derby/code/branches/10.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 23 23:27:09 2010
@@ -1 +1 @@
-/db/derby/code/trunk:552046,788436,793588,794303,796316,796372,798347,798742,800523,803548,816536,882732,946794
+/db/derby/code/trunk:552046,586313,586317,788436,793588,794303,796316,796372,798347,798742,800523,803548,816536,882732,946794

Modified: db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/propertyconfig.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/propertyconfig.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/propertyconfig.java (original)
+++ db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/propertyconfig.java Wed Jun
23 23:27:09 2010
@@ -313,7 +313,7 @@ public class propertyconfig {
 		FileOutputStream os = new FileOutputStream(outputfile);
 		try
 		{
-			outputProp.save(os, 
+			outputProp.store(os,
 							header.
 							concat("# config is ").concat(config).
 							concat(footer));

Modified: db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/splitmessages.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/branches/10.3/java/build/org/apache/derbyBuild/splitmessages.java Wed Jun
23 23:27:09 2010
@@ -174,7 +174,7 @@ public class splitmessages {
 				new FileOutputStream(new File(dir, "m"+i+locale+".properties")), 16 * 1024);
 
             
-			c[i].save(fos, (String) null);
+			c[i].store(fos, (String) null);
 			fos.flush();
 			fos.close();
             
@@ -182,7 +182,7 @@ public class splitmessages {
 				// add duplicate english file as the base
 				fos = new BufferedOutputStream(
 					new FileOutputStream(new File(dir, "m"+i+".properties")), 16 * 1024);
-				c[i].save(fos, (String) null);
+				c[i].store(fos, (String) null);
 				fos.flush();
 				fos.close();
 			}
@@ -199,7 +199,7 @@ public class splitmessages {
             new FileOutputStream(new File(dir, clientPropsFileName)), 
             16 * 1024);
 
-        clientProps.save(clientOutStream, (String)null);
+        clientProps.store(clientOutStream, (String)null);
         clientOutStream.flush();
         clientOutStream.close();
         
@@ -210,7 +210,7 @@ public class splitmessages {
                 new FileOutputStream(new File(dir, "clientmessages.properties")), 
                 16 * 1024);
 
-            clientProps.save(clientOutStream, (String)null);
+            clientProps.store(clientOutStream, (String)null);
             clientOutStream.flush();
             clientOutStream.close();            
         }

Modified: db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/CallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/CallableStatement.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/CallableStatement.java
(original)
+++ db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/CallableStatement.java
Wed Jun 23 23:27:09 2010
@@ -408,6 +408,7 @@ public class CallableStatement extends P
         }
     }
 
+    /** @deprecated */
     public java.math.BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException,
ArithmeticException {
         try
         {

Modified: db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/PreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/PreparedStatement.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/PreparedStatement.java
(original)
+++ db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/PreparedStatement.java
Wed Jun 23 23:27:09 2010
@@ -1190,6 +1190,7 @@ public class PreparedStatement extends S
      * value
      * @param length the number of bytes in the stream
      * @exception SQLException throws feature not implemented.
+     * @deprecated
      */
     public void setUnicodeStream(int parameterIndex,
                                  java.io.InputStream x,

Modified: db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/ResultSet.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/branches/10.3/java/client/org/apache/derby/client/am/ResultSet.java Wed
Jun 23 23:27:09 2010
@@ -793,6 +793,7 @@ public abstract class ResultSet implemen
     }
 
     // Live life on the edge and run unsynchronized
+    /** @deprecated */
     public java.math.BigDecimal getBigDecimal(int column, int scale) throws SQLException
{
         try
         {
@@ -1178,6 +1179,7 @@ public abstract class ResultSet implemen
      *
      * @param column the column to retrieve as a Unicode stream
      * @exception SQLException throws feature not implemented
+     * @deprecated
      */
     public java.io.InputStream getUnicodeStream(int column) throws SQLException {
         if (agent_.loggingEnabled()) {
@@ -1537,6 +1539,7 @@ public abstract class ResultSet implemen
         }
     }
 
+    /** @deprecated */
     public final java.math.BigDecimal getBigDecimal(String columnName, int scale) throws
SQLException {
         try
         {
@@ -1705,6 +1708,7 @@ public abstract class ResultSet implemen
         }
     }
 
+    /** @deprecated */
     public final java.io.InputStream getUnicodeStream(String columnName) throws SQLException
{
         try
         {

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
Wed Jun 23 23:27:09 2010
@@ -112,6 +112,7 @@ public abstract class BrokeredCallableSt
         return getCallableStatement().getDouble( parameterIndex);
     }
 
+    /** @deprecated */
     public final BigDecimal getBigDecimal(int parameterIndex,
                                               int scale)
         throws SQLException

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
Wed Jun 23 23:27:09 2010
@@ -308,6 +308,7 @@ public abstract class BrokeredPreparedSt
      * UNICODE parameter value 
      * @param length the number of bytes in the stream 
 	 * @exception SQLException thrown on failure.
+     * @deprecated
      */
     public final void setUnicodeStream(int parameterIndex, InputStream x, int length) throws
SQLException
     {

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/db/BasicDatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/db/BasicDatabase.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/db/BasicDatabase.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/db/BasicDatabase.java Wed
Jun 23 23:27:09 2010
@@ -407,6 +407,7 @@ public class BasicDatabase implements Mo
 
 	/**
 		Return the UUID of this database.
+        @deprecated
 	*/
 	public final UUID getId() {
 		return myUUID;

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
Wed Jun 23 23:27:09 2010
@@ -1058,6 +1058,7 @@ public abstract class EmbedCallableState
     /**
 	 * @see CallableStatement#getBigDecimal
      * @exception SQLException NoOutputParameters thrown.
+     * @deprecated
      */
     public final BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException
 	{

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
Wed Jun 23 23:27:09 2010
@@ -609,6 +609,7 @@ public abstract class EmbedPreparedState
      * UNICODE parameter value
      * @param length the number of bytes in the stream
 	 * @exception SQLException thrown on failure.
+     * @deprecated
      */
     public void setUnicodeStream(int parameterIndex, InputStream x, int length)
 	    throws SQLException

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
Wed Jun 23 23:27:09 2010
@@ -93,6 +93,7 @@ public class EmbedResultSet20
 		 * @param scale the number of digits to the right of the decimal
 		 * @return the column value; if the value is SQL NULL, the result is null
 		 * @exception SQLException thrown on failure.
+         * @deprecated
 		 */
 		public final BigDecimal getBigDecimal(int columnIndex, int scale)
 			throws SQLException {
@@ -128,6 +129,7 @@ public class EmbedResultSet20
 		 * @param scale the number of digits to the right of the decimal
 		 * @return the column value; if the value is SQL NULL, the result is null
 		 * @exception SQLException thrown on failure.
+         * @deprecated
 		 */
 		public final BigDecimal getBigDecimal(String columnName, int scale)
 			throws SQLException {
@@ -141,6 +143,7 @@ public class EmbedResultSet20
      *
 		Deprecated in JDBC 2.0, not supported by JCC.
 	 * @exception SQLException thrown on failure.
+     * @deprecated
      */
     public final java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException
{
 		throw Util.notImplemented("getUnicodeStream");
@@ -148,6 +151,7 @@ public class EmbedResultSet20
     /**
 		Deprecated in JDBC 2.0, not supported by JCC.
 	 * @exception SQLException thrown on failure.
+     * @deprecated
      */
     public final java.io.InputStream getUnicodeStream(String columnName) throws SQLException
{
 		throw Util.notImplemented("getUnicodeStream");

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
Wed Jun 23 23:27:09 2010
@@ -468,6 +468,7 @@ public abstract class UpdatableVTITempla
 	 * @see java.sql.PreparedStatement
 	 *
  	 * @exception SQLException on unexpected JDBC error
+     * @deprecated
 	 */
 	public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException
 	{

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/VTITemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/VTITemplate.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/VTITemplate.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/vti/VTITemplate.java Wed Jun
23 23:27:09 2010
@@ -151,6 +151,7 @@ public abstract class VTITemplate implem
 	 * @see java.sql.ResultSet
 	 *
  	 * @exception SQLException on unexpected JDBC error
+     * @deprecated
 	 */
     public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
         throw new SQLException("getBigDecimal");
@@ -205,6 +206,7 @@ public abstract class VTITemplate implem
 	 * @see java.sql.ResultSet
 	 *
  	 * @exception SQLException on unexpected JDBC error
+     * @deprecated
 	 */
     public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
         throw new SQLException("getUnicodeStream");
@@ -296,6 +298,7 @@ public abstract class VTITemplate implem
 	 * @see java.sql.ResultSet
 	 *
  	 * @exception SQLException on unexpected JDBC error
+     * @deprecated
 	 */
     public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
         return getBigDecimal(findColumn(columnName), scale);
@@ -350,6 +353,7 @@ public abstract class VTITemplate implem
 	 * @see java.sql.ResultSet
 	 *
  	 * @exception SQLException on unexpected JDBC error
+     * @deprecated
 	 */
     public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
         throw new SQLException("getUnicodeStream");

Modified: db/derby/code/branches/10.3/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
(original)
+++ db/derby/code/branches/10.3/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
Wed Jun 23 23:27:09 2010
@@ -340,8 +340,7 @@ public final class LocalizedResource  im
 				return getNumberAsString(rs.getDouble(columnNumber));
 			}
 			else if (SUPPORTS_BIG_DECIMAL_CALLS && (type == Types.NUMERIC || type == Types.DECIMAL))
{
-				return	getNumberAsString(rs.getBigDecimal(columnNumber,
-											rsm.getScale(columnNumber)));
+				return getNumberAsString(rs.getBigDecimal(columnNumber));
 			}
 			else if (type == Types.TIME ) {
 				return getTimeAsString(rs.getTime(columnNumber));

Modified: db/derby/code/branches/10.3/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=957386&r1=957385&r2=957386&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/branches/10.3/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Wed
Jun 23 23:27:09 2010
@@ -1233,7 +1233,15 @@ public static void getMainInfo (java.io.
      */
     private static String formatURL(URL loc)
     {
-        String filename = URLDecoder.decode(loc.toString());
+        String filename;
+        try {
+            // Should use UTF-8 according to
+            // http://www.w3.org/TR/html40/appendix/notes.html#non-ascii-chars
+            filename = URLDecoder.decode(loc.toString(), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            // All JVMs are required to support UTF-8.
+            return null;
+        }
 
         if (filename.startsWith("jar:")) { filename = filename.substring(4); }
         if (filename.startsWith("file:")) { filename = filename.substring(5); }



Mime
View raw message