Author: jleroux
Date: Mon May 21 08:46:21 2007
New Revision: 540176
URL:
http://svn.apache.org/viewvc?view=rev&rev=540176Log:
Sequel of rev.540162 : still some lines to remove. I begin to think that I should have deal with this in a more conventional way as David suggested.
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?view=diff&rev=540176&r1=540175&r2=540176==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Mon May 21 08:46:21 2007
@@ -227,11 +227,9 @@
if (!hasType(type)) continue;
typeConditions.add( new EntityExpr("orderTypeId", EntityOperator.EQUALS, parameterToOrderTypeId.get(type)) );
}
- List filterConditions = new ArrayList();
EntityCondition statusConditionsList = new EntityConditionList(statusConditions, EntityOperator.OR);
EntityCondition typeConditionsList = new EntityConditionList(typeConditions, EntityOperator.OR);
- EntityCondition filterConditionsList = new EntityConditionList(filterConditions, EntityOperator.OR);
if ((typeConditions.size() > 0) && (statusConditions.size() > 0)) {
allConditions.add(statusConditionsList);
allConditions.add(typeConditionsList);