svn commit: r1141271 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity: jdbc/DatabaseUtil.java model/ModelViewEntity.java

[doogie-3]

Author: doogie
Date: Wed Jun 29 22:10:47 2011
New Revision: 1141271

URL: http://svn.apache.org/viewvc?rev=1141271&view=rev
Log:
FIX: Fix some generics warnings I recently introduced.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1141271&r1=1141270&r2=1141271&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Wed Jun 29 22:10:47 2011
@@ -1619,7 +1619,7 @@ public class DatabaseUtil {
         }
     }
 
-    private abstract class AbstractCountingCallable<T extends AbstractCountingCallable<T>> implements Callable<T> {
+    private abstract class AbstractCountingCallable implements Callable<AbstractCountingCallable> {
         protected final ModelEntity entity;
         protected final Map<String, ModelEntity> modelEntities;
         protected final List<String> messages = FastList.newInstance();

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=1141271&r1=1141270&r2=1141271&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Wed Jun 29 22:10:47 2011
@@ -1322,7 +1322,7 @@ public class ModelViewEntity extends Mod
         protected final ViewEntityCondition viewEntityCondition;
         protected final String entityAlias;
         protected final String fieldName;
-        protected final EntityComparisonOperator operator;
+        protected final EntityComparisonOperator<?, ?> operator;
         protected final String relEntityAlias;
         protected final String relFieldName;
         protected final Object value;