Author: mrisaliti
Date: Mon Jan 10 20:27:13 2011
New Revision: 1057346
URL: http://svn.apache.org/viewvc?rev=1057346&view=rev
Log:
Remove most of the java compilation warning (generics markup, unused
code/import) (OFBIZ-4102)
Modified:
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
Modified:
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java?rev=1057346&r1=1057345&r2=1057346&view=diff
==============================================================================
---
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
(original)
+++
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
Mon Jan 10 20:27:13 2011
@@ -80,7 +80,7 @@ public class MarketingServices {
// associate the email with anonymous user TODO: do we need a
custom contact mech purpose type, say MARKETING_EMAIL?
if (partyId == null) {
// Check existing email
- List conds =
UtilMisc.toList(EntityCondition.makeCondition("infoString",
EntityOperator.EQUALS, email));
+ List<EntityCondition> conds =
UtilMisc.<EntityCondition>toList(EntityCondition.makeCondition("infoString",
EntityOperator.EQUALS, email));
conds.add(EntityCondition.makeCondition("contactMechTypeId",
EntityOperator.EQUALS, "EMAIL_ADDRESS"));
conds.add(EntityCondition.makeCondition("contactMechPurposeTypeId",
EntityOperator.EQUALS, "PRIMARY_EMAIL"));
conds.add(EntityUtil.getFilterByDateExpr("purposeFromDate",
"purposeThruDate"));
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=1057346&r1=1057345&r2=1057346&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
Mon Jan 10 20:27:13 2011
@@ -1048,7 +1048,7 @@ public class ProductServices {
/* now store the image versions created by
ScaleImage.scaleImageInAllSize */
/* have to shrink length of productContentTypeId, as otherwise
value is too long for database field */
- Map<String,String> imageUrlMap = (Map<String,
String>)resultResize.get("imageUrlMap");
+ Map<String,String> imageUrlMap =
UtilGenerics.checkMap(resultResize.get("imageUrlMap"));
for( String sizeType : ScaleImage.sizeTypeList ) {
imageUrl = imageUrlMap.get(sizeType);
if( UtilValidate.isNotEmpty(imageUrl)) {
