svn commit: r1631962 - /ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java

[le...@apache.org]

Author: lektran
Date: Wed Oct 15 07:35:19 2014
New Revision: 1631962

URL: http://svn.apache.org/r1631962
Log:
Add missing generics markup and remove suppress warnings annotation

Modified:
    ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1631962&r1=1631961&r2=1631962&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Wed Oct 15 07:35:19 2014
@@ -78,9 +78,8 @@ public class ContentServicesComplex {
         return results;
     }
 
-    @SuppressWarnings("unchecked")
     public static Map<String, Object> getAssocAndContentAndDataResourceMethod(Delegator delegator, String contentId, String mapKey, String direction, Timestamp fromDate, Timestamp thruDate, String fromDateStr, String thruDateStr, List<String> assocTypes, List<String> contentTypes) {
-        List exprList = FastList.newInstance();
+        List<EntityCondition> exprList = FastList.newInstance();
         EntityExpr joinExpr = null;
         String viewName = null;
         if (mapKey != null) {
@@ -133,7 +132,7 @@ public class ContentServicesComplex {
             EntityConditionList<EntityExpr> thruExprList = EntityCondition.makeCondition(thruList, EntityOperator.OR);
             exprList.add(thruExprList);
         }
-        EntityConditionList<EntityExpr> assocExprList = EntityCondition.makeCondition(exprList, EntityOperator.AND);
+        EntityConditionList<EntityCondition> assocExprList = EntityCondition.makeCondition(exprList, EntityOperator.AND);
         List<GenericValue> relatedAssocs = null;
         try {
             relatedAssocs = delegator.findList(viewName, assocExprList, null,UtilMisc.toList("caFromDate"), null, false);