svn commit: r780327 - /ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java

[jonesde]

Author: jonesde
Date: Sat May 30 21:13:08 2009
New Revision: 780327

URL: http://svn.apache.org/viewvc?rev=780327&view=rev
Log:
Small formatting fix, was no newline

Modified:
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java

Modified: 
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=780327&r1=780326&r2=780327&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
 (original)
+++ 
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
 Sat May 30 21:13:08 2009
@@ -43,11 +43,9 @@
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityComparisonOperator;
 import org.ofbiz.entity.condition.EntityCondition;
-import org.ofbiz.entity.condition.EntityConditionList;
 import org.ofbiz.entity.condition.EntityConditionParam;
 import org.ofbiz.entity.condition.EntityConditionSubSelect;
 import org.ofbiz.entity.condition.EntityConditionValue;
-import org.ofbiz.entity.condition.EntityExpr;
 import org.ofbiz.entity.condition.EntityOperator;
 import org.ofbiz.entity.config.EntityConfigUtil;
 import org.ofbiz.entity.model.DynamicViewEntity;
@@ -811,6 +809,7 @@
     // Search Constraint Classes
     // ======================================================================
 
+    @SuppressWarnings("serial")
     public static abstract class ProductSearchConstraint implements 
java.io.Serializable {
         public ProductSearchConstraint() { }
 
@@ -845,7 +844,8 @@
             productSearchContext.dynamicViewEntity.addAlias(entityAlias, 
prefix + "ProductCategoryId", "productCategoryId", null, null, null, null);
             productSearchContext.dynamicViewEntity.addAlias(entityAlias, 
prefix + "FromDate", "fromDate", null, null, null, null);
             productSearchContext.dynamicViewEntity.addAlias(entityAlias, 
prefix + "ThruDate", "thruDate", null, null, null, null);
-            productSearchContext.dynamicViewEntity.addViewLink("PROD", 
entityAlias, Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId"));           
 
productSearchContext.entityConditionList.add(EntityCondition.makeCondition(prefix
 + "ProductCategoryId", EntityOperator.IN, productCategoryIds));
+            productSearchContext.dynamicViewEntity.addViewLink("PROD", 
entityAlias, Boolean.FALSE, ModelKeyMap.makeKeyMapList("productId"));
+            
productSearchContext.entityConditionList.add(EntityCondition.makeCondition(prefix
 + "ProductCategoryId", EntityOperator.IN, productCategoryIds));
             
productSearchContext.entityConditionList.add(EntityCondition.makeCondition(EntityCondition.makeCondition(prefix
 + "ThruDate", EntityOperator.EQUALS, null), EntityOperator.OR, 
EntityCondition.makeCondition(prefix + "ThruDate", EntityOperator.GREATER_THAN, 
productSearchContext.nowTimestamp)));
             
productSearchContext.entityConditionList.add(EntityCondition.makeCondition(prefix
 + "FromDate", EntityOperator.LESS_THAN, productSearchContext.nowTimestamp));