svn commit: r1305309 [2/3] - in /ofbiz/trunk/applications/orde
Locked
 
|
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Mon Mar 26 11:08:11 2012 @@ -266,9 +266,7 @@ public class CheckOutHelper { try { List<GenericValue> billingAccountTerms = delegator.findByAnd("BillingAccountTerm", UtilMisc.toMap("billingAccountId", billingAccountId)); if (UtilValidate.isNotEmpty(billingAccountTerms)) { - Iterator<GenericValue> billingAccountTermsIt = billingAccountTerms.iterator(); - while (billingAccountTermsIt.hasNext()) { - GenericValue billingAccountTerm = billingAccountTermsIt.next(); + for(GenericValue billingAccountTerm : billingAccountTerms) { // the term is not copied if in the cart a term of the same type is already set if (!cart.hasOrderTerm(billingAccountTerm.getString("termTypeId"))) { cart.addOrderTerm(billingAccountTerm.getString("termTypeId"), billingAccountTerm.getBigDecimal("termValue"), billingAccountTerm.getLong("termDays")); @@ -318,10 +316,7 @@ public class CheckOutHelper { } } - Set<String> paymentMethods = selectedPaymentMethods.keySet(); - Iterator<String> i = paymentMethods.iterator(); - while (i.hasNext()) { - String checkOutPaymentId = i.next(); + for(String checkOutPaymentId : selectedPaymentMethods.keySet()) { String finAccountId = null; if (checkOutPaymentId.indexOf("|") > -1) { @@ -633,10 +628,8 @@ public class CheckOutHelper { // If needed, the production runs are created and linked to the order lines. // List<GenericValue> orderItems = UtilGenerics.checkList(context.get("orderItems")); - Iterator<GenericValue> orderItemsIt = orderItems.iterator(); int counter = 0; - while (orderItemsIt.hasNext()) { - GenericValue orderItem = orderItemsIt.next(); + for(GenericValue orderItem : orderItems) { String productId = orderItem.getString("productId"); if (productId != null) { try { @@ -675,9 +668,7 @@ public class CheckOutHelper { // ---------- // The status of the requirement associated to the shopping cart lines is set to "ordered". // - Iterator<ShoppingCartItem> shoppingCartItems = this.cart.items().iterator(); - while (shoppingCartItems.hasNext()) { - ShoppingCartItem shoppingCartItem = shoppingCartItems.next(); + for(ShoppingCartItem shoppingCartItem : this.cart.items()) { String requirementId = shoppingCartItem.getRequirementId(); if (requirementId != null) { try { @@ -731,9 +722,7 @@ public class CheckOutHelper { String additionalEmails = this.cart.getOrderAdditionalEmails(); List<String> emailList = StringUtil.split(additionalEmails, ","); if (emailList == null) emailList = new ArrayList<String>(); - Iterator<String> eli = emailList.iterator(); - while (eli.hasNext()) { - String email = eli.next(); + for(String email : emailList) { String contactMechId = this.delegator.getNextSeqId("ContactMech"); GenericValue contactMech = this.delegator.makeValue("ContactMech", UtilMisc.toMap("contactMechId", contactMechId, "contactMechTypeId", "EMAIL_ADDRESS", "infoString", email)); @@ -956,9 +945,7 @@ public class CheckOutHelper { List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("manualRefNum", EntityOperator.NOT_EQUAL, null)); List<GenericValue> manualRefPaymentPrefs = EntityUtil.filterByAnd(allPaymentPreferences, exprs); if (UtilValidate.isNotEmpty(manualRefPaymentPrefs)) { - Iterator<GenericValue> i = manualRefPaymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue opp = i.next(); + for(GenericValue opp : manualRefPaymentPrefs) { Map<String, Object> authCtx = new HashMap<String, Object>(); authCtx.put("orderPaymentPreference", opp); if (opp.get("paymentMethodId") == null) { @@ -1176,9 +1163,7 @@ public class CheckOutHelper { public static void adjustFaceToFacePayment(String orderId, BigDecimal cartTotal, List<GenericValue> allPaymentPrefs, GenericValue userLogin, Delegator delegator) throws GeneralException { BigDecimal prefTotal = BigDecimal.ZERO; if (allPaymentPrefs != null) { - Iterator<GenericValue> i = allPaymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + for(GenericValue pref : allPaymentPrefs) { BigDecimal maxAmount = pref.getBigDecimal("maxAmount"); if (maxAmount == null) maxAmount = BigDecimal.ZERO; prefTotal = prefTotal.add(maxAmount); @@ -1217,9 +1202,7 @@ public class CheckOutHelper { String errMsg=null; List<GenericValue> paymentMethods = this.cart.getPaymentMethods(); - Iterator<GenericValue> i = paymentMethods.iterator(); - while (i.hasNext()) { - GenericValue paymentMethod = i.next(); + for(GenericValue paymentMethod : paymentMethods) { if ((paymentMethod != null) && ("CREDIT_CARD".equals(paymentMethod.getString("paymentMethodTypeId")))) { GenericValue creditCard = null; GenericValue billingAddress = null; @@ -1518,9 +1501,7 @@ public class CheckOutHelper { public Map<String, BigDecimal> makeBillingAccountMap(List<GenericValue> paymentPrefs) { Map<String, BigDecimal> accountMap = new HashMap<String, BigDecimal>(); if (paymentPrefs != null) { - Iterator<GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pp = i.next(); + for(GenericValue pp : paymentPrefs) { if (pp.get("billingAccountId") != null) { accountMap.put(pp.getString("billingAccountId"), pp.getBigDecimal("maxAmount")); } @@ -1557,18 +1538,14 @@ public class CheckOutHelper { // update the selected payment methods amount with valid numbers if (paymentMethods != null) { List<String> nullPaymentIds = new ArrayList<String>(); - Iterator<String> i = paymentMethods.iterator(); - while (i.hasNext()) { - String paymentMethodId = i.next(); + for(String paymentMethodId : paymentMethods) { BigDecimal paymentAmount = cart.getPaymentAmount(paymentMethodId); if (paymentAmount == null || paymentAmount.compareTo(BigDecimal.ZERO) == 0) { if (Debug.verboseOn()) Debug.logVerbose("Found null paymentMethodId - " + paymentMethodId, module); nullPaymentIds.add(paymentMethodId); } } - Iterator<String> npi = nullPaymentIds.iterator(); - while (npi.hasNext()) { - String paymentMethodId = npi.next(); + for(String paymentMethodId : nullPaymentIds) { BigDecimal selectedPaymentTotal = cart.getPaymentTotal(); BigDecimal requiredAmount = cart.getGrandTotal(); BigDecimal newAmount = requiredAmount.subtract(selectedPaymentTotal); @@ -1636,9 +1613,7 @@ public class CheckOutHelper { String balanceField = null; // get the gift card objects to check - Iterator<GenericValue> i = cart.getGiftCards().iterator(); - while (i.hasNext()) { - GenericValue gc = i.next(); + for(GenericValue gc : cart.getGiftCards()) { Map<String, Object> gcBalanceMap = null; BigDecimal gcBalance = BigDecimal.ZERO; try { 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=1305309&r1=1305308&r2=1305309&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 Mon Mar 26 11:08:11 2012 @@ -218,9 +218,7 @@ public class ShoppingCart implements Ite } // clone the groups - Iterator<ShoppingCartItemGroup> groupIt = cart.itemGroupByNumberMap.values().iterator(); - while (groupIt.hasNext()) { - ShoppingCartItemGroup itemGroup = groupIt.next(); + for(ShoppingCartItemGroup itemGroup : cart.itemGroupByNumberMap.values()) { // get the new parent group by number from the existing set; as before the parent must come before all children to work... ShoppingCartItemGroup parentGroup = null; if (itemGroup.getParentGroup() != null) parentGroup = this.getItemGroupByNumber(itemGroup.getParentGroup().getGroupNumber()); @@ -229,12 +227,10 @@ public class ShoppingCart implements Ite } // clone the items - List<ShoppingCartItem> items = cart.items(); - Iterator<ShoppingCartItem> itIt = items.iterator(); - while (itIt.hasNext()) { - cartLines.add(new ShoppingCartItem(itIt.next())); + for(ShoppingCartItem item : cart.items()) { + cartLines.add(new ShoppingCartItem(item)); } - + this.facilityId = cart.facilityId; this.webSiteId = cart.webSiteId; } @@ -429,9 +425,7 @@ public class ShoppingCart implements Ite String previousCurrency = this.currencyUom; this.currencyUom = currencyUom; if (!previousCurrency.equals(this.currencyUom)) { - Iterator<ShoppingCartItem> itemIterator = this.iterator(); - while (itemIterator.hasNext()) { - ShoppingCartItem item = itemIterator.next(); + for(ShoppingCartItem item : this) { item.updatePrice(dispatcher, this); } } @@ -758,18 +752,14 @@ public class ShoppingCart implements Ite localList.addAll(multipleItems); // the ones to keep... for (int i=0; i<maxItems; i++) localList.remove(0); - Iterator<ShoppingCartItem> localIter = localList.iterator(); - while (localIter.hasNext()) { - ShoppingCartItem item = localIter.next(); + for(ShoppingCartItem item : localList) { this.removeCartItem(item, dispatcher); } } public static BigDecimal getItemsTotalQuantity(List<ShoppingCartItem> cartItems) { BigDecimal totalQuantity = BigDecimal.ZERO; - Iterator<ShoppingCartItem> localIter = cartItems.iterator(); - while (localIter.hasNext()) { - ShoppingCartItem item = localIter.next(); + for(ShoppingCartItem item : cartItems) { totalQuantity = totalQuantity.add(item.getQuantity()); } return totalQuantity; @@ -777,9 +767,7 @@ public class ShoppingCart implements Ite public static List<GenericValue> getItemsProducts(List<ShoppingCartItem> cartItems) { List<GenericValue> productList = FastList.newInstance(); - Iterator<ShoppingCartItem> localIter = cartItems.iterator(); - while (localIter.hasNext()) { - ShoppingCartItem item = localIter.next(); + for(ShoppingCartItem item : cartItems) { GenericValue product = item.getProduct(); if (product != null) { productList.add(product); @@ -789,9 +777,7 @@ public class ShoppingCart implements Ite } public void ensureItemsQuantity(List<ShoppingCartItem> cartItems, LocalDispatcher dispatcher, BigDecimal quantity) throws CartItemModifyException { - Iterator<ShoppingCartItem> localIter = cartItems.iterator(); - while (localIter.hasNext()) { - ShoppingCartItem item = localIter.next(); + for(ShoppingCartItem item : cartItems) { if (item.getQuantity() != quantity) { item.setQuantity(quantity, dispatcher, this); } @@ -802,10 +788,7 @@ public class ShoppingCart implements Ite BigDecimal quantityRemoved = BigDecimal.ZERO; // go through the items and reduce quantityToKeep by the item quantities until it is 0, then remove the remaining... BigDecimal quantityToKeep = quantity; - Iterator<ShoppingCartItem> localIter = cartItems.iterator(); - while (localIter.hasNext()) { - ShoppingCartItem item = localIter.next(); - + for(ShoppingCartItem item : cartItems) { if (quantityToKeep.compareTo(item.getQuantity()) >= 0) { // quantityToKeep sufficient to keep it all... just reduce quantityToKeep and move on quantityToKeep = quantityToKeep.subtract(item.getQuantity()); @@ -829,8 +812,7 @@ public class ShoppingCart implements Ite // ============== WorkEffort related methods =============== public boolean containAnyWorkEffortCartItems() { // Check for existing cart item. - for (int i = 0; i < this.cartLines.size(); i++) { - ShoppingCartItem cartItem = cartLines.get(i); + for(ShoppingCartItem cartItem : this.cartLines) { if (cartItem.getItemType().equals("RENTAL_ORDER_ITEM")) { // create workeffort items? return true; } @@ -840,8 +822,7 @@ public class ShoppingCart implements Ite public boolean containAllWorkEffortCartItems() { // Check for existing cart item. - for (int i = 0; i < this.cartLines.size(); i++) { - ShoppingCartItem cartItem = cartLines.get(i); + for(ShoppingCartItem cartItem : this.cartLines) { if (!cartItem.getItemType().equals("RENTAL_ORDER_ITEM")) { // not a item to create workefforts? return false; } @@ -854,8 +835,7 @@ public class ShoppingCart implements Ite * This is determined by making sure no Product has a type where ProductType.isPhysical!=N. */ public boolean containOnlyDigitalGoods() { - for (int i = 0; i < this.cartLines.size(); i++) { - ShoppingCartItem cartItem = cartLines.get(i); + for(ShoppingCartItem cartItem : this.cartLines) { GenericValue product = cartItem.getProduct(); try { GenericValue productType = product.getRelatedOneCache("ProductType"); @@ -1024,16 +1004,12 @@ public class ShoppingCart implements Ite if (itemGroup != null) { // go through all cart items and remove from group if they are in it List<ShoppingCartItem> cartItemList = this.getCartItemsInGroup(groupNumber); - Iterator<ShoppingCartItem> cartItemIter = cartItemList.iterator(); - while (cartItemIter.hasNext()) { - ShoppingCartItem cartItem = cartItemIter.next(); + for(ShoppingCartItem cartItem : cartItemList) { cartItem.setItemGroup(null); } // if this is a parent of any set them to this group's parent (or null) - Iterator<ShoppingCartItemGroup> itemGroupIter = this.itemGroupByNumberMap.values().iterator(); - while (itemGroupIter.hasNext()) { - ShoppingCartItemGroup otherItemGroup = itemGroupIter.next(); + for(ShoppingCartItemGroup otherItemGroup : this.itemGroupByNumberMap.values()) { if (itemGroup.equals(otherItemGroup.getParentGroup())) { otherItemGroup.inheritParentsParent(); } @@ -1089,9 +1065,7 @@ public class ShoppingCart implements Ite String partyId = this.getPartyId(); if (UtilValidate.isNotEmpty(partyId)) { // recalculate all prices - Iterator<ShoppingCartItem> cartItemIter = this.iterator(); - while (cartItemIter.hasNext()) { - ShoppingCartItem cartItem = cartItemIter.next(); + for(ShoppingCartItem cartItem : this) { cartItem.updatePrice(dispatcher, this); } @@ -1576,9 +1550,7 @@ public class ShoppingCart implements Ite /** Returns the CartPaymentInfo objects which have matching fields */ public List<CartPaymentInfo> getPaymentInfos(boolean isPaymentMethod, boolean isPaymentMethodType, boolean hasRefNum) { List<CartPaymentInfo> foundRecords = new LinkedList<CartPaymentInfo>(); - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (isPaymentMethod && inf.paymentMethodId != null) { if (hasRefNum && inf.refNum != null) { foundRecords.add(inf); @@ -1604,9 +1576,7 @@ public class ShoppingCart implements Ite /** Locates an existing (or creates a new) CartPaymentInfo object */ public CartPaymentInfo getPaymentInfo(String id, String refNum, String authCode, BigDecimal amount, boolean update) { CartPaymentInfo thisInf = this.makePaymentInfo(id, refNum, authCode, amount); - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.compareTo(thisInf) == 0) { // update the info if (update) { @@ -1642,9 +1612,7 @@ public class ShoppingCart implements Ite // this payment method will set the billing address for the order; // before it is set we have to verify if the billing address is // compatible with the ProductGeos - Iterator<GenericValue> products = (ShoppingCart.getItemsProducts(this.cartLines)).iterator(); - while (products.hasNext()) { - GenericValue product = products.next(); + for(GenericValue product : ShoppingCart.getItemsProducts(this.cartLines)) { if (!ProductWorker.isBillableToAddress(product, billingAddress)) { throw new IllegalArgumentException("The billing address is not compatible with ProductGeos rules."); } @@ -1687,9 +1655,7 @@ public class ShoppingCart implements Ite } public String getPaymentRef(String id) { - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.paymentMethodId.equals(id) || inf.paymentMethodTypeId.equals(id)) { return inf.refNum[0]; } @@ -1700,9 +1666,7 @@ public class ShoppingCart implements Ite /** returns the total payment amounts */ public BigDecimal getPaymentTotal() { BigDecimal total = BigDecimal.ZERO; - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.amount != null) { total = total.add(inf.amount); } @@ -1755,8 +1719,7 @@ public class ShoppingCart implements Ite List<GenericValue> declinedPaymentMethods = delegator.findByAnd("OrderPaymentPreference", UtilMisc.toMap("orderId", orderId, "statusId", "PAYMENT_DECLINED")); if (!UtilValidate.isEmpty(declinedPaymentMethods)) { List<String> paymentMethodIdsToRemove = new ArrayList<String>(); - for (Iterator<GenericValue> iter = declinedPaymentMethods.iterator(); iter.hasNext();) { - GenericValue opp = iter.next(); + for(GenericValue opp : declinedPaymentMethods) { paymentMethodIdsToRemove.add(opp.getString("paymentMethodId")); } clearPaymentMethodsById(paymentMethodIdsToRemove); @@ -1770,9 +1733,7 @@ public class ShoppingCart implements Ite private void expireSingleUsePayments() { Timestamp now = UtilDateTime.nowTimestamp(); - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.paymentMethodId == null || !inf.singleUse) { continue; } @@ -1799,9 +1760,7 @@ public class ShoppingCart implements Ite /** Returns the Payment Method Ids */ public List<String> getPaymentMethodIds() { List<String> pmi = new LinkedList<String>(); - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.paymentMethodId != null) { pmi.add(inf.paymentMethodId); } @@ -1812,9 +1771,7 @@ public class ShoppingCart implements Ite /** Returns the Payment Method Ids */ public List<String> getPaymentMethodTypeIds() { List<String> pmt = FastList.newInstance(); - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.paymentMethodTypeId != null) { pmt.add(inf.paymentMethodTypeId); } @@ -1826,9 +1783,7 @@ public class ShoppingCart implements Ite public List<GenericValue> getPaymentMethods() { List<GenericValue> methods = FastList.newInstance(); if (UtilValidate.isNotEmpty(paymentInfo)) { - Iterator<String> paymentMethodIdIter = getPaymentMethodIds().iterator(); - while (paymentMethodIdIter.hasNext()) { - String paymentMethodId = paymentMethodIdIter.next(); + for(String paymentMethodId : getPaymentMethodIds()) { try { GenericValue paymentMethod = this.getDelegator().findByPrimaryKeyCache("PaymentMethod", UtilMisc.toMap("paymentMethodId", paymentMethodId)); if (paymentMethod != null) { @@ -1849,9 +1804,7 @@ public class ShoppingCart implements Ite public List<GenericValue> getPaymentMethodTypes() { List<GenericValue> types = new LinkedList<GenericValue>(); if (UtilValidate.isNotEmpty(paymentInfo)) { - Iterator<String> i = getPaymentMethodTypeIds().iterator(); - while (i.hasNext()) { - String id = i.next(); + for(String id : getPaymentMethodIds()) { try { types.add(this.getDelegator().findByPrimaryKeyCache("PaymentMethodType", UtilMisc.toMap("paymentMethodTypeId", id))); } catch (GenericEntityException e) { @@ -1867,9 +1820,7 @@ public class ShoppingCart implements Ite List<GenericValue> paymentMethods = this.getPaymentMethods(); List<GenericValue> creditCards = new LinkedList<GenericValue>(); if (paymentMethods != null) { - Iterator<GenericValue> i = paymentMethods.iterator(); - while (i.hasNext()) { - GenericValue pm = i.next(); + for(GenericValue pm : paymentMethods) { if ("CREDIT_CARD".equals(pm.getString("paymentMethodTypeId"))) { try { GenericValue cc = pm.getRelatedOne("CreditCard"); @@ -1888,9 +1839,7 @@ public class ShoppingCart implements Ite List<GenericValue> paymentMethods = this.getPaymentMethods(); List<GenericValue> giftCards = new LinkedList<GenericValue>(); if (paymentMethods != null) { - Iterator<GenericValue> i = paymentMethods.iterator(); - while (i.hasNext()) { - GenericValue pm = i.next(); + for(GenericValue pm : paymentMethods) { if ("GIFT_CARD".equals(pm.getString("paymentMethodTypeId"))) { try { GenericValue gc = pm.getRelatedOne("GiftCard"); @@ -1922,9 +1871,7 @@ public class ShoppingCart implements Ite public GenericValue getBillingAddress() { GenericValue billingAddress = null; - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { billingAddress = inf.getBillingAddress(this.getDelegator()); if (billingAddress != null) { break; @@ -2109,8 +2056,7 @@ public class ShoppingCart implements Ite Map<Integer, BigDecimal> shipGroups = this.getShipGroups(item); if ((shipGroups != null) && (shipGroups.keySet() != null)) { - for (Iterator<Integer> shipGroupKeys = shipGroups.keySet().iterator(); shipGroupKeys.hasNext();) { - Integer shipGroup = shipGroupKeys.next(); + for(Integer shipGroup : shipGroups.keySet()) { CartShipInfo cartShipInfo = this.getShipInfo(shipGroup.intValue()); cartShipInfo.resetShipAfterDateIfBefore(item.getShipAfterDate()); @@ -2258,9 +2204,7 @@ public class ShoppingCart implements Ite if (shippingAddress != null) { Set<ShoppingCartItem> shipItems = csi.getShipItems(); if (UtilValidate.isNotEmpty(shipItems)) { - Iterator<ShoppingCartItem> siit = shipItems.iterator(); - while (siit.hasNext()) { - ShoppingCartItem cartItem = siit.next(); + for(ShoppingCartItem cartItem : shipItems) { GenericValue product = cartItem.getProduct(); if (UtilValidate.isNotEmpty(product)) { if (!ProductWorker.isShippableToAddress(product, shippingAddress)) { @@ -2607,11 +2551,8 @@ public class ShoppingCart implements Ite public BigDecimal getTotalShipping() { BigDecimal tempShipping = BigDecimal.ZERO; - Iterator<CartShipInfo> shipIter = this.shipInfo.iterator(); - while (shipIter.hasNext()) { - CartShipInfo csi = shipIter.next(); + for(CartShipInfo csi : this.shipInfo) { tempShipping = tempShipping.add(csi.shipEstimate); - } return tempShipping; @@ -2620,10 +2561,8 @@ public class ShoppingCart implements Ite /** Returns the item-total in the cart (not including discount/tax/shipping). */ public BigDecimal getItemTotal() { BigDecimal itemTotal = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - - while (i.hasNext()) { - itemTotal = itemTotal.add((i.next()).getBasePrice()); + for(ShoppingCartItem cartItem : this.cartLines) { + itemTotal = itemTotal.add(cartItem.getBasePrice()); } return itemTotal; } @@ -2631,10 +2570,8 @@ public class ShoppingCart implements Ite /** Returns the sub-total in the cart (item-total - discount). */ public BigDecimal getSubTotal() { BigDecimal itemsTotal = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - - while (i.hasNext()) { - itemsTotal = itemsTotal.add((i.next()).getItemSubTotal()); + for(ShoppingCartItem cartItem : this.cartLines) { + itemsTotal = itemsTotal.add(cartItem.getItemSubTotal()); } return itemsTotal; } @@ -2651,9 +2588,8 @@ public class ShoppingCart implements Ite public BigDecimal getDisplaySubTotal() { BigDecimal itemsTotal = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - while (i.hasNext()) { - itemsTotal = itemsTotal.add((i.next()).getDisplayItemSubTotal()); + for(ShoppingCartItem cartItem : this.cartLines) { + itemsTotal = itemsTotal.add(cartItem.getDisplayItemSubTotal()); } return itemsTotal; } @@ -2665,9 +2601,8 @@ public class ShoppingCart implements Ite public BigDecimal getDisplayRecurringSubTotal() { BigDecimal itemsTotal = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - while (i.hasNext()) { - itemsTotal = itemsTotal.add((i.next()).getDisplayItemRecurringSubTotal()); + for(ShoppingCartItem cartItem : this.cartLines) { + itemsTotal = itemsTotal.add(cartItem.getDisplayItemRecurringSubTotal()); } return itemsTotal; } @@ -2684,10 +2619,7 @@ public class ShoppingCart implements Ite /** Returns the sub-total in the cart (item-total - discount). */ public BigDecimal getSubTotalForPromotions() { BigDecimal itemsTotal = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - - while (i.hasNext()) { - ShoppingCartItem cartItem = i.next(); + for(ShoppingCartItem cartItem : this.cartLines) { GenericValue product = cartItem.getProduct(); if (product != null && "N".equals(product.getString("includeInPromotions"))) { // don't include in total if this is the case... @@ -2705,8 +2637,7 @@ public class ShoppingCart implements Ite public BigDecimal getOrderPaymentPreferenceTotalByType(String paymentMethodTypeId) { BigDecimal total = BigDecimal.ZERO; String thisPaymentMethodTypeId = null; - for (Iterator<CartPaymentInfo> iter = paymentInfo.iterator(); iter.hasNext();) { - CartPaymentInfo payment = iter.next(); + for(CartPaymentInfo payment : paymentInfo) { if (payment.amount == null) continue; if (payment.paymentMethodId != null) { try { @@ -2852,9 +2783,7 @@ public class ShoppingCart implements Ite if (termTypeId == null) { return false; } - Iterator<GenericValue> orderTermsIt = orderTerms.iterator(); - while (orderTermsIt.hasNext()) { - GenericValue orderTerm = orderTermsIt.next(); + for(GenericValue orderTerm : orderTerms) { if (termTypeId.equals(orderTerm.getString("termTypeId"))) { return true; } @@ -2878,11 +2807,8 @@ public class ShoppingCart implements Ite List<List<GenericValue>> adjsLists = FastList.newInstance(); adjsLists.add(this.getAdjustments()); - Iterator<ShoppingCartItem> cartIterator = this.iterator(); - - while (cartIterator.hasNext()) { - ShoppingCartItem item = cartIterator.next(); + for(ShoppingCartItem item : this) { if (item.getAdjustments() != null) { adjsLists.add(item.getAdjustments()); } @@ -2907,11 +2833,8 @@ public class ShoppingCart implements Ite /** Returns the total weight in the cart. */ public BigDecimal getTotalWeight() { BigDecimal weight = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - - while (i.hasNext()) { - ShoppingCartItem item = i.next(); + for(ShoppingCartItem item : this.cartLines) { weight = weight.add(item.getWeight().multiply(item.getQuantity())); } return weight; @@ -2920,10 +2843,9 @@ public class ShoppingCart implements Ite /** Returns the total quantity in the cart. */ public BigDecimal getTotalQuantity() { BigDecimal count = BigDecimal.ZERO; - Iterator<ShoppingCartItem> i = iterator(); - while (i.hasNext()) { - count = count.add((i.next()).getQuantity()); + for(ShoppingCartItem item : this.cartLines) { + count = count.add(item.getQuantity()); } return count; } @@ -3018,9 +2940,7 @@ public class ShoppingCart implements Ite /** Returns true when there are shippable items in the cart */ public boolean shippingApplies() { boolean shippingApplies = false; - Iterator<ShoppingCartItem> i = this.iterator(); - while (i.hasNext()) { - ShoppingCartItem item = i.next(); + for(ShoppingCartItem item : this) { if (item.shippingApplies()) { shippingApplies = true; break; @@ -3032,9 +2952,7 @@ public class ShoppingCart implements Ite /** Returns true when there are taxable items in the cart */ public boolean taxApplies() { boolean taxApplies = false; - Iterator<ShoppingCartItem> i = this.iterator(); - while (i.hasNext()) { - ShoppingCartItem item = i.next(); + for(ShoppingCartItem item : this) { if (item.taxApplies()) { taxApplies = true; break; @@ -3152,9 +3070,7 @@ public class ShoppingCart implements Ite public void clearCartItemUseInPromoInfo() { // clear out info about which cart items have been used in promos - Iterator<ShoppingCartItem> cartLineIter = this.iterator(); - while (cartLineIter.hasNext()) { - ShoppingCartItem cartLine = cartLineIter.next(); + for(ShoppingCartItem cartLine : this) { cartLine.clearPromoRuleUseInfo(); } } @@ -3167,9 +3083,7 @@ public class ShoppingCart implements Ite BigDecimal totalDiscount = BigDecimal.ZERO; List<GenericValue> cartAdjustments = this.getAdjustments(); if (cartAdjustments != null) { - Iterator<GenericValue> cartAdjustmentIter = cartAdjustments.iterator(); - while (cartAdjustmentIter.hasNext()) { - GenericValue checkOrderAdjustment = cartAdjustmentIter.next(); + for(GenericValue checkOrderAdjustment : cartAdjustments) { if (UtilValidate.isNotEmpty(checkOrderAdjustment.getString("productPromoId")) && UtilValidate.isNotEmpty(checkOrderAdjustment.getString("productPromoRuleId")) && UtilValidate.isNotEmpty(checkOrderAdjustment.getString("productPromoActionSeqId"))) { @@ -3181,9 +3095,7 @@ public class ShoppingCart implements Ite } // add cart line adjustments from promo actions - Iterator<ShoppingCartItem> cartItemIter = this.iterator(); - while (cartItemIter.hasNext()) { - ShoppingCartItem checkItem = cartItemIter.next(); + for(ShoppingCartItem checkItem : this) { Iterator<GenericValue> checkOrderAdjustments = UtilMisc.toIterator(checkItem.getAdjustments()); while (checkOrderAdjustments != null && checkOrderAdjustments.hasNext()) { GenericValue checkOrderAdjustment = checkOrderAdjustments.next(); @@ -3287,17 +3199,13 @@ public class ShoppingCart implements Ite // remove all cart adjustments this.adjustments.clear(); // remove all cart item adjustments - Iterator<ShoppingCartItem> cartItemIter = this.iterator(); - while (cartItemIter.hasNext()) { - ShoppingCartItem checkItem = cartItemIter.next(); + for(ShoppingCartItem checkItem : this) { checkItem.getAdjustments().clear(); } } public void clearAllItemStatus() { - Iterator<ShoppingCartItem> lineIter = this.iterator(); - while (lineIter.hasNext()) { - ShoppingCartItem item = lineIter.next(); + for(ShoppingCartItem item : this) { item.setStatusId(null); } } @@ -3331,17 +3239,13 @@ public class ShoppingCart implements Ite } public synchronized void resetPromoRuleUse(String productPromoId, String productPromoRuleId) { - Iterator<ShoppingCartItem> lineIter = this.iterator(); - while (lineIter.hasNext()) { - ShoppingCartItem cartItem = lineIter.next(); + for(ShoppingCartItem cartItem : this) { cartItem.resetPromoRuleUse(productPromoId, productPromoRuleId); } } public synchronized void confirmPromoRuleUse(String productPromoId, String productPromoRuleId) { - Iterator<ShoppingCartItem> lineIter = this.iterator(); - while (lineIter.hasNext()) { - ShoppingCartItem cartItem = lineIter.next(); + for(ShoppingCartItem cartItem : this) { cartItem.confirmPromoRuleUse(productPromoId, productPromoRuleId); } } @@ -3355,9 +3259,8 @@ public class ShoppingCart implements Ite // search if there is an existing entry List<String> parties = additionalPartyRole.get(roleTypeId); if (parties != null) { - Iterator<String> it = parties.iterator(); - while (it.hasNext()) { - if ((it.next()).equals(partyId)) { + for(String pi : parties) { + if (pi.equals(partyId)) { return; } } @@ -3491,9 +3394,7 @@ public class ShoppingCart implements Ite public List<GenericValue> makeOrderItemGroups() { List<GenericValue> result = FastList.newInstance(); - Iterator<ShoppingCartItemGroup> groupValueIter = this.itemGroupByNumberMap.values().iterator(); - while (groupValueIter.hasNext()) { - ShoppingCart.ShoppingCartItemGroup itemGroup = groupValueIter.next(); + for(ShoppingCart.ShoppingCartItemGroup itemGroup : this.itemGroupByNumberMap.values()) { result.add(itemGroup.makeOrderItemGroup(this.getDelegator())); } return result; @@ -3503,11 +3404,7 @@ public class ShoppingCart implements Ite if (dispatcher == null) return; synchronized (cartLines) { List<ShoppingCartItem> cartLineItems = new LinkedList<ShoppingCartItem>(cartLines); - Iterator<ShoppingCartItem> itemIter = cartLineItems.iterator(); - - while (itemIter.hasNext()) { - ShoppingCartItem item = itemIter.next(); - + for(ShoppingCartItem item : cartLineItems) { //Debug.logInfo("Item qty: " + item.getQuantity(), module); try { item.explodeItem(this, dispatcher); @@ -3528,10 +3425,7 @@ public class ShoppingCart implements Ite public void explodeItems(List<ShoppingCartItem> shoppingCartItems, LocalDispatcher dispatcher) { if (dispatcher == null) return; synchronized (cartLines) { - Iterator<ShoppingCartItem> itemIter = shoppingCartItems.iterator(); - while (itemIter.hasNext()) { - ShoppingCartItem item = itemIter.next(); - + for(ShoppingCartItem item : shoppingCartItems) { //Debug.logInfo("Item qty: " + item.getQuantity(), module); try { item.explodeItem(this, dispatcher); @@ -3805,9 +3699,7 @@ public class ShoppingCart implements Ite remainingAmount = BigDecimal.ZERO; } } - Iterator<CartPaymentInfo> i = paymentInfo.iterator(); - while (i.hasNext()) { - CartPaymentInfo inf = i.next(); + for(CartPaymentInfo inf : paymentInfo) { if (inf.amount == null) { inf.amount = remainingAmount; remainingAmount = BigDecimal.ZERO; @@ -3826,11 +3718,7 @@ public class ShoppingCart implements Ite Collection<GenericValue> infos = item.getOrderItemPriceInfos(); if (infos != null) { - Iterator<GenericValue> infosIter = infos.iterator(); - - while (infosIter.hasNext()) { - GenericValue orderItemPriceInfo = infosIter.next(); - + for(GenericValue orderItemPriceInfo : infos) { orderItemPriceInfo.set("orderItemSeqId", item.getOrderItemSeqId()); allInfos.add(orderItemPriceInfo); } @@ -3861,15 +3749,11 @@ public class ShoppingCart implements Ite /** make a list of SurveyResponse object to update with order information set */ public List<GenericValue> makeAllOrderItemSurveyResponses() { List<GenericValue> allInfos = new LinkedList<GenericValue>(); - Iterator<ShoppingCartItem> itemIter = this.iterator(); - while (itemIter.hasNext()) { - ShoppingCartItem item = itemIter.next(); + for(ShoppingCartItem item : this) { List<String> responses = UtilGenerics.checkList(item.getAttribute("surveyResponses")); GenericValue response = null; if (responses != null) { - Iterator<String> ri = responses.iterator(); - while (ri.hasNext()) { - String responseId = ri.next(); + for(String responseId : responses) { try { response = this.getDelegator().findByPrimaryKey("SurveyResponse", UtilMisc.toMap("surveyResponseId", responseId)); } catch (GenericEntityException e) { @@ -3935,10 +3819,8 @@ public class ShoppingCart implements Ite public List<GenericValue> makeAllShipGroupInfos() { List<GenericValue> groups = new LinkedList<GenericValue>(); - Iterator<CartShipInfo> grpIterator = this.shipInfo.iterator(); long seqId = 1; - while (grpIterator.hasNext()) { - CartShipInfo csi = grpIterator.next(); + for(CartShipInfo csi : this.shipInfo) { groups.addAll(csi.makeItemShipGroupAndAssoc(this.getDelegator(), this, seqId)); seqId++; } @@ -3961,9 +3843,7 @@ public class ShoppingCart implements Ite for (ShoppingCartItem item : cartLines) { Map<String, String> orderItemAttributes = item.getOrderItemAttributes(); - Iterator<String> attributesIter = orderItemAttributes.keySet().iterator(); - while (attributesIter.hasNext()) { - String key = attributesIter.next(); + for(String key : orderItemAttributes.keySet()) { String value = orderItemAttributes.get(key); GenericValue orderItemAttribute = getDelegator().makeValue("OrderItemAttribute"); @@ -4200,11 +4080,7 @@ public class ShoppingCart implements Ite Set<ShoppingCartItem> shipItems = shipInfo.getShipItems(); if (UtilValidate.isEmpty(shipItems)) continue; - Iterator<ShoppingCartItem> siit = shipItems.iterator(); - while (siit.hasNext()) { - - ShoppingCartItem cartItem = siit.next(); - + for(ShoppingCartItem cartItem : shipItems) { BigDecimal itemQuantity = cartItem.getQuantity(); BigDecimal dropShipQuantity = BigDecimal.ZERO; @@ -4276,10 +4152,7 @@ public class ShoppingCart implements Ite } // Reassign the drop-shippable item quantities to new or existing drop-ship groups - Iterator<String> dsit = dropShipItems.keySet().iterator(); - while (dsit.hasNext()) { - String supplierPartyId = dsit.next(); - + for (String supplierPartyId : dropShipItems.keySet()) { CartShipInfo shipInfo = null; int newShipGroupIndex = -1 ; @@ -4296,15 +4169,9 @@ public class ShoppingCart implements Ite shipInfo.supplierPartyId = supplierPartyId; Map<ShoppingCartItem, Map<Integer, BigDecimal>> supplierCartItems = UtilGenerics.checkMap(dropShipItems.get(supplierPartyId)); - Iterator<ShoppingCartItem> itit = supplierCartItems.keySet().iterator(); - while (itit.hasNext()) { - - ShoppingCartItem cartItem = itit.next(); + for(ShoppingCartItem cartItem : supplierCartItems.keySet()) { Map<Integer, BigDecimal> cartItemGroupQuantities = UtilGenerics.checkMap(supplierCartItems.get(cartItem)); - Iterator<Integer> cigit = cartItemGroupQuantities.keySet().iterator(); - while (cigit.hasNext()) { - - Integer previousShipGroupIndex = cigit.next(); + for(Integer previousShipGroupIndex : cartItemGroupQuantities.keySet()) { BigDecimal dropShipQuantity = cartItemGroupQuantities.get(previousShipGroupIndex); positionItemToGroup(cartItem, dropShipQuantity, previousShipGroupIndex.intValue(), newShipGroupIndex, true); } @@ -4508,9 +4375,7 @@ public class ShoppingCart implements Ite public void clearAllTaxInfo() { this.shipTaxAdj.clear(); - Iterator<CartShipItemInfo> i = shipItemInfo.values().iterator(); - while (i.hasNext()) { - CartShipItemInfo itemInfo = i.next(); + for(CartShipItemInfo itemInfo : shipItemInfo.values()) { itemInfo.itemTaxAdj.clear(); } } @@ -4595,17 +4460,13 @@ public class ShoppingCart implements Ite } // create the top level tax adjustments - Iterator<GenericValue> ti = shipTaxAdj.iterator(); - while (ti.hasNext()) { - GenericValue taxAdj = ti.next(); + for(GenericValue taxAdj : shipTaxAdj) { taxAdj.set("shipGroupSeqId", shipGroupSeqId); values.add(taxAdj); } // create the ship group item associations - Iterator<ShoppingCartItem> i = shipItemInfo.keySet().iterator(); - while (i.hasNext()) { - ShoppingCartItem item = i.next(); + for(ShoppingCartItem item : shipItemInfo.keySet()) { CartShipItemInfo itemInfo = shipItemInfo.get(item); GenericValue assoc = delegator.makeValue("OrderItemShipGroupAssoc"); @@ -4615,9 +4476,7 @@ public class ShoppingCart implements Ite values.add(assoc); // create the item tax adjustment - Iterator<GenericValue> iti = itemInfo.itemTaxAdj.iterator(); - while (iti.hasNext()) { - GenericValue taxAdj = iti.next(); + for(GenericValue taxAdj : itemInfo.itemTaxAdj) { taxAdj.set("orderItemSeqId", item.getOrderItemSeqId()); taxAdj.set("shipGroupSeqId", shipGroupSeqId); values.add(taxAdj); @@ -4871,9 +4730,7 @@ public class ShoppingCart implements Ite throw new GeneralRuntimeException("Split Payment Preference per Ship Group does not yet support multiple Payment Methods"); } if ("Y".equals(splitPayPrefPerShpGrp) && cart.paymentInfo.size() == 1) { - Iterator<CartShipInfo> shipIter = cart.getShipGroups().iterator(); - while (shipIter.hasNext()) { - CartShipInfo csi = shipIter.next(); + for(CartShipInfo csi : cart.getShipGroups()) { maxAmount = csi.getTotal().add(cart.getOrderOtherAdjustmentTotal().divide(new BigDecimal(cart.getShipGroupSize()), generalRounding)).add(csi.getShipEstimate().add(csi.getTotalTax(cart))); maxAmount = maxAmount.setScale(scale, rounding); @@ -5065,10 +4922,8 @@ 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<GenericValue> it = productPriceList.iterator(); Map<String, BigDecimal> productPriceMap = FastMap.newInstance(); - while (it.hasNext()) { - GenericValue productPrice = it.next(); + for(GenericValue productPrice : productPriceList) { productPriceMap.put(productPrice.getString("productPriceTypeId"), productPrice.getBigDecimal("price")); } if (UtilValidate.isNotEmpty(productPriceMap.get("SPECIAL_PROMO_PRICE"))) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Mon Mar 26 11:08:11 2012 @@ -522,9 +522,7 @@ public class ShoppingCartEvents { productAssocs = delegator.findList("ProductAssoc", cond, null, null, null, false); productAssocs = EntityUtil.filterByDate(productAssocs); List<String> productList = FastList.newInstance(); - Iterator<GenericValue> iter = productAssocs.iterator(); - while (iter.hasNext()) { - GenericValue productAssoc = iter.next(); + for(GenericValue productAssoc : productAssocs) { if (productId.equals(productAssoc.getString("productId"))) { productList.add(productAssoc.getString("productIdTo")); continue; @@ -534,9 +532,7 @@ public class ShoppingCartEvents { continue; } } - Iterator<ShoppingCartItem> sciIter = cart.iterator(); - while (sciIter.hasNext()) { - ShoppingCartItem sci = sciIter.next(); + for(ShoppingCartItem sci : cart) { if (productList.contains(sci.getProductId())) { try { cart.removeCartItem(sci, dispatcher); @@ -553,9 +549,7 @@ public class ShoppingCartEvents { EntityCondition.makeCondition("productAssocTypeId", EntityOperator.EQUALS, "PRODUCT_UPGRADE")), EntityOperator.AND); productList = delegator.findList("ProductAssoc", cond, UtilMisc.toSet("productId"), null, null, false); if (productList != null) { - Iterator<ShoppingCartItem> sciIter = cart.iterator(); - while (sciIter.hasNext()) { - ShoppingCartItem sci = sciIter.next(); + for(ShoppingCartItem sci : cart) { if (productList.contains(sci.getProductId())) { try { cart.removeCartItem(sci, dispatcher); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Mon Mar 26 11:08:11 2012 @@ -209,10 +209,8 @@ public class ShoppingCartHelper { // Get the additional features selected for the product (if any) Map<String, Object> selectedFeatures = UtilHttp.makeParamMapWithPrefix(context, null, "FT", null); - Iterator<String> selectedFeaturesTypes = selectedFeatures.keySet().iterator(); Map<String, GenericValue> additionalFeaturesMap = FastMap.newInstance(); - while (selectedFeaturesTypes.hasNext()) { - String selectedFeatureType = selectedFeaturesTypes.next(); + for(String selectedFeatureType : selectedFeatures.keySet()) { String selectedFeatureValue = (String)selectedFeatures.get(selectedFeatureType); if (UtilValidate.isNotEmpty(selectedFeatureValue)) { GenericValue productFeatureAndAppl = null; @@ -588,10 +586,7 @@ public class ShoppingCartHelper { } BigDecimal totalQuantity = BigDecimal.ZERO; - Iterator<GenericValue> pcmIter = prodCatMemberCol.iterator(); - - while (pcmIter.hasNext()) { - GenericValue productCategoryMember = pcmIter.next(); + for(GenericValue productCategoryMember : prodCatMemberCol) { BigDecimal quantity = productCategoryMember.getBigDecimal("quantity"); if (quantity != null && quantity.compareTo(BigDecimal.ZERO) > 0) { @@ -621,13 +616,8 @@ public class ShoppingCartHelper { /** Delete an item from the shopping cart. */ public Map<String, Object> deleteFromCart(Map<String, ? extends Object> context) { Map<String, Object> result = null; - Set<String> names = context.keySet(); - Iterator<String> i = names.iterator(); ArrayList<String> errorMsgs = new ArrayList<String>(); - - while (i.hasNext()) { - String o = i.next(); - + for(String o : context.keySet()) { if (o.toUpperCase().startsWith("DELETE")) { try { String indexStr = o.substring(o.lastIndexOf('_') + 1); @@ -662,9 +652,6 @@ public class ShoppingCartHelper { ArrayList<ShoppingCartItem> deleteList = new ArrayList<ShoppingCartItem>(); ArrayList<String> errorMsgs = new ArrayList<String>(); - Set<String> parameterNames = context.keySet(); - Iterator<String> parameterNameIter = parameterNames.iterator(); - BigDecimal oldQuantity = BigDecimal.ONE.negate(); String oldDescription = ""; BigDecimal oldPrice = BigDecimal.ONE.negate(); @@ -677,8 +664,7 @@ public class ShoppingCartHelper { } // TODO: This should be refactored to use UtilHttp.parseMultiFormData(parameters) - while (parameterNameIter.hasNext()) { - String parameterName = parameterNameIter.next(); + for(String parameterName : context.keySet()) { int underscorePos = parameterName.lastIndexOf('_'); if (underscorePos >= 0) { @@ -881,10 +867,7 @@ public class ShoppingCartHelper { } } - Iterator<ShoppingCartItem> di = deleteList.iterator(); - - while (di.hasNext()) { - ShoppingCartItem item = di.next(); + for(ShoppingCartItem item : deleteList) { int itemIndex = this.cart.getItemIndex(item); if (Debug.infoOn()) Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Mar 26 11:08:11 2012 @@ -1181,9 +1181,7 @@ public class ShoppingCartItem implements if (UtilValidate.isNotEmpty(productSurvey) && UtilValidate.isNotEmpty(attributes)) { List<String> surveyResponses = UtilGenerics.checkList(attributes.get("surveyResponses")); if (UtilValidate.isNotEmpty(surveyResponses)) { - Iterator<String> surveyItr = surveyResponses.iterator(); - while (surveyItr.hasNext()) { - String surveyResponseId = surveyItr.next(); + for(String surveyResponseId : surveyResponses) { // TODO: implement multiple survey per product if (UtilValidate.isNotEmpty(surveyResponseId)) { priceContext.put("surveyResponseId", surveyResponseId); @@ -1860,17 +1858,13 @@ public class ShoppingCartItem implements Debug.logError(e, "Unable to get features from product : " + product.get("productId"), module); } if (featureAppls != null) { - Iterator<GenericValue> fai = featureAppls.iterator(); - while (fai.hasNext()) { - GenericValue appl = fai.next(); + for(GenericValue appl : featureAppls) { featureSet.add(appl.getString("productFeatureId")); } } } if (this.additionalProductFeatureAndAppls != null) { - Iterator<GenericValue> aapi = this.additionalProductFeatureAndAppls.values().iterator(); - while (aapi.hasNext()) { - GenericValue appl = aapi.next(); + for(GenericValue appl : this.additionalProductFeatureAndAppls.values()) { featureSet.add(appl.getString("productFeatureId")); } } @@ -2111,9 +2105,7 @@ public class ShoppingCartItem implements public void addAllProductFeatureAndAppls(Map<String, GenericValue> productFeatureAndApplsToAdd) { if (productFeatureAndApplsToAdd == null) return; - Iterator<GenericValue> productFeatureAndApplsToAddIter = productFeatureAndApplsToAdd.values().iterator(); - while (productFeatureAndApplsToAddIter.hasNext()) { - GenericValue additionalProductFeatureAndAppl = productFeatureAndApplsToAddIter.next(); + for (GenericValue additionalProductFeatureAndAppl : productFeatureAndApplsToAdd.values()) { this.putAdditionalProductFeatureAndAppl(additionalProductFeatureAndAppl); } } @@ -2187,9 +2179,7 @@ public class ShoppingCartItem implements Debug.logError(e, "Unable to get features from product : " + product.get("productId"), module); } if (featureAppls != null) { - Iterator<GenericValue> fai = featureAppls.iterator(); - while (fai.hasNext()) { - GenericValue appl = fai.next(); + for(GenericValue appl : featureAppls) { BigDecimal lastQuantity = featureMap.get(appl.getString("productFeatureId")); if (lastQuantity == null) { lastQuantity = BigDecimal.ZERO; @@ -2200,9 +2190,7 @@ public class ShoppingCartItem implements } } if (this.additionalProductFeatureAndAppls != null) { - Iterator<GenericValue> aapi = this.additionalProductFeatureAndAppls.values().iterator(); - while (aapi.hasNext()) { - GenericValue appl = aapi.next(); + for(GenericValue appl : this.additionalProductFeatureAndAppls.values()) { BigDecimal lastQuantity = featureMap.get(appl.getString("productFeatureId")); if (lastQuantity == null) { lastQuantity = BigDecimal.ZERO; @@ -2575,10 +2563,8 @@ public class ShoppingCartItem implements } // add the cloned item(s) to the cart - Iterator<ShoppingCartItem> newItemsItr = newItems.iterator(); - - while (newItemsItr.hasNext()) { - cart.addItem(thisIndex, newItemsItr.next()); + for(ShoppingCartItem sci : newItems) { + cart.addItem(thisIndex, sci); } } } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Mon Mar 26 11:08:11 2012 @@ -904,9 +904,7 @@ public class ShoppingCartServices { // The cart item adjustments, derived from quote item adjustments, are added to the cart if (quoteItems != null) { - Iterator<ShoppingCartItem> i = cart.iterator(); - while (i.hasNext()) { - ShoppingCartItem item = i.next(); + for(ShoppingCartItem item : cart) { String orderItemSeqId = item.getOrderItemSeqId(); if (orderItemSeqId != null) { adjs = orderAdjsMap.get(orderItemSeqId); @@ -1108,10 +1106,8 @@ public class ShoppingCartServices { result.put("displayGrandTotalCurrencyFormatted",org.ofbiz.base.util.UtilFormatOut.formatCurrency(shoppingCart.getDisplayGrandTotal(), isoCode, locale)); BigDecimal orderAdjustmentsTotal = OrderReadHelper.calcOrderAdjustments(OrderReadHelper.getOrderHeaderAdjustments(shoppingCart.getAdjustments(), null), shoppingCart.getSubTotal(), true, true, true); result.put("displayOrderAdjustmentsTotalCurrencyFormatted", org.ofbiz.base.util.UtilFormatOut.formatCurrency(orderAdjustmentsTotal, isoCode, locale)); - Iterator<ShoppingCartItem> i = shoppingCart.iterator(); Map<String, Object> cartItemData = FastMap.newInstance(); - while (i.hasNext()) { - ShoppingCartItem cartLine = i.next(); + for(ShoppingCartItem cartLine : shoppingCart) { int cartLineIndex = shoppingCart.getItemIndex(cartLine); cartItemData.put("displayItemQty_" + cartLineIndex, cartLine.getQuantity()); cartItemData.put("displayItemPrice_" + cartLineIndex, org.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getDisplayPrice(), isoCode, locale)); @@ -1142,9 +1138,7 @@ public class ShoppingCartServices { public static Map<String, Object>resetShipGroupItems(DispatchContext dctx, Map<String, Object> context) { Map<String, Object> result = ServiceUtil.returnSuccess(); ShoppingCart cart = (ShoppingCart) context.get("shoppingCart"); - Iterator<ShoppingCartItem> sciIter = cart.iterator(); - while (sciIter.hasNext()) { - ShoppingCartItem item = sciIter.next(); + for(ShoppingCartItem item : cart) { cart.clearItemShipInfo(item); cart.setItemShipGroupQty(item, item.getQuantity(), 0); } @@ -1166,9 +1160,7 @@ public class ShoppingCartServices { return ServiceUtil.returnError(e.toString()); } Map<String, Object> vendorMap = FastMap.newInstance(); - Iterator<ShoppingCartItem> sciIter = cart.iterator(); - while (sciIter.hasNext()) { - ShoppingCartItem item = sciIter.next(); + for(ShoppingCartItem item : cart) { GenericValue vendorProduct = null; String productId = item.getParentProductId(); if (productId == null) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Mon Mar 26 11:08:11 2012 @@ -81,16 +81,12 @@ public class ProductDisplayWorker { List<GenericValue> productsCategories = delegator.findByAndCache("ProductCategoryMember", UtilMisc.toMap("productId", item.getProductId()), null); productsCategories = EntityUtil.filterByDate(productsCategories, true); if (productsCategories != null) { - Iterator<GenericValue> productsCategoriesIter = productsCategories.iterator(); - while (productsCategoriesIter.hasNext()) { - GenericValue productsCategoryMember = productsCategoriesIter.next(); + for(GenericValue productsCategoryMember : productsCategories) { GenericValue productsCategory = productsCategoryMember.getRelatedOneCache("ProductCategory"); if ("CROSS_SELL_CATEGORY".equals(productsCategory.getString("productCategoryTypeId"))) { List<GenericValue> curPcms = productsCategory.getRelatedCache("ProductCategoryMember"); if (curPcms != null) { - Iterator<GenericValue> curPcmsIter = curPcms.iterator(); - while (curPcmsIter.hasNext()) { - GenericValue curPcm = curPcmsIter.next(); + for(GenericValue curPcm : curPcms) { if (!products.containsKey(curPcm.getString("productId"))) { GenericValue product = curPcm.getRelatedOneCache("Product"); products.put(product.getString("productId"), product); @@ -102,9 +98,7 @@ public class ProductDisplayWorker { } if (UtilValidate.isNotEmpty(complementProducts)) { - Iterator<GenericValue> complIter = complementProducts.iterator(); - while (complIter.hasNext()) { - GenericValue productAssoc = complIter.next(); + for(GenericValue productAssoc : complementProducts) { if (!products.containsKey(productAssoc.getString("productIdTo"))) { GenericValue product = productAssoc.getRelatedOneCache("AssocProduct"); products.put(product.getString("productId"), product); @@ -238,9 +232,7 @@ public class ProductDisplayWorker { // remove all products that are already in the cart ShoppingCart cart = (ShoppingCart) httpRequest.getSession().getAttribute("shoppingCart"); if (UtilValidate.isNotEmpty(cart)) { - Iterator<ShoppingCartItem> cartiter = cart.iterator(); - while (cartiter.hasNext()) { - ShoppingCartItem item = cartiter.next(); + for(ShoppingCartItem item : cart) { String productId = item.getProductId(); products.remove(productId); productQuantities.remove(productId); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Mon Mar 26 11:08:11 2012 @@ -328,9 +328,7 @@ public class ProductPromoWorker { // before sorting split into two lists and sort each list; one list for promos that have a order total condition, and the other list for all promos that don't; then we'll always run the ones that have no condition on the order total first List<Map<Object, Object>> productPromoDiscountMapList = FastList.newInstance(); List<Map<Object, Object>> productPromoDiscountMapListOrderTotal = FastList.newInstance(); - Iterator<GenericValue> productPromoIter = productPromoList.iterator(); - while (productPromoIter.hasNext()) { - GenericValue productPromo = productPromoIter.next(); + for(GenericValue productPromo : productPromoList) { Map<Object, Object> productPromoDiscountMap = UtilGenerics.checkMap(UtilMisc.toMap("productPromo", productPromo, "totalDiscountAmount", cart.getProductPromoUseTotalDiscount(productPromo.getString("productPromoId")))); if (hasOrderTotalCondition(productPromo, delegator)) { productPromoDiscountMapListOrderTotal.add(productPromoDiscountMap); @@ -370,9 +368,7 @@ public class ProductPromoWorker { protected static boolean hasOrderTotalCondition(GenericValue productPromo, Delegator delegator) throws GenericEntityException { boolean hasOtCond = false; List<GenericValue> productPromoConds = delegator.findByAndCache("ProductPromoCond", UtilMisc.toMap("productPromoId", productPromo.get("productPromoId")), UtilMisc.toList("productPromoCondSeqId")); - Iterator<GenericValue> productPromoCondIter = productPromoConds.iterator(); - while (productPromoCondIter.hasNext()) { - GenericValue productPromoCond = productPromoCondIter.next(); + for(GenericValue productPromoCond : productPromoConds) { String inputParamEnumId = productPromoCond.getString("inputParamEnumId"); if ("PPIP_ORDER_TOTAL".equals(inputParamEnumId)) { hasOtCond = true; @@ -405,9 +401,7 @@ public class ProductPromoWorker { break; } - Iterator<GenericValue> productPromoIter = productPromoList.iterator(); - while (productPromoIter.hasNext()) { - GenericValue productPromo = productPromoIter.next(); + for(GenericValue productPromo : productPromoList) { String productPromoId = productPromo.getString("productPromoId"); List<GenericValue> productPromoRules = productPromo.getRelatedCache("ProductPromoRule", null, null); @@ -742,7 +736,7 @@ public class ProductPromoWorker { } protected static boolean runProductPromoRules(ShoppingCart cart, boolean cartChanged, Long useLimit, boolean requireCode, String productPromoCodeId, Long codeUseLimit, long maxUseLimit, - GenericValue productPromo, List<GenericValue> productPromoRules, LocalDispatcher dispatcher, Delegator delegator, Timestamp nowTimestamp) throws GenericEntityException, UseLimitException { + GenericValue productPromo, List<GenericValue> productPromoRules, LocalDispatcher dispatcher, Delegator delegator, Timestamp nowTimestamp) throws GenericEntityException, UseLimitException { String productPromoId = productPromo.getString("productPromoId"); while ((useLimit == null || useLimit.longValue() > cart.getProductPromoUseCount(productPromoId)) && (!requireCode || UtilValidate.isNotEmpty(productPromoCodeId)) && @@ -920,9 +914,7 @@ public class ProductPromoWorker { Set<String> productIds = ProductPromoWorker.getPromoRuleCondProductIds(productPromoCond, delegator, nowTimestamp); List<ShoppingCartItem> lineOrderedByBasePriceList = cart.getLineListOrderedByBasePrice(false); - Iterator<ShoppingCartItem> lineOrderedByBasePriceIter = lineOrderedByBasePriceList.iterator(); - while (lineOrderedByBasePriceIter.hasNext()) { - ShoppingCartItem cartItem = lineOrderedByBasePriceIter.next(); + for(ShoppingCartItem cartItem : lineOrderedByBasePriceList) { // only include if it is in the productId Set for this check and if it is not a Promo (GWP) item GenericValue product = cartItem.getProduct(); String parentProductId = cartItem.getParentProductId(); @@ -1408,9 +1400,7 @@ public class ProductPromoWorker { if ("Y".equals(productPromoAction.get("useCartQuantity"))) { quantity = BigDecimal.ZERO; List<ShoppingCartItem> used = getCartItemsUsed(cart, productPromoAction); - Iterator<ShoppingCartItem> usedIt = used.iterator(); - while (usedIt.hasNext()) { - ShoppingCartItem item = usedIt.next(); + for(ShoppingCartItem item : used) { BigDecimal available = item.getPromoQuantityAvailable(); quantity = quantity.add(available).add(item.getPromoQuantityCandidateUseActionAndAllConds(productPromoAction)); item.addPromoQuantityCandidateUse(available, productPromoAction, false); @@ -1435,9 +1425,7 @@ public class ProductPromoWorker { if ("Y".equals(product.getString("isVirtual"))) { List<GenericValue> productAssocs = EntityUtil.filterByDate(product.getRelatedCache("MainProductAssoc", UtilMisc.toMap("productAssocTypeId", "PRODUCT_VARIANT"), UtilMisc.toList("sequenceNum"))); - Iterator<GenericValue> productAssocIter = productAssocs.iterator(); - while (productAssocIter.hasNext()) { - GenericValue productAssoc = productAssocIter.next(); + for(GenericValue productAssoc : productAssocs) { optionProductIds.add(productAssoc.getString("productIdTo")); } productId = null; @@ -1729,9 +1717,7 @@ public class ProductPromoWorker { Set<String> productIds = ProductPromoWorker.getPromoRuleActionProductIds(productPromoAction, delegator, nowTimestamp); // go through the cart items and for each product that has a specialPromoPrice use that price - Iterator<ShoppingCartItem> cartItemIter = cart.items().iterator(); - while (cartItemIter.hasNext()) { - ShoppingCartItem cartItem = cartItemIter.next(); + for(ShoppingCartItem cartItem : cart.items()) { String itemProductId = cartItem.getProductId(); if (UtilValidate.isEmpty(itemProductId)) { continue; @@ -1797,9 +1783,7 @@ public class ProductPromoWorker { protected static List<ShoppingCartItem> getCartItemsUsed(ShoppingCart cart, GenericValue productPromoAction) { List<ShoppingCartItem> cartItemsUsed = FastList.newInstance(); - Iterator<ShoppingCartItem> cartItemsIter = cart.iterator(); - while (cartItemsIter.hasNext()) { - ShoppingCartItem cartItem = cartItemsIter.next(); + for(ShoppingCartItem cartItem : cart) { BigDecimal quantityUsed = cartItem.getPromoQuantityCandidateUseActionAndAllConds(productPromoAction); if (quantityUsed.compareTo(BigDecimal.ZERO) > 0) { cartItemsUsed.add(cartItem); @@ -1810,9 +1794,7 @@ public class ProductPromoWorker { protected static BigDecimal getCartItemsUsedTotalAmount(ShoppingCart cart, GenericValue productPromoAction) { BigDecimal totalAmount = BigDecimal.ZERO; - Iterator<ShoppingCartItem> cartItemsIter = cart.iterator(); - while (cartItemsIter.hasNext()) { - ShoppingCartItem cartItem = cartItemsIter.next(); + for(ShoppingCartItem cartItem : cart) { BigDecimal quantityUsed = cartItem.getPromoQuantityCandidateUseActionAndAllConds(productPromoAction); if (quantityUsed.compareTo(BigDecimal.ZERO) > 0) { totalAmount = totalAmount.add(quantityUsed.multiply(cartItem.getBasePrice())); @@ -1994,9 +1976,7 @@ public class ProductPromoWorker { List<GenericValue> productPromoProductsAction = FastList.newInstance(); List<GenericValue> productPromoCategoriesAction = FastList.newInstance(); - Iterator<GenericValue> productPromoProductsAllIter = productPromoProductsAll.iterator(); - while (productPromoProductsAllIter.hasNext()) { - GenericValue productPromoProduct = productPromoProductsAllIter.next(); + for(GenericValue productPromoProduct : productPromoProductsAll) { // if the rule id is null then this is a global promo one, so always include if (!"_NA_".equals(productPromoProduct.getString("productPromoCondSeqId")) || "_NA_".equals(productPromoProduct.getString("productPromoRuleId"))) { productPromoProductsCond.add(productPromoProduct); @@ -2005,9 +1985,7 @@ public class ProductPromoWorker { productPromoProductsAction.add(productPromoProduct); } } - Iterator<GenericValue> productPromoCategoriesAllIter = productPromoCategoriesAll.iterator(); - while (productPromoCategoriesAllIter.hasNext()) { - GenericValue productPromoCategory = productPromoCategoriesAllIter.next(); + for(GenericValue productPromoCategory : productPromoCategoriesAll) { if (!"_NA_".equals(productPromoCategory.getString("productPromoCondSeqId")) || "_NA_".equals(productPromoCategory.getString("productPromoRuleId"))) { productPromoCategoriesCond.add(productPromoCategory); } @@ -2054,9 +2032,7 @@ public class ProductPromoWorker { Set<String> productCategoryIds = FastSet.newInstance(); Map<String, List<Set<String>>> productCategoryGroupSetListMap = FastMap.newInstance(); - Iterator<GenericValue> productPromoCategoryIter = productPromoCategories.iterator(); - while (productPromoCategoryIter.hasNext()) { - GenericValue productPromoCategory = productPromoCategoryIter.next(); + for(GenericValue productPromoCategory : productPromoCategories) { if (productPromoApplEnumId.equals(productPromoCategory.getString("productPromoApplEnumId"))) { Set<String> tempCatIdSet = FastSet.newInstance(); if ("Y".equals(productPromoCategory.getString("includeSubCategories"))) { @@ -2104,17 +2080,13 @@ public class ProductPromoWorker { // now handle the productCategoryGroupSetListMap // if a set has more than one category (because of an include sub-cats) then do an or // all lists will have more than category because of the pre-pass that was done, so and them together - Iterator<Map.Entry<String, List<Set<String>>>> pcgslmIter = productCategoryGroupSetListMap.entrySet().iterator(); - while (pcgslmIter.hasNext()) { - Map.Entry<String, List<Set<String>>> entry = pcgslmIter.next(); + for(Map.Entry<String, List<Set<String>>> entry : productCategoryGroupSetListMap.entrySet()) { List<Set<String>> catIdSetList = entry.getValue(); // get all productIds for this catIdSetList List<Set<String>> productIdSetList = FastList.newInstance(); - Iterator<Set<String>> cidslIter = catIdSetList.iterator(); - while (cidslIter.hasNext()) { + for(Set<String> catIdSet : catIdSetList) { // make a Set of productIds including all ids from all categories - Set<String> catIdSet = cidslIter.next(); Set<String> groupProductIdSet = FastSet.newInstance(); getAllProductIds(catIdSet, groupProductIdSet, delegator, nowTimestamp, true); productIdSetList.add(groupProductIdSet); @@ -2123,9 +2095,7 @@ public class ProductPromoWorker { // now go through all productId sets and only include IDs that are in all sets // by definition if each id must be in all categories, then it must be in the first, so go through the first and drop each one that is not in all others Set<String> firstProductIdSet = productIdSetList.remove(0); - Iterator<Set<String>> productIdSetIter = productIdSetList.iterator(); - while (productIdSetIter.hasNext()) { - Set<String> productIdSet = productIdSetIter.next(); + for(Set<String> productIdSet : productIdSetList) { firstProductIdSet.retainAll(productIdSet); } @@ -2161,15 +2131,11 @@ public class ProductPromoWorker { } protected static void getAllProductIds(Set<String> productCategoryIdSet, Set<String> productIdSet, Delegator delegator, Timestamp nowTimestamp, boolean include) throws GenericEntityException { - Iterator<String> productCategoryIdIter = productCategoryIdSet.iterator(); - while (productCategoryIdIter.hasNext()) { - String productCategoryId = productCategoryIdIter.next(); + for(String productCategoryId : productCategoryIdSet) { // get all product category memebers, filter by date List<GenericValue> productCategoryMembers = delegator.findByAndCache("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId)); productCategoryMembers = EntityUtil.filterByDate(productCategoryMembers, nowTimestamp); - Iterator<GenericValue> productCategoryMemberIter = productCategoryMembers.iterator(); - while (productCategoryMemberIter.hasNext()) { - GenericValue productCategoryMember = productCategoryMemberIter.next(); + for(GenericValue productCategoryMember : productCategoryMembers) { String productId = productCategoryMember.getString("productId"); if (include) { productIdSet.add(productId); @@ -2182,9 +2148,7 @@ public class ProductPromoWorker { protected static void handleProductPromoProducts(Set<String> productIds, List<GenericValue> productPromoProducts, String productPromoApplEnumId) throws GenericEntityException { boolean include = !"PPPA_EXCLUDE".equals(productPromoApplEnumId); - Iterator<GenericValue> productPromoProductIter = productPromoProducts.iterator(); - while (productPromoProductIter.hasNext()) { - GenericValue productPromoProduct = productPromoProductIter.next(); + for(GenericValue productPromoProduct : productPromoProducts) { if (productPromoApplEnumId.equals(productPromoProduct.getString("productPromoApplEnumId"))) { String productId = productPromoProduct.getString("productId"); if (include) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=1305309&r1=1305308&r2=1305309&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java Mon Mar 26 11:08:11 2012 @@ -20,7 +20,6 @@ package org.ofbiz.order.shoppinglist; import java.math.BigDecimal; import java.sql.Timestamp; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -228,9 +227,7 @@ public class ShoppingListEvents { // include all items of child lists if flagged to do so if (includeChild) { List<GenericValue> childShoppingLists = shoppingList.getRelated("ChildShoppingList"); - Iterator<GenericValue> ci = childShoppingLists.iterator(); - while (ci.hasNext()) { - GenericValue v = ci.next(); + for(GenericValue v : childShoppingLists) { List<GenericValue> items = v.getRelated("ShoppingListItem"); shoppingListItems.addAll(items); } @@ -260,9 +257,7 @@ public class ShoppingListEvents { // add the items StringBuilder eventMessage = new StringBuilder(); - Iterator<GenericValue> i = shoppingListItems.iterator(); - while (i.hasNext()) { - GenericValue shoppingListItem = i.next(); + for(GenericValue shoppingListItem : shoppingListItems) { String productId = shoppingListItem.getString("productId"); BigDecimal quantity = shoppingListItem.getBigDecimal("quantity"); Timestamp reservStart = shoppingListItem.getTimestamp("reservStart"); @@ -556,10 +551,8 @@ public class ShoppingListEvents { */ public static int makeListItemSurveyResp(Delegator delegator, GenericValue item, List<String> surveyResps) throws GenericEntityException { if (UtilValidate.isNotEmpty(surveyResps)) { - Iterator<String> i = surveyResps.iterator(); int count = 0; - while (i.hasNext()) { - String responseId = i.next(); + for(String responseId : surveyResps) { GenericValue listResp = delegator.makeValue("ShoppingListItemSurvey"); listResp.set("shoppingListId", item.getString("shoppingListId")); listResp.set("shoppingListItemSeqId", item.getString("shoppingListItemSeqId")); @@ -578,9 +571,7 @@ public class ShoppingListEvents { public static Map<String, List<String>> getItemSurveyInfos(List<GenericValue> items) { Map<String, List<String>> surveyInfos = FastMap.newInstance(); if (UtilValidate.isNotEmpty(items)) { - Iterator<GenericValue> itemIt = items.iterator(); - while (itemIt.hasNext()) { - GenericValue item = itemIt.next(); + for(GenericValue item : items) { String listId = item.getString("shoppingListId"); String itemId = item.getString("shoppingListItemSeqId"); surveyInfos.put(listId + "." + itemId, getItemSurveyInfo(item)); @@ -603,9 +594,7 @@ public class ShoppingListEvents { } if (UtilValidate.isNotEmpty(surveyResp)) { - Iterator<GenericValue> respIt = surveyResp.iterator(); - while (respIt.hasNext()) { - GenericValue resp = respIt.next(); + for(GenericValue resp : surveyResp) { responseIds.add(resp.getString("surveyResponseId")); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |