You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/05/14 05:38:56 UTC
svn commit: r406224 - in
/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib: jdbc/
log/ rop/ util/
Author: pcl
Date: Sat May 13 20:38:55 2006
New Revision: 406224
URL: http://svn.apache.org/viewcvs?rev=406224&view=rev
Log:
Some updates to get around a couple warnings
Modified:
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DataSourceLogs.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/LogOutputStream.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/rop/ResultList.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/JavaVersions.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/Options.java
incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DataSourceLogs.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DataSourceLogs.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DataSourceLogs.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DataSourceLogs.java Sat May 13 20:38:55 2006
@@ -17,8 +17,6 @@
import java.sql.*;
-import java.util.*;
-import javax.sql.*;
import org.apache.openjpa.lib.log.*;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java Sat May 13 20:38:55 2006
@@ -23,7 +23,6 @@
import java.sql.Date;
import java.util.*;
-import org.apache.openjpa.lib.util.*;
import org.apache.openjpa.lib.util.Closeable;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java Sat May 13 20:38:55 2006
@@ -20,7 +20,6 @@
import java.sql.*;
import javax.sql.*;
-import org.apache.openjpa.lib.util.*;
import org.apache.openjpa.lib.util.Closeable;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java Sat May 13 20:38:55 2006
@@ -16,9 +16,7 @@
package org.apache.openjpa.lib.jdbc;
-import java.io.*;
import java.sql.*;
-import java.util.*;
/**
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java Sat May 13 20:38:55 2006
@@ -23,7 +23,6 @@
import java.sql.Date;
import java.util.*;
-import org.apache.openjpa.lib.util.*;
import org.apache.openjpa.lib.util.Closeable;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java Sat May 13 20:38:55 2006
@@ -23,7 +23,6 @@
import java.sql.Date;
import java.util.*;
-import org.apache.openjpa.lib.util.*;
import org.apache.openjpa.lib.util.Closeable;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java Sat May 13 20:38:55 2006
@@ -17,9 +17,6 @@
import java.sql.*;
-import javax.sql.*;
-import java.util.*;
-
import org.apache.openjpa.lib.util.*;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java Sat May 13 20:38:55 2006
@@ -21,8 +21,6 @@
import java.sql.*;
import java.sql.Date;
import java.util.*;
-import javax.sql.*;
-
import org.apache.openjpa.lib.log.*;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/CommonsLogFactory.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/CommonsLogFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/CommonsLogFactory.java Sat May 13 20:38:55 2006
@@ -16,9 +16,6 @@
package org.apache.openjpa.lib.log;
-import java.util.*;
-
-
/**
* {@link LogFactory} implementation that delegates to the commons logging
* framework.
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/Log4JLogFactory.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/Log4JLogFactory.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/Log4JLogFactory.java Sat May 13 20:38:55 2006
@@ -16,8 +16,6 @@
package org.apache.openjpa.lib.log;
-import java.util.*;
-
import org.apache.log4j.*;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/LogOutputStream.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/LogOutputStream.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/LogOutputStream.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/log/LogOutputStream.java Sat May 13 20:38:55 2006
@@ -19,8 +19,6 @@
import java.io.*;
import java.util.*;
-import org.apache.openjpa.lib.log.*;
-
/**
* <p>Many standard components log to {@link OutputStream}s.
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/rop/ResultList.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/rop/ResultList.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/rop/ResultList.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/rop/ResultList.java Sat May 13 20:38:55 2006
@@ -18,9 +18,6 @@
import java.io.*;
import java.util.*;
-import java.util.NoSuchElementException; // for javadoc; bug #4330419
-
-import org.apache.openjpa.lib.util.*;
import org.apache.openjpa.lib.util.Closeable;
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java Sat May 13 20:38:55 2006
@@ -513,7 +513,6 @@
throws IOException
{
boolean endWithNewline = source != null && source.endsInNewline;
- boolean firstLine = true;
// Must be ISO-8859-1 ecoding according to Properties.load javadoc
PrintWriter writer = new PrintWriter
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/JavaVersions.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/JavaVersions.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/JavaVersions.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/JavaVersions.java Sat May 13 20:38:55 2006
@@ -17,7 +17,6 @@
import java.lang.reflect.*;
-import java.util.*;
/**
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/Options.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/Options.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/Options.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/Options.java Sat May 13 20:38:55 2006
@@ -331,7 +331,7 @@
// setter with more than 1 arg is ignored; calc setter and getter
// name to look for
String[] find = Strings.split (key, ".", 2);
- String base = StringUtils.capitalise (find[0]);
+ String base = StringUtils.capitalize (find[0]);
String set = "set" + base;
String get = "get" + base;
@@ -372,7 +372,7 @@
if (setter == null)
{
Field[] fields = type.getFields ();
- String uncapBase = StringUtils.uncapitalise (find[0]);
+ String uncapBase = StringUtils.uncapitalize (find[0]);
for (int i = 0; i < fields.length; i++)
{
if (fields[i].getName ().equals (base)
Modified: incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
URL: http://svn.apache.org/viewcvs/incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java?rev=406224&r1=406223&r2=406224&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java (original)
+++ incubator/openjpa/trunk/openjpa-lib/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java Sat May 13 20:38:55 2006
@@ -43,7 +43,6 @@
return null;
ZipInputStream zip = new ZipInputStream (in);
- ResourceBundle bundle = null;
try
{
ZipEntry ze;