svn commit: r960154 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity: ./ condition/

[adrianc]

Author: adrianc
Date: Sat Jul  3 04:27:20 2010
New Revision: 960154

URL: http://svn.apache.org/viewvc?rev=960154&view=rev
Log:
A little bit of work on the entity condition stuff - no functional change. Improved JavaDocs, eliminated compiler warnings.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityLockedException.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityCryptoException.java Sat Jul  3 04:27:20 2010
@@ -18,6 +18,7 @@
  *******************************************************************************/
 package org.ofbiz.entity;
 
+@SuppressWarnings("serial")
 public class EntityCryptoException extends GenericEntityException {
 
     public EntityCryptoException() {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityLockedException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityLockedException.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityLockedException.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/EntityLockedException.java Sat Jul  3 04:27:20 2010
@@ -22,6 +22,7 @@ package org.ofbiz.entity;
  * EntityLockedException
  *
  */
+@SuppressWarnings("serial")
 public class EntityLockedException extends GenericEntityException {
 
     public EntityLockedException() {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java Sat Jul  3 04:27:20 2010
@@ -40,8 +40,9 @@ import org.ofbiz.entity.model.ModelEntit
 import org.ofbiz.entity.model.ModelField;
 
 /**
- * Encapsulates operations between entities and entity fields. This is a immutable class.
+ * Base class for comparisons.
  */
+@SuppressWarnings("serial")
 public abstract class EntityComparisonOperator<L, R> extends EntityOperator<L, R, Boolean> {
 
     public static final String module = EntityComparisonOperator.class.getName();
@@ -255,7 +256,7 @@ public abstract class EntityComparisonOp
             } else {
                 return true;
             }
-        } else if (rhs instanceof Collection) {
+        } else if (rhs instanceof Collection<?>) {
             if (((Collection<?>) rhs).contains(lhs)) {
                 return true;
             } else {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java Sat Jul  3 04:27:20 2010
@@ -44,6 +44,7 @@ import org.ofbiz.entity.model.ModelEntit
  * These can be used in various combinations using the EntityConditionList and EntityExpr objects.
  *
  */
+@SuppressWarnings("serial")
 public abstract class EntityCondition extends EntityConditionBase implements IsEmpty, Reusable {
 
     public static <L,R,LL,RR> EntityExpr makeCondition(L lhs, EntityComparisonOperator<LL,RR> operator, R rhs) {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBuilder.java Sat Jul  3 04:27:20 2010
@@ -80,7 +80,7 @@ public class EntityConditionBuilder exte
         }
         if (child instanceof EntityCondition) {
             tempList.add((EntityCondition)child);
-        } else if (child instanceof List) {
+        } else if (child instanceof List<?>) {
             tempList.addAll(UtilGenerics.<EntityCondition>checkList(child));
         }
         parentConList.init(tempList, parentConList.getOperator());

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java Sat Jul  3 04:27:20 2010
@@ -28,9 +28,10 @@ import org.ofbiz.entity.config.Datasourc
 import org.ofbiz.entity.model.ModelEntity;
 
 /**
- * Encapsulates operations between entities and entity fields. This is a immutable class.
+ * Base class for entity condition functions.
  *
  */
+@SuppressWarnings("serial")
 public abstract class EntityConditionFunction extends EntityCondition {
 
     public static final int ID_NOT = 1;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java Sat Jul  3 04:27:20 2010
@@ -26,6 +26,7 @@ import javolution.context.ObjectFactory;
  * Encapsulates a list of EntityConditions to be used as a single EntityCondition combined as specified
  *
  */
+@SuppressWarnings("serial")
 public class EntityConditionList<T extends EntityCondition> extends EntityConditionListBase<T> {
     public static final String module = EntityConditionList.class.getName();
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java Sat Jul  3 04:27:20 2010
@@ -33,6 +33,7 @@ import org.ofbiz.entity.model.ModelEntit
  * Encapsulates a list of EntityConditions to be used as a single EntityCondition combined as specified
  *
  */
+@SuppressWarnings("serial")
 public abstract class EntityConditionListBase<T extends EntityCondition> extends EntityCondition {
     public static final String module = EntityConditionListBase.class.getName();
 
@@ -123,7 +124,7 @@ public abstract class EntityConditionLis
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof EntityConditionListBase)) return false;
+        if (!(obj instanceof EntityConditionListBase<?>)) return false;
         EntityConditionListBase<?> other = UtilGenerics.cast(obj);
 
         boolean isEqual = conditionList.equals(other.conditionList) && operator.equals(other.operator);

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java Sat Jul  3 04:27:20 2010
@@ -26,6 +26,7 @@ import org.ofbiz.entity.model.ModelField
  * Represents a single parameter to be used in the preparedStatement
  *
  */
+@SuppressWarnings("serial")
 public class EntityConditionParam implements Serializable {
     protected ModelField modelField;
     protected Object fieldValue;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java Sat Jul  3 04:27:20 2010
@@ -31,6 +31,11 @@ import org.ofbiz.entity.model.ModelEntit
 import org.ofbiz.entity.model.ModelField;
 import org.ofbiz.entity.model.ModelViewEntity;
 
+/**
+ * Sub-query action.
+ *
+ */
+@SuppressWarnings("serial")
 public class EntityConditionSubSelect extends EntityConditionValue {
     public static final String module = EntityConditionSubSelect.class.getName();
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java Sat Jul  3 04:27:20 2010
@@ -30,7 +30,7 @@ import org.ofbiz.entity.model.ModelEntit
 import org.ofbiz.entity.model.ModelField;
 
 /**
- * Encapsulates operations between entities and entity fields. This is a immutable class.
+ * Base class for condition expression values.
  *
  */
 @SuppressWarnings("serial")

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java Sat Jul  3 04:27:20 2010
@@ -30,6 +30,11 @@ import org.ofbiz.entity.GenericModelExce
 import org.ofbiz.entity.config.DatasourceInfo;
 import org.ofbiz.entity.model.ModelEntity;
 
+/**
+ * Date-range condition.
+ *
+ */
+@SuppressWarnings("serial")
 public class EntityDateFilterCondition extends EntityCondition {
 
     protected static final ObjectFactory<EntityDateFilterCondition> entityDateFilterConditionFactory = new ObjectFactory<EntityDateFilterCondition>() {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java Sat Jul  3 04:27:20 2010
@@ -42,6 +42,7 @@ import org.ofbiz.entity.model.ModelField
  * Encapsulates simple expressions used for specifying queries
  *
  */
+@SuppressWarnings("serial")
 public class EntityExpr extends EntityCondition {
     public static final String module = EntityExpr.class.getName();
 
@@ -73,7 +74,7 @@ public class EntityExpr extends EntityCo
         }
 
         if (EntityOperator.BETWEEN.equals(operator)) {
-            if (!(rhs instanceof Collection) || (((Collection<?>) rhs).size() != 2)) {
+            if (!(rhs instanceof Collection<?>) || (((Collection<?>) rhs).size() != 2)) {
                 throw new IllegalArgumentException("BETWEEN Operator requires a Collection with 2 elements for the right/rhs argument");
             }
         }
@@ -198,11 +199,11 @@ public class EntityExpr extends EntityCo
         if (this.rhs == null || this.rhs == GenericEntity.NULL_FIELD || modelEntity == null) return;
 
         Object value = this.rhs;
-        if (this.rhs instanceof EntityFunction) {
+        if (this.rhs instanceof EntityFunction<?>) {
             value = UtilGenerics.<EntityFunction<?>>cast(this.rhs).getOriginalValue();
         }
 
-        if (value instanceof Collection) {
+        if (value instanceof Collection<?>) {
             Collection<?> valueCol = UtilGenerics.cast(value);
             if (valueCol.size() > 0) {
                 value = valueCol.iterator().next();

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java Sat Jul  3 04:27:20 2010
@@ -34,6 +34,7 @@ import org.ofbiz.entity.util.EntityUtil;
  * Encapsulates simple expressions used for specifying queries
  *
  */
+@SuppressWarnings("serial")
 public class EntityFieldMap extends EntityConditionListBase<EntityExpr> {
 
     protected static final ObjectFactory<EntityFieldMap> entityFieldMapFactory = new ObjectFactory<EntityFieldMap>() {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java Sat Jul  3 04:27:20 2010
@@ -38,7 +38,7 @@ import org.ofbiz.entity.model.ModelViewE
 import org.ofbiz.entity.model.ModelViewEntity.ModelAlias;
 
 /**
- * Encapsulates operations between entities and entity fields. This is a immutable class.
+ * Field value expression.
  *
  */
 @SuppressWarnings("serial")

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java Sat Jul  3 04:27:20 2010
@@ -33,9 +33,10 @@ import org.ofbiz.entity.model.ModelEntit
 import org.ofbiz.entity.model.ModelField;
 
 /**
- * Encapsulates operations between entities and entity fields. This is a immutable class.
+ * Base class for entity functions.
  *
  */
+@SuppressWarnings("serial")
 public abstract class EntityFunction<T extends Comparable<?>> extends EntityConditionValue implements Reusable {
 
     public static interface Fetcher<T> {
@@ -77,6 +78,10 @@ public abstract class EntityFunction<T e
     public static EntityFunction<String> LOWER(EntityConditionValue nested) { return LOWER.lowerFactory.createFunction(nested); }
     public static EntityFunction<String> LOWER(Object value) { return LOWER.lowerFactory.createFunction(value); }
 
+    /**
+     * Length() entity function.
+     *
+     */
     public static class LENGTH extends EntityFunction<Integer> {
         public static Fetcher<Integer> FETCHER = new Fetcher<Integer>() {
             public Integer getValue(Object value) { return value.toString().length(); }
@@ -98,6 +103,10 @@ public abstract class EntityFunction<T e
         }
     }
 
+    /**
+     * Trim() entity function.
+     *
+     */
     public static class TRIM extends EntityFunction<String> {
         public static Fetcher<String> FETCHER = new Fetcher<String>() {
             public String getValue(Object value) { return value.toString().trim(); }
@@ -119,6 +128,10 @@ public abstract class EntityFunction<T e
         }
     }
 
+    /**
+     * Upper() entity function.
+     *
+     */
     public static class UPPER extends EntityFunction<String> {
         public static Fetcher<String> FETCHER = new Fetcher<String>() {
             public String getValue(Object value) { return value.toString().toUpperCase(); }
@@ -140,6 +153,10 @@ public abstract class EntityFunction<T e
         }
     }
 
+    /**
+     * Lower() entity function.
+     *
+     */
     public static class LOWER extends EntityFunction<String> {
         public static Fetcher<String> FETCHER = new Fetcher<String>() {
             public String getValue(Object value) { return value.toString().toLowerCase(); }
@@ -221,7 +238,7 @@ public abstract class EntityFunction<T e
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof EntityFunction)) return false;
+        if (!(obj instanceof EntityFunction<?>)) return false;
         EntityFunction<?> otherFunc = UtilGenerics.cast(obj);
         return (this.function == otherFunc.function &&
             (this.nested != null ? nested.equals(otherFunc.nested) : otherFunc.nested == null) &&

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java Sat Jul  3 04:27:20 2010
@@ -34,9 +34,10 @@ import org.ofbiz.entity.config.Datasourc
 import org.ofbiz.entity.model.ModelEntity;
 
 /**
- * Encapsulates operations between entities and entity fields. This is a immutable class.
+ * Join operator (AND/OR).
  *
  */
+@SuppressWarnings("serial")
 public class EntityJoinOperator extends EntityOperator<EntityCondition, EntityCondition, Boolean> {
 
     protected boolean shortCircuitValue;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java Sat Jul  3 04:27:20 2010
@@ -35,9 +35,10 @@ import org.ofbiz.entity.model.ModelEntit
 import org.ofbiz.entity.model.ModelField;
 
 /**
- * Encapsulates operations between entities and entity fields. This is an immutable class.
+ * Base class for operators (less than, greater than, equals, etc).
  *
  */
+@SuppressWarnings("serial")
 public abstract class EntityOperator<L, R, T> extends EntityConditionBase {
 
     public static final int ID_EQUALS = 1;
@@ -75,7 +76,7 @@ public abstract class EntityOperator<L,
 
     public static <L,R> EntityComparisonOperator<L,R> lookupComparison(String name) {
         EntityOperator<?,?,Boolean> operator = lookup(name);
-        if (!(operator instanceof EntityComparisonOperator))
+        if (!(operator instanceof EntityComparisonOperator<?,?>))
             throw new IllegalArgumentException(name + " is not a comparison operator");
         return UtilGenerics.cast(operator);
     }
@@ -233,7 +234,7 @@ public abstract class EntityOperator<L,
         if (this == obj) {
             return true;
         }
-        if (obj instanceof EntityOperator) {
+        if (obj instanceof EntityOperator<?,?,?>) {
             EntityOperator<?,?,?> otherOper = UtilGenerics.cast(obj);
             return this.idInt == otherOper.idInt;
         }
@@ -247,7 +248,7 @@ public abstract class EntityOperator<L,
     protected void appendRHSList(List<EntityConditionParam> entityConditionParams, StringBuilder whereStringBuilder, ModelField field, R rhs) {
         whereStringBuilder.append('(');
 
-        if (rhs instanceof Collection) {
+        if (rhs instanceof Collection<?>) {
             Iterator<R> rhsIter = UtilGenerics.<Collection<R>>cast(rhs).iterator();
 
             while (rhsIter.hasNext()) {
@@ -265,7 +266,7 @@ public abstract class EntityOperator<L,
     }
 
     protected <X> void appendRHSBetweenList(List<EntityConditionParam> entityConditionParams, StringBuilder whereStringBuilder, ModelField field, X rhs) {
-        if (rhs instanceof Collection) {
+        if (rhs instanceof Collection<?>) {
             Iterator<R> rhsIter = UtilGenerics.<Collection<R>>cast(rhs).iterator();
 
             while (rhsIter.hasNext()) {
@@ -309,12 +310,22 @@ public abstract class EntityOperator<L,
         }
     };
 
+    /**
+     * Comparison operator for <code>Collection</code> types.
+     *
+     * @param <E>
+     */
     public static abstract class CollectionEntityComparisonOperator<E> extends EntityComparisonOperator<Comparable<E>, Collection<Comparable<E>>> {
         public CollectionEntityComparisonOperator(int id, String code) {
             super(id, code);
         }
     }
 
+    /**
+     * Comparison operator for <code>Comparable</code> types.
+     *
+     * @param <E>
+     */
     public static abstract class ComparableEntityComparisonOperator<E> extends EntityComparisonOperator<Comparable<E>, E> {
         public ComparableEntityComparisonOperator(int id, String code) {
             super(id, code);

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java?rev=960154&r1=960153&r2=960154&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java Sat Jul  3 04:27:20 2010
@@ -41,6 +41,7 @@ import org.ofbiz.entity.model.ModelEntit
  *  encapsulate where conditions and don't require you to directly write SQL.</p>
  *
  */
+@SuppressWarnings("serial")
 public class EntityWhereString extends EntityCondition {
 
     protected static final ObjectFactory<EntityWhereString> entityWhereStringFactory = new ObjectFactory<EntityWhereString>() {