svn commit: r540162 - /ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java

Author: jleroux
Date: Mon May 21 08:05:42 2007
New Revision: 540162

URL: http://svn.apache.org/viewvc?view=rev&rev=540162
Log:
The orderFiltersStateId field does not exist in the entity OrderHeader, hence this lines are at least unuseful.
I guess it was my mistake adding this lines when reviewing Leon's patch

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=540162&r1=540161&r2=540162
==============================================================================
--- 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:05:42 2007
@@ -190,7 +190,6 @@
     
     public boolean hasStatus(String param) { return ("Y".equals(orderStatusState.get(param))); }
     public boolean hasType(String param) { return ("Y".equals(orderTypeState.get(param))); }
-    public boolean hasFilter(String param) { return ("Y".equals(orderFilterState.get(param))); }
     
     public boolean hasAllStatus() {
         for (Iterator iter = orderStatusState.values().iterator(); iter.hasNext(); ) {
@@ -229,11 +228,6 @@
             typeConditions.add( new EntityExpr("orderTypeId", EntityOperator.EQUALS, parameterToOrderTypeId.get(type)) );
         }
         List filterConditions = new ArrayList();
-        for (Iterator iter = orderFilterState.keySet().iterator(); iter.hasNext(); ) {
-            String type = (String) iter.next();
-            if (!hasType(type)) continue;
-            filterConditions.add( new EntityExpr("orderFiltersStateId", EntityOperator.EQUALS, parameterToFilterId.get(type)) );
-        }
                 
         EntityCondition statusConditionsList = new EntityConditionList(statusConditions,  EntityOperator.OR);
         EntityCondition typeConditionsList = new EntityConditionList(typeConditions, EntityOperator.OR);
@@ -241,9 +235,6 @@
         if ((typeConditions.size() > 0) && (statusConditions.size() > 0)) {
             allConditions.add(statusConditionsList);
             allConditions.add(typeConditionsList);
-        }
-        if (filterConditions.size() > 0) {
-            allConditions.add(filterConditionsList);
         }
 
         EntityCondition queryConditionsList = new EntityConditionList(allConditions, EntityOperator.AND);