svn commit: r1628287 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityQuery.java

[le...@apache.org]

Author: lektran
Date: Mon Sep 29 20:12:04 2014
New Revision: 1628287

URL: http://svn.apache.org/r1628287
Log:
Improved generics for where(List) so that a list of EntityExpr will be accepted.  Fixes an issue where the runtime would select the where(Object...) method for a List of EntityExpr objects.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityQuery.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityQuery.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityQuery.java?rev=1628287&r1=1628286&r2=1628287&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityQuery.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityQuery.java Mon Sep 29 20:12:04 2014
@@ -31,9 +31,6 @@ import org.ofbiz.entity.GenericEntityExc
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.model.DynamicViewEntity;
-import org.ofbiz.entity.util.EntityFindOptions;
-import org.ofbiz.entity.util.EntityListIterator;
-import org.ofbiz.entity.util.EntityUtil;
 
 /**
  * Used to setup various options for and subsequently execute entity queries.
@@ -166,7 +163,7 @@ public class EntityQuery {
      * @param fieldMap - A list of EntityCondition objects to be ANDed together as the WHERE clause for the query
      * @return this EntityQuery object, to enable chaining
      */
-    public EntityQuery where(List<EntityCondition> andConditions) {
+    public <T extends EntityCondition> EntityQuery where(List<T> andConditions) {
         this.whereEntityCondition = EntityCondition.makeCondition(andConditions);
         return this;
     }