Author: jleroux
Date: Sun Nov 30 14:17:12 2008
New Revision: 721905
URL:
http://svn.apache.org/viewvc?rev=721905&view=revLog:
Merged by hand from r721904
Modified:
ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
Modified: ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java?rev=721905&r1=721904&r2=721905&view=diff==============================================================================
--- ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java (original)
+++ ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java Sun Nov 30 14:17:12 2008
@@ -129,7 +129,7 @@
static { register( "greaterThanEqualTo", GREATER_THAN_EQUAL_TO ); }
public static final EntityComparisonOperator IN = new EntityComparisonOperator(ID_IN, "IN") {
public boolean compare(Object lhs, Object rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); }
- protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuffer sb, ModelField field, Object rhs) { appendRHSList(entityConditionParams, sb, field, rhs); }
+ protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuffer sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); }
};
static { register( "in", IN ); }
public static final EntityComparisonOperator BETWEEN = new EntityComparisonOperator(ID_BETWEEN, "BETWEEN") {
@@ -153,7 +153,7 @@
static { register( "not-like", NOT_LIKE); }
public static final EntityComparisonOperator NOT_IN = new EntityComparisonOperator(ID_NOT_IN, "NOT IN") {
public boolean compare(Object lhs, Object rhs) { return !EntityComparisonOperator.compareIn(lhs, rhs); }
- protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuffer sb, ModelField field, Object rhs) { appendRHSList(entityConditionParams, sb, field, rhs); }
+ protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuffer sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); }
};
static { register( "not-in", NOT_IN ); }