Author: mrisaliti
Date: Tue Feb 1 21:26:54 2011
New Revision: 1066221
URL:
http://svn.apache.org/viewvc?rev=1066221&view=revLog:
Remove of compilation warnings of method getMinimumOrderQuantity of ShoppingCart (OFBIZ-4102)
Modified:
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1066221&r1=1066220&r2=1066221&view=diff==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Tue Feb 1 21:26:54 2011
@@ -5016,20 +5016,20 @@ public class ShoppingCart implements Ite
}
if (itemBasePrice == null) {
List<GenericValue> productPriceList = EntityUtil.filterByDate(delegator.findList("ProductPrice", EntityCondition.makeCondition("productId", itemProductId), null, null, null, false));
- Iterator it = productPriceList.iterator();
- Map productPriceMap = FastMap.newInstance();
+ Iterator<GenericValue> it = productPriceList.iterator();
+ Map<String, BigDecimal> productPriceMap = FastMap.newInstance();
while (it.hasNext()) {
- GenericValue productPrice = (GenericValue) it.next();
+ GenericValue productPrice = it.next();
productPriceMap.put(productPrice.getString("productPriceTypeId"), productPrice.getBigDecimal("price"));
}
if (UtilValidate.isNotEmpty(productPriceMap.get("SPECIAL_PROMO_PRICE"))) {
- itemBasePrice= (BigDecimal) productPriceMap.get("SPECIAL_PROMO_PRICE");
+ itemBasePrice = productPriceMap.get("SPECIAL_PROMO_PRICE");
} else if (UtilValidate.isNotEmpty(productPriceMap.get("PROMO_PRICE"))) {
- itemBasePrice= (BigDecimal) productPriceMap.get("PROMO_PRICE");
+ itemBasePrice = productPriceMap.get("PROMO_PRICE");
} else if (UtilValidate.isNotEmpty(productPriceMap.get("DEFAULT_PRICE"))) {
- itemBasePrice= (BigDecimal) productPriceMap.get("DEFAULT_PRICE");
+ itemBasePrice = productPriceMap.get("DEFAULT_PRICE");
} else if (UtilValidate.isNotEmpty(productPriceMap.get("LIST_PRICE"))) {
- itemBasePrice= (BigDecimal) productPriceMap.get("LIST_PRICE");
+ itemBasePrice = productPriceMap.get("LIST_PRICE");
}
}
if (UtilValidate.isNotEmpty(minimumOrderPriceList)) {