svn commit: r814491 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity: condition/EntityClause.java model/ModelViewEntity.java

[doogie-3]

Author: doogie
Date: Mon Sep 14 06:28:21 2009
New Revision: 814491

URL: http://svn.apache.org/viewvc?rev=814491&view=rev
Log:
Remove generics markup on operator variables.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityClause.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityClause.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityClause.java?rev=814491&r1=814490&r2=814491&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityClause.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityClause.java Mon Sep 14 06:28:21 2009
@@ -36,13 +36,13 @@
     private String secondField = "";
     private ModelEntity firstModelEntity = null;
     private ModelEntity secondModelEntity = null;
-    private EntityOperator<?> interFieldOperation = null;
-    private EntityOperator<?> intraFieldOperation = null;
+    private EntityOperator interFieldOperation = null;
+    private EntityOperator intraFieldOperation = null;
 
     private Object value = null;
     public EntityClause() {}
 
-    public EntityClause(String firstEntity, String secondEntity, String firstField, String secondField, EntityOperator<?> interFieldOperation, EntityOperator<?> intraFieldOperation) {
+    public EntityClause(String firstEntity, String secondEntity, String firstField, String secondField, EntityOperator interFieldOperation, EntityOperator intraFieldOperation) {
         this.firstEntity = firstEntity;
         this.secondEntity = secondEntity;
         this.firstField = firstField;
@@ -51,7 +51,7 @@
         this.intraFieldOperation = intraFieldOperation;
     }
 
-    public EntityClause(String firstEntity, String firstField, Object value, EntityOperator<?> interFieldOperation, EntityOperator<?> intraFieldOperation) {
+    public EntityClause(String firstEntity, String firstField, Object value, EntityOperator interFieldOperation, EntityOperator intraFieldOperation) {
         this.firstEntity = firstEntity;
         this.firstField = firstField;
         this.value = value;
@@ -80,11 +80,11 @@
         return value;
     }
 
-    public EntityOperator<?> getInterFieldOperation() {
+    public EntityOperator getInterFieldOperation() {
         return interFieldOperation;
     }
 
-    public EntityOperator<?> getIntraFieldOperation() {
+    public EntityOperator getIntraFieldOperation() {
         return intraFieldOperation;
     }
 
@@ -104,11 +104,11 @@
         this.secondField = secondField;
     }
 
-    public void setInterFieldOperation(EntityOperator<?> interFieldOperation) {
+    public void setInterFieldOperation(EntityOperator interFieldOperation) {
         this.interFieldOperation = interFieldOperation;
     }
 
-    public void setIntraFieldOperation(EntityOperator<?> intraFieldOperation) {
+    public void setIntraFieldOperation(EntityOperator intraFieldOperation) {
         this.intraFieldOperation = intraFieldOperation;
     }
 

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=814491&r1=814490&r2=814491&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 Mon Sep 14 06:28:21 2009
@@ -1223,7 +1223,7 @@
         }
         
         public EntityCondition createCondition(ModelFieldTypeReader modelFieldTypeReader, List<String> entityAliasStack) {
-            EntityOperator<?> operator = EntityOperator.lookup(this.operator);
+            EntityOperator operator = EntityOperator.lookup(this.operator);
             if (operator == null) {
                 throw new IllegalArgumentException("Could not find an entity operator for the name: " + this.operator);
             }
@@ -1326,7 +1326,7 @@
                 }
             }
 
-            EntityOperator<?> operator = EntityOperator.lookup(this.combine);
+            EntityOperator operator = EntityOperator.lookup(this.combine);
             if (operator == null) {
                 throw new IllegalArgumentException("Could not find an entity operator for the name: " + operator);
             }