Author: lektran
Date: Sat Feb 20 20:19:18 2010
New Revision: 912209
URL: http://svn.apache.org/viewvc?rev=912209&view=rev
Log:
Removed use of deprecated EntityExpr constructors
Modified:
ofbiz/trunk/framework/webslinger/modules/ofbiz/www/WEB-INF/Events/System/Ofbiz/FilterOfbizConditionData.groovy
ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp
Modified:
ofbiz/trunk/framework/webslinger/modules/ofbiz/www/WEB-INF/Events/System/Ofbiz/FilterOfbizConditionData.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/modules/ofbiz/www/WEB-INF/Events/System/Ofbiz/FilterOfbizConditionData.groovy?rev=912209&r1=912208&r2=912209&view=diff
==============================================================================
---
ofbiz/trunk/framework/webslinger/modules/ofbiz/www/WEB-INF/Events/System/Ofbiz/FilterOfbizConditionData.groovy
(original)
+++
ofbiz/trunk/framework/webslinger/modules/ofbiz/www/WEB-INF/Events/System/Ofbiz/FilterOfbizConditionData.groovy
Sat Feb 20 20:19:18 2010
@@ -17,8 +17,6 @@
* under the License.
*******************************************************************************/
import org.ofbiz.entity.condition.EntityCondition
-import org.ofbiz.entity.condition.EntityConditionList
-import org.ofbiz.entity.condition.EntityExpr
import org.ofbiz.entity.condition.EntityOperator
def buildCondition
@@ -35,7 +33,7 @@
}
return EntityCondition.makeCondition(conditions,
EntityOperator.lookup(item.operator))
case "EntityExpr":
- return new EntityExpr(getValue(item.left),
EntityOperator.lookup(item.operator), getValue(item.right))
+ return EntityCondition.makeCondition(getValue(item.left),
EntityOperator.lookup(item.operator), getValue(item.right))
case "Include":
return webslinger.event(item.path)
default:
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp?rev=912209&r1=912208&r2=912209&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp Sat Feb
20 20:19:18 2010
@@ -167,13 +167,13 @@
EntityExpr entityThruCond = null;
EntityExpr entityDateCond = null;
if (UtilValidate.isNotEmpty(entityFrom)) {
- entityFromCond = new EntityExpr("lastUpdatedTxStamp",
EntityComparisonOperator.GREATER_THAN, entityFrom);
+ entityFromCond = EntityCondition.makeCondition("lastUpdatedTxStamp",
EntityComparisonOperator.GREATER_THAN, entityFrom);
}
if (UtilValidate.isNotEmpty(entityThru)) {
- entityThruCond = new EntityExpr("lastUpdatedTxStamp",
EntityComparisonOperator.LESS_THAN, entityThru);
+ entityThruCond = EntityCondition.makeCondition("lastUpdatedTxStamp",
EntityComparisonOperator.LESS_THAN, entityThru);
}
if ((entityFromCond!=null) && (entityThruCond!=null)) {
- entityDateCond = new EntityExpr(entityFromCond, EntityJoinOperator.AND,
entityThruCond);
+ entityDateCond = EntityCondition.makeCondition(entityFromCond,
EntityJoinOperator.AND, entityThruCond);
} else if(entityFromCond!=null) {
entityDateCond = entityFromCond;
} else if(entityThruCond!=null) {
