empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From franci...@apache.org
Subject svn commit: r788081 - in /incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire: commons/Options.java db/DBExpr.java db/DBRecord.java
Date Wed, 24 Jun 2009 16:50:22 GMT
Author: francisdb
Date: Wed Jun 24 16:50:21 2009
New Revision: 788081

URL: http://svn.apache.org/viewvc?rev=788081&view=rev
Log:
fixing eclipse code warnings

Modified:
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Options.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Options.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Options.java?rev=788081&r1=788080&r2=788081&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Options.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Options.java
Wed Jun 24 16:50:21 2009
@@ -69,7 +69,7 @@
     protected int getIndex(Object value)
     {
         // Find an Entry
-        if (value instanceof Entry)
+        if (value instanceof Entry<?,?>)
             value = ((Entry<?,?>) value).getKey();
         if (value instanceof OptionEntry)
             value = ((OptionEntry) value).getValue();

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java?rev=788081&r1=788080&r2=788081&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java Wed
Jun 24 16:50:21 2009
@@ -82,7 +82,7 @@
             ((DBExpr) value).addSQL(buf, context);
             return buf.toString();
         } 
-        else if (value instanceof Collection)
+        else if (value instanceof Collection<?>)
         {
         	value = ((Collection<?>)value).toArray();
         }

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java?rev=788081&r1=788080&r2=788081&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Wed
Jun 24 16:50:21 2009
@@ -139,10 +139,7 @@
         init(null, REC_INVALID, null);
     }
     
-    /**
-     * 
-     * @see java.lang.Object#clone()
-     */
+    /** {@inheritDoc} */
     @Override
     public DBRecord clone()
     {
@@ -700,7 +697,7 @@
      */
     public final boolean read(DBRowSet table, Object id, Connection conn)
     {
-        if (id instanceof Collection)
+        if (id instanceof Collection<?>)
         {   // If it's a collection then convert it to an array
             return read(table, ((Collection<?>)id).toArray(), conn);
         }



Mime
View raw message