You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/01/24 22:55:35 UTC
svn commit: r737444 - in /ofbiz/branches/release4.0: ./
applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Author: jleroux
Date: Sat Jan 24 21:55:35 2009
New Revision: 737444
URL: http://svn.apache.org/viewvc?rev=737444&view=rev
Log:
Applied fix from trunk for revision: 737443
Modified:
ofbiz/branches/release4.0/ (props changed)
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 24 21:55:35 2009
@@ -1 +1 @@
-/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935
+/ofbiz/trunk:539836-539837,618970,627900,629279,674173,676162,676227,676246,679704,690644,705862,706035,706055,706067,706692,721839,721887,728935,737443
Modified: ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=737444&r1=737443&r2=737444&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sat Jan 24 21:55:35 2009
@@ -106,7 +106,7 @@
private Map itemGroupByNumberMap = FastMap.newInstance();
protected long nextGroupNumber = 1;
private List paymentInfo = FastList.newInstance();
- private List shipInfo = FastList.newInstance();
+ private List<CartShipInfo> shipInfo = FastList.<CartShipInfo> newInstance();
private Map contactMechIdsMap = new HashMap();
private Map orderAttributes = new HashMap();
private Map attributes = new HashMap(); // user defined attributes
@@ -2019,8 +2019,7 @@
}
protected void cleanUpShipGroups() {
- for (int i = 0; i < this.shipInfo.size(); i++) {
- CartShipInfo csi = this.getShipInfo(i);
+ for (CartShipInfo csi : this.shipInfo) {
Iterator si = csi.shipItemInfo.keySet().iterator();
while (si.hasNext()) {
ShoppingCartItem item = (ShoppingCartItem) si.next();