svn commit: r1672752 [7/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [7/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Fri Apr 10 20:22:54 2015 @@ -23,18 +23,16 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilFormatOut; @@ -192,7 +190,7 @@ public class OrderReadHelper { Debug.logError(e, module); } if (adjustments == null) - adjustments = FastList.newInstance(); + adjustments = new LinkedList<GenericValue>(); } return adjustments; } @@ -213,10 +211,10 @@ public class OrderReadHelper { * @return returns a Map of paymentMethodId -> amount charged (BigDecimal) based on PaymentGatewayResponse. */ public Map<String, BigDecimal> getReceivedPaymentTotalsByPaymentMethod() { - Map<String, BigDecimal> paymentMethodAmounts = FastMap.newInstance(); + Map<String, BigDecimal> paymentMethodAmounts = new HashMap<String, BigDecimal>(); List<GenericValue> paymentPrefs = getPaymentPreferences(); for (GenericValue paymentPref : paymentPrefs) { - List<GenericValue> payments = FastList.newInstance(); + List<GenericValue> payments = new LinkedList<GenericValue>(); try { List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_RECEIVED"), EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "PMNT_CONFIRMED")); @@ -258,10 +256,10 @@ public class OrderReadHelper { * @return returns a Map of paymentMethodId -> amount refunded */ public Map<String, BigDecimal> getReturnedTotalsByPaymentMethod() { - Map<String, BigDecimal> paymentMethodAmounts = FastMap.newInstance(); + Map<String, BigDecimal> paymentMethodAmounts = new HashMap<String, BigDecimal>(); List<GenericValue> paymentPrefs = getPaymentPreferences(); for (GenericValue paymentPref : paymentPrefs) { - List<GenericValue> returnItemResponses = FastList.newInstance(); + List<GenericValue> returnItemResponses = new LinkedList<GenericValue>(); try { returnItemResponses = orderHeader.getDelegator().findByAnd("ReturnItemResponse", UtilMisc.toMap("orderPaymentPreferenceId", paymentPref.getString("orderPaymentPreferenceId")), null, false); } catch (GenericEntityException e) { @@ -286,7 +284,7 @@ public class OrderReadHelper { } public List<GenericValue> getOrderPayments(GenericValue orderPaymentPreference) { - List<GenericValue> orderPayments = FastList.newInstance(); + List<GenericValue> orderPayments = new LinkedList<GenericValue>(); List<GenericValue> prefs = null; if (orderPaymentPreference == null) { @@ -428,7 +426,7 @@ public class OrderReadHelper { } public List<GenericValue> getShippingLocations() { - List<GenericValue> shippingLocations = FastList.newInstance(); + List<GenericValue> shippingLocations = new LinkedList<GenericValue>(); List<GenericValue> shippingCms = this.getOrderContactMechs("SHIPPING_LOCATION"); if (shippingCms != null) { for (GenericValue ocm : shippingCms) { @@ -483,7 +481,7 @@ public class OrderReadHelper { } public List<GenericValue> getBillingLocations() { - List<GenericValue> billingLocations = FastList.newInstance(); + List<GenericValue> billingLocations = new LinkedList<GenericValue>(); List<GenericValue> billingCms = this.getOrderContactMechs("BILLING_LOCATION"); if (billingCms != null) { for (GenericValue ocm : billingCms) { @@ -817,7 +815,7 @@ public class OrderReadHelper { } public Map<String, BigDecimal> getFeatureIdQtyMap(String shipGroupSeqId) { - Map<String, BigDecimal> featureMap = FastMap.newInstance(); + Map<String, BigDecimal> featureMap = new HashMap<String, BigDecimal>(); List<GenericValue> validItems = getValidOrderItems(shipGroupSeqId); if (validItems != null) { for (GenericValue item : validItems) { @@ -1020,7 +1018,7 @@ public class OrderReadHelper { } public List<BigDecimal> getShippableSizes() { - List<BigDecimal> shippableSizes = FastList.newInstance(); + List<BigDecimal> shippableSizes = new LinkedList<BigDecimal>(); List<GenericValue> validItems = getValidOrderItems(); if (validItems != null) { @@ -1190,7 +1188,7 @@ public class OrderReadHelper { } public List<Map<String, Object>> getShippableItemInfo(String shipGroupSeqId) { - List<Map<String, Object>> shippableInfo = FastList.newInstance(); + List<Map<String, Object>> shippableInfo = new LinkedList<Map<String,Object>>(); List<GenericValue> validItems = getValidOrderItems(shipGroupSeqId); if (validItems != null) { @@ -1203,7 +1201,7 @@ public class OrderReadHelper { } public Map<String, Object> getItemInfoMap(GenericValue item) { - Map<String, Object> itemInfo = FastMap.newInstance(); + Map<String, Object> itemInfo = new HashMap<String, Object>(); itemInfo.put("productId", item.getString("productId")); itemInfo.put("quantity", getOrderItemQuantity(item)); itemInfo.put("weight", this.getItemWeight(item)); @@ -1470,7 +1468,7 @@ public class OrderReadHelper { } public List<GenericValue> getValidDigitalItems() { - List<GenericValue> digitalItems = FastList.newInstance(); + List<GenericValue> digitalItems = new LinkedList<GenericValue>(); // only approved or complete items apply List<EntityExpr> exprs = UtilMisc.toList( EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "ITEM_APPROVED"), @@ -1652,7 +1650,7 @@ public class OrderReadHelper { /** Get a set of productIds in the order. */ public Collection<String> getOrderProductIds() { - Set<String> productIds = FastSet.newInstance(); + Set<String> productIds = new HashSet<String>(); for (GenericValue orderItem : getOrderItems()) { if (orderItem.get("productId") != null) { productIds.add(orderItem.getString("productId")); @@ -1685,7 +1683,7 @@ public class OrderReadHelper { List<GenericValue> returnItems = getOrderReturnItems(); // since we don't have a handy grouped view entity, we'll have to group the return items by hand - Map<String, BigDecimal> returnMap = FastMap.newInstance(); + Map<String, BigDecimal> returnMap = new HashMap<String, BigDecimal>(); for (GenericValue orderItem : this.getValidOrderItems()) { List<GenericValue> group = EntityUtil.filterByAnd(returnItems, UtilMisc.toList( EntityCondition.makeCondition("orderId", orderItem.get("orderId")), @@ -1762,7 +1760,7 @@ public class OrderReadHelper { } BigDecimal returnedAmount = ZERO; String orderId = orderHeader.getString("orderId"); - List<String> returnHeaderList = FastList.newInstance(); + List<String> returnHeaderList = new LinkedList<String>(); for (GenericValue returnedItem : returnedItems) { if ((returnedItem.get("returnPrice") != null) && (returnedItem.get("returnQuantity") != null)) { returnedAmount = returnedAmount.add(returnedItem.getBigDecimal("returnPrice").multiply(returnedItem.getBigDecimal("returnQuantity")).setScale(scale, rounding)); @@ -1816,7 +1814,7 @@ public class OrderReadHelper { returnedItems.addAll(EntityUtil.filterByAnd(returnedItemsBase, UtilMisc.toMap("statusId", "RETURN_RECEIVED"))); returnedItems.addAll(EntityUtil.filterByAnd(returnedItemsBase, UtilMisc.toMap("statusId", "RETURN_COMPLETED"))); - Map<String, BigDecimal> itemReturnedQuantities = FastMap.newInstance(); + Map<String, BigDecimal> itemReturnedQuantities = new HashMap<String, BigDecimal>(); for (GenericValue returnedItem : returnedItems) { String orderItemSeqId = returnedItem.getString("orderItemSeqId"); BigDecimal returnedQuantity = returnedItem.getBigDecimal("returnQuantity"); @@ -2175,7 +2173,7 @@ public class OrderReadHelper { public Set<String> getProductPromoCodesEntered() { Delegator delegator = orderHeader.getDelegator(); - Set<String> productPromoCodesEntered = FastSet.newInstance(); + Set<String> productPromoCodesEntered = new HashSet<String>(); try { for (GenericValue orderProductPromoCode: EntityQuery.use(delegator).from("OrderProductPromoCode").where("orderId", orderHeader.get("orderId")).cache().queryList()) { productPromoCodesEntered.add(orderProductPromoCode.getString("productPromoCodeId")); @@ -2193,7 +2191,7 @@ public class OrderReadHelper { } catch (GenericEntityException e) { Debug.logError(e, module); } - return FastList.newInstance(); + return new LinkedList<GenericValue>(); } /** @@ -2290,12 +2288,12 @@ public class OrderReadHelper { List<EntityExpr> contraints1 = UtilMisc.toList(EntityCondition.makeCondition("orderItemSeqId", EntityOperator.EQUALS, null)); List<EntityExpr> contraints2 = UtilMisc.toList(EntityCondition.makeCondition("orderItemSeqId", EntityOperator.EQUALS, DataModelConstants.SEQ_ID_NA)); List<EntityExpr> contraints3 = UtilMisc.toList(EntityCondition.makeCondition("orderItemSeqId", EntityOperator.EQUALS, "")); - List<EntityExpr> contraints4 = FastList.newInstance(); + List<EntityExpr> contraints4 = new LinkedList<EntityExpr>(); if (shipGroupSeqId != null) { contraints4.add(EntityCondition.makeCondition("shipGroupSeqId", EntityOperator.EQUALS, shipGroupSeqId)); } List<GenericValue> toFilter = null; - List<GenericValue> adj = FastList.newInstance(); + List<GenericValue> adj = new LinkedList<GenericValue>(); if (shipGroupSeqId != null) { toFilter = EntityUtil.filterByAnd(adjustments, contraints4); @@ -2318,7 +2316,7 @@ public class OrderReadHelper { contraints2.add(EntityCondition.makeCondition("orderPaymentPreferenceId", EntityOperator.EQUALS, DataModelConstants.SEQ_ID_NA)); contraints2.add(EntityCondition.makeCondition("orderPaymentPreferenceId", EntityOperator.EQUALS, "")); - List<GenericValue> newOrderStatuses = FastList.newInstance(); + List<GenericValue> newOrderStatuses = new LinkedList<GenericValue>(); newOrderStatuses.addAll(EntityUtil.filterByOr(orderStatuses, contraints1)); return EntityUtil.orderBy(EntityUtil.filterByOr(newOrderStatuses, contraints2), UtilMisc.toList("-statusDatetime")); } @@ -2338,7 +2336,7 @@ public class OrderReadHelper { } if (responses == null) { - responses = FastList.newInstance(); + responses = new LinkedList<GenericValue>(); } return responses; } @@ -2355,7 +2353,7 @@ public class OrderReadHelper { } if (responses == null) { - responses = FastList.newInstance(); + responses = new LinkedList<GenericValue>(); } return responses; } @@ -2572,7 +2570,7 @@ public class OrderReadHelper { contraints2.add(EntityCondition.makeCondition("orderPaymentPreferenceId", EntityOperator.EQUALS, DataModelConstants.SEQ_ID_NA)); contraints2.add(EntityCondition.makeCondition("orderPaymentPreferenceId", EntityOperator.EQUALS, "")); - List<GenericValue> newOrderStatuses = FastList.newInstance(); + List<GenericValue> newOrderStatuses = new LinkedList<GenericValue>(); newOrderStatuses.addAll(EntityUtil.filterByAnd(orderStatuses, contraints1)); return EntityUtil.orderBy(EntityUtil.filterByOr(newOrderStatuses, contraints2), UtilMisc.toList("-statusDatetime")); } @@ -2631,7 +2629,7 @@ public class OrderReadHelper { } public static List<GenericValue> filterOrderAdjustments(List<GenericValue> adjustments, boolean includeOther, boolean includeTax, boolean includeShipping, boolean forTax, boolean forShipping) { - List<GenericValue> newOrderAdjustmentsList = FastList.newInstance(); + List<GenericValue> newOrderAdjustmentsList = new LinkedList<GenericValue>(); if (UtilValidate.isNotEmpty(adjustments)) { for (GenericValue orderAdjustment : adjustments) { @@ -2734,7 +2732,7 @@ public class OrderReadHelper { */ public List<GenericValue> getAvailableOrderHeaderAdjustments() { List<GenericValue> orderHeaderAdjustments = this.getOrderHeaderAdjustments(); - List<GenericValue> filteredAdjustments = FastList.newInstance(); + List<GenericValue> filteredAdjustments = new LinkedList<GenericValue>(); if (orderHeaderAdjustments != null) { for (GenericValue orderAdjustment : orderHeaderAdjustments) { long count = 0; @@ -2807,7 +2805,7 @@ public class OrderReadHelper { contraints1.add(EntityCondition.makeCondition("orderItemSeqId", EntityOperator.EQUALS, "")); List<EntityExpr> contraints2 = UtilMisc.toList(EntityCondition.makeCondition("orderPaymentPreferenceId", EntityOperator.NOT_EQUAL, null)); - List<GenericValue> newOrderStatuses = FastList.newInstance(); + List<GenericValue> newOrderStatuses = new LinkedList<GenericValue>(); newOrderStatuses.addAll(EntityUtil.filterByOr(orderStatuses, contraints1)); return EntityUtil.orderBy(EntityUtil.filterByAnd(newOrderStatuses, contraints2), UtilMisc.toList("-statusDatetime")); @@ -2845,7 +2843,7 @@ public class OrderReadHelper { public static Map<String, Object> getOrderTaxByTaxAuthGeoAndParty(List<GenericValue> orderAdjustments) { BigDecimal taxGrandTotal = BigDecimal.ZERO; - List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = FastList.newInstance(); + List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = new LinkedList<Map<String,Object>>(); if (UtilValidate.isNotEmpty(orderAdjustments)) { // get orderAdjustment where orderAdjustmentTypeId is SALES_TAX. orderAdjustments = EntityUtil.filterByAnd(orderAdjustments, UtilMisc.toMap("orderAdjustmentTypeId", "SALES_TAX")); @@ -2856,7 +2854,7 @@ public class OrderReadHelper { List<String> distinctTaxAuthPartyIdList = EntityUtil.getFieldListFromEntityList(orderAdjustments, "taxAuthPartyId", true); // Keep a list of amount that have been added to make sure none are missed (if taxAuth* information is missing) - List<GenericValue> processedAdjustments = FastList.newInstance(); + List<GenericValue> processedAdjustments = new LinkedList<GenericValue>(); // For each taxAuthGeoId get and add amount from orderAdjustment for (String taxAuthGeoId : distinctTaxAuthGeoIdList) { for (String taxAuthPartyId : distinctTaxAuthPartyIdList) { @@ -2880,7 +2878,7 @@ public class OrderReadHelper { } } // Process any adjustments that got missed - List<GenericValue> missedAdjustments = FastList.newInstance(); + List<GenericValue> missedAdjustments = new LinkedList<GenericValue>(); missedAdjustments.addAll(orderAdjustments); missedAdjustments.removeAll(processedAdjustments); for (GenericValue orderAdjustment : missedAdjustments) { @@ -2888,7 +2886,7 @@ public class OrderReadHelper { } taxGrandTotal = taxGrandTotal.setScale(taxFinalScale, taxRounding); } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put("taxByTaxAuthGeoAndPartyList", taxByTaxAuthGeoAndPartyList); result.put("taxGrandTotal", taxGrandTotal); return result; @@ -2900,8 +2898,8 @@ public class OrderReadHelper { public static Map<String, Object> getOrderTaxByTaxAuthGeoAndPartyForDisplay(List<GenericValue> orderAdjustmentsOriginal) { BigDecimal taxGrandTotal = BigDecimal.ZERO; - List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = FastList.newInstance(); - List<GenericValue> orderAdjustmentsToUse = FastList.newInstance(); + List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = new LinkedList<Map<String,Object>>(); + List<GenericValue> orderAdjustmentsToUse = new LinkedList<GenericValue>(); if (UtilValidate.isNotEmpty(orderAdjustmentsOriginal)) { // get orderAdjustment where orderAdjustmentTypeId is SALES_TAX. orderAdjustmentsToUse.addAll(EntityUtil.filterByAnd(orderAdjustmentsOriginal, UtilMisc.toMap("orderAdjustmentTypeId", "SALES_TAX"))); @@ -2913,7 +2911,7 @@ public class OrderReadHelper { List<String> distinctTaxAuthPartyIdList = EntityUtil.getFieldListFromEntityList(orderAdjustmentsToUse, "taxAuthPartyId", true); // Keep a list of amount that have been added to make sure none are missed (if taxAuth* information is missing) - List<GenericValue> processedAdjustments = FastList.newInstance(); + List<GenericValue> processedAdjustments = new LinkedList<GenericValue>(); // For each taxAuthGeoId get and add amount from orderAdjustment for (String taxAuthGeoId : distinctTaxAuthGeoIdList) { for (String taxAuthPartyId : distinctTaxAuthPartyIdList) { @@ -2942,7 +2940,7 @@ public class OrderReadHelper { } } // Process any adjustments that got missed - List<GenericValue> missedAdjustments = FastList.newInstance(); + List<GenericValue> missedAdjustments = new LinkedList<GenericValue>(); missedAdjustments.addAll(orderAdjustmentsToUse); missedAdjustments.removeAll(processedAdjustments); for (GenericValue orderAdjustment : missedAdjustments) { @@ -2950,7 +2948,7 @@ public class OrderReadHelper { } taxGrandTotal = taxGrandTotal.setScale(taxFinalScale, taxRounding); } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put("taxByTaxAuthGeoAndPartyList", taxByTaxAuthGeoAndPartyList); result.put("taxGrandTotal", taxGrandTotal); return result; Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Fri Apr 10 20:22:54 2015 @@ -22,16 +22,15 @@ package org.ofbiz.order.order; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.base.util.UtilDateTime; @@ -210,7 +209,7 @@ public class OrderReturnServices { // get the return items List<GenericValue> returnItems = null; - List<GenericValue> returnAdjustments = FastList.newInstance(); + List<GenericValue> returnAdjustments = new LinkedList<GenericValue>(); try { returnItems = returnHeader.getRelated("ReturnItem", null, null, false); returnAdjustments = EntityQuery.use(delegator).from("ReturnAdjustment") @@ -247,7 +246,7 @@ public class OrderReturnServices { // get the email setting and send the mail if (UtilValidate.isNotEmpty(productStoreId)) { - Map<String, Object> sendMap = FastMap.newInstance(); + Map<String, Object> sendMap = new HashMap<String, Object>(); GenericValue productStoreEmail = null; try { @@ -539,7 +538,7 @@ public class OrderReturnServices { if (((BigDecimal) serviceResult.get("returnableQuantity")).compareTo(BigDecimal.ZERO) == 0) { continue; } - Map<String, Object> returnInfo = FastMap.newInstance(); + Map<String, Object> returnInfo = new HashMap<String, Object>(); // first the return info (quantity/price) returnInfo.put("returnableQuantity", serviceResult.get("returnableQuantity")); returnInfo.put("returnablePrice", serviceResult.get("returnablePrice")); @@ -576,7 +575,7 @@ public class OrderReturnServices { } if (UtilValidate.isNotEmpty(itemAdjustments)) { for (GenericValue itemAdjustment : itemAdjustments) { - returnInfo = FastMap.newInstance(); + returnInfo = new HashMap<String, Object>(); returnInfo.put("returnableQuantity", BigDecimal.ONE); // TODO: the returnablePrice should be set to the amount minus the already returned amount returnInfo.put("returnablePrice", itemAdjustment.get("amount")); @@ -630,7 +629,7 @@ public class OrderReturnServices { } } - List<GenericValue> completedItems = FastList.newInstance(); + List<GenericValue> completedItems = new LinkedList<GenericValue>(); if (returnHeader != null && UtilValidate.isNotEmpty(returnItems)) { for (GenericValue item : returnItems) { String itemStatus = item != null ? item.getString("statusId") : null; @@ -768,7 +767,7 @@ public class OrderReturnServices { if (finAccountId == null && billingAccountId == null) { // First find a Billing Account with negative balance, and if found store credit to that - List<GenericValue> billingAccounts = FastList.newInstance(); + List<GenericValue> billingAccounts = new LinkedList<GenericValue>(); try { billingAccounts = EntityQuery.use(delegator).from("BillingAccountRoleAndAddress") .where("partyId", fromPartyId, "roleTypeId", "BILL_TO_CUSTOMER") @@ -833,7 +832,7 @@ public class OrderReturnServices { } if (finAccountId == null) { - Map<String, Object> createAccountCtx = FastMap.newInstance(); + Map<String, Object> createAccountCtx = new HashMap<String, Object>(); createAccountCtx.put("ownerPartyId", fromPartyId); createAccountCtx.put("finAccountTypeId", "STORE_CREDIT_ACCT"); createAccountCtx.put("productStoreId", productStore.getString("productStoreId")); @@ -1089,10 +1088,10 @@ public class OrderReturnServices { Locale locale = (Locale) context.get("locale"); GenericValue userLogin = (GenericValue) context.get("userLogin"); String orderId = (String) context.get("orderId"); - Map<String, Object> serviceResult = FastMap.newInstance(); + Map<String, Object> serviceResult = new HashMap<String, Object>(); GenericValue orderHeader = null; - List<GenericValue> orderPayPrefs = FastList.newInstance(); + List<GenericValue> orderPayPrefs = new LinkedList<GenericValue>(); try { orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne(); orderPayPrefs = orderHeader.getRelated("OrderPaymentPreference", null, UtilMisc.toList("-maxAmount"), false); @@ -1104,7 +1103,7 @@ public class OrderReturnServices { // Check for replacement order if (UtilValidate.isEmpty(orderPayPrefs)) { - List<GenericValue> returnItemResponses = FastList.newInstance(); + List<GenericValue> returnItemResponses = new LinkedList<GenericValue>(); try { returnItemResponses = orderHeader.getRelated("ReplacementReturnItemResponse", null, null, false); } catch (GenericEntityException e) { @@ -1167,8 +1166,8 @@ public class OrderReturnServices { BigDecimal adjustments = getReturnAdjustmentTotal(delegator, UtilMisc.toMap("returnId", returnId, "returnTypeId", returnTypeId)); if (returnHeader != null && (UtilValidate.isNotEmpty(returnItems) || adjustments.compareTo(ZERO) > 0)) { - Map<String, List<GenericValue>> itemsByOrder = FastMap.newInstance(); - Map<String, BigDecimal> totalByOrder = FastMap.newInstance(); + Map<String, List<GenericValue>> itemsByOrder = new HashMap<String, List<GenericValue>>(); + Map<String, BigDecimal> totalByOrder = new HashMap<String, BigDecimal>(); // make sure total refunds on a return don't exceed amount of returned orders Map<String, Object> serviceResult = null; @@ -1265,7 +1264,7 @@ public class OrderReturnServices { * Then group these refund amounts and orderPaymentPreferences by paymentMethodTypeId. That is, * the intent is to get the refundable amounts per orderPaymentPreference, grouped by payment method type. */ - Map<String, List<Map<String, Object>>> prefSplitMap = FastMap.newInstance(); + Map<String, List<Map<String, Object>>> prefSplitMap = new HashMap<String, List<Map<String,Object>>>(); for (GenericValue orderPayPref : orderPayPrefs) { String paymentMethodTypeId = orderPayPref.getString("paymentMethodTypeId"); String orderPayPrefKey = orderPayPref.getString("paymentMethodId") != null ? orderPayPref.getString("paymentMethodId") : orderPayPref.getString("paymentMethodTypeId"); @@ -1287,7 +1286,7 @@ public class OrderReturnServices { // add the refundable amount and orderPaymentPreference to the paymentMethodTypeId map if (orderPayPrefAvailableTotal.compareTo(ZERO) > 0) { - Map<String, Object> orderPayPrefDetails = FastMap.newInstance(); + Map<String, Object> orderPayPrefDetails = new HashMap<String, Object>(); orderPayPrefDetails.put("orderPaymentPreference", orderPayPref); orderPayPrefDetails.put("availableTotal", orderPayPrefAvailableTotal); if (prefSplitMap.containsKey(paymentMethodTypeId)) { @@ -1312,7 +1311,7 @@ public class OrderReturnServices { } } // This defines the ordered part of the sequence of refund processing - List<String> orderedRefundPaymentMethodTypes = FastList.newInstance(); + List<String> orderedRefundPaymentMethodTypes = new LinkedList<String>(); orderedRefundPaymentMethodTypes.add("EXT_BILLACT"); orderedRefundPaymentMethodTypes.add("FIN_ACCOUNT"); orderedRefundPaymentMethodTypes.add("GIFT_CARD"); @@ -1320,7 +1319,7 @@ public class OrderReturnServices { orderedRefundPaymentMethodTypes.add("EFT_ACCOUNT"); // Add all the other paymentMethodTypes, in no particular order - List<GenericValue> otherPaymentMethodTypes = FastList.newInstance(); + List<GenericValue> otherPaymentMethodTypes = new LinkedList<GenericValue>(); try { otherPaymentMethodTypes = EntityQuery.use(delegator).from("PaymentMethodType") .where(EntityCondition.makeCondition("paymentMethodTypeId", EntityOperator.NOT_IN, orderedRefundPaymentMethodTypes)) @@ -1425,7 +1424,7 @@ public class OrderReturnServices { } // Fill out the data for the new ReturnItemResponse - Map<String, Object> response = FastMap.newInstance(); + Map<String, Object> response = new HashMap<String, Object>(); if (UtilValidate.isNotEmpty(refundOrderPaymentPreference)) { response.put("orderPaymentPreferenceId", refundOrderPaymentPreference.getString("orderPaymentPreferenceId")); } else { @@ -1611,7 +1610,7 @@ public class OrderReturnServices { String paymentId = response.getString("paymentId"); // for each return item in the response, get the list of return item billings and then a list of invoices - Map<String, GenericValue> returnInvoices = FastMap.newInstance(); // key is invoiceId, value is Invoice GenericValue + Map<String, GenericValue> returnInvoices = new HashMap<String, GenericValue>(); // key is invoiceId, value is Invoice GenericValue List<GenericValue> items = response.getRelated("ReturnItem", null, null, false); for (GenericValue item : items) { List<GenericValue> billings = item.getRelated("ReturnItemBilling", null, null, false); @@ -1626,7 +1625,7 @@ public class OrderReturnServices { } // for each return invoice found, sum up the related billings - Map<String, BigDecimal> invoiceTotals = FastMap.newInstance(); // key is invoiceId, value is the sum of all billings for that invoice + Map<String, BigDecimal> invoiceTotals = new HashMap<String, BigDecimal>(); // key is invoiceId, value is the sum of all billings for that invoice BigDecimal grandTotal = ZERO; // The sum of all return invoice totals for (GenericValue invoice : returnInvoices.values()) { List<GenericValue> billings = invoice.getRelated("ReturnItemBilling", null, null, false); @@ -1697,10 +1696,10 @@ public class OrderReturnServices { "OrderErrorGettingReturnHeaderItemInformation", locale)); } String returnHeaderTypeId = returnHeader.getString("returnHeaderTypeId"); - List<String> createdOrderIds = FastList.newInstance(); + List<String> createdOrderIds = new LinkedList<String>(); if (returnHeader != null && UtilValidate.isNotEmpty(returnItems)) { - Map<String, List<GenericValue>> returnItemsByOrderId = FastMap.newInstance(); - Map<String, BigDecimal> totalByOrder = FastMap.newInstance(); + Map<String, List<GenericValue>> returnItemsByOrderId = new HashMap<String, List<GenericValue>>(); + Map<String, BigDecimal> totalByOrder = new HashMap<String, BigDecimal>(); groupReturnItemsByOrder(returnItems, returnItemsByOrderId, totalByOrder, delegator, returnId, returnTypeId); // process each one by order @@ -1745,7 +1744,7 @@ public class OrderReturnServices { orderMap.put("grandTotal", BigDecimal.ZERO); // make the contact mechs - List<GenericValue> contactMechs = FastList.newInstance(); + List<GenericValue> contactMechs = new LinkedList<GenericValue>(); List<GenericValue> orderCm = null; try { orderCm = orderHeader.getRelated("OrderContactMech", null, null, false); @@ -1782,10 +1781,10 @@ public class OrderReturnServices { // make the order items BigDecimal orderPriceTotal = BigDecimal.ZERO; BigDecimal additionalItemTotal = BigDecimal.ZERO; - List<GenericValue> orderItems = FastList.newInstance(); - List<GenericValue> orderItemShipGroupInfo = FastList.newInstance(); - List<String> orderItemShipGroupIds = FastList.newInstance(); // this is used to store the ship group ids of the groups already added to the orderItemShipGroupInfo list - List<GenericValue> orderItemAssocs = FastList.newInstance(); + List<GenericValue> orderItems = new LinkedList<GenericValue>(); + List<GenericValue> orderItemShipGroupInfo = new LinkedList<GenericValue>(); + List<String> orderItemShipGroupIds = new LinkedList<String>(); // this is used to store the ship group ids of the groups already added to the orderItemShipGroupInfo list + List<GenericValue> orderItemAssocs = new LinkedList<GenericValue>(); if (returnItemList != null) { int itemCount = 1; for (GenericValue returnItem : returnItemList) { @@ -1916,7 +1915,7 @@ public class OrderReturnServices { newItem = delegator.makeValue("OrderItem", UtilMisc.toMap("orderItemSeqId", UtilFormatOut.formatPaddedNumber(itemCount++, 5))); // price - Map<String, Object> priceContext = FastMap.newInstance(); + Map<String, Object> priceContext = new HashMap<String, Object>(); priceContext.put("currencyUomId", orderHeader.get("currencyUom")); if (placingPartyId != null) { priceContext.put("partyId", placingPartyId); @@ -2043,12 +2042,12 @@ public class OrderReturnServices { // we'll assume the new order has the same order roles of the original one try { List<GenericValue> orderRoles = orderHeader.getRelated("OrderRole", null, null, false); - Map<String, List<String>> orderRolesMap = FastMap.newInstance(); + Map<String, List<String>> orderRolesMap = new HashMap<String, List<String>>(); if (orderRoles != null) { for (GenericValue orderRole : orderRoles) { List<String> parties = orderRolesMap.get(orderRole.getString("roleTypeId")); if (parties == null) { - parties = FastList.newInstance(); + parties = new LinkedList<String>(); orderRolesMap.put(orderRole.getString("roleTypeId"), parties); } parties.add(orderRole.getString("partyId")); @@ -2102,7 +2101,7 @@ public class OrderReturnServices { } // create a ReturnItemResponse and attach to each ReturnItem - Map<String, Object> itemResponse = FastMap.newInstance(); + Map<String, Object> itemResponse = new HashMap<String, Object>(); itemResponse.put("replacementOrderId", createdOrderId); itemResponse.put("responseAmount", orderPriceTotal); itemResponse.put("responseDate", nowTimestamp); @@ -2123,7 +2122,7 @@ public class OrderReturnServices { } for (GenericValue returnItem : returnItemList) { - Map<String, Object> updateReturnItemCtx = FastMap.newInstance(); + Map<String, Object> updateReturnItemCtx = new HashMap<String, Object>(); updateReturnItemCtx.put("returnId", returnId); updateReturnItemCtx.put("returnItemSeqId", returnItem.get("returnItemSeqId")); updateReturnItemCtx.put("returnItemResponseId", returnItemResponseId); @@ -2235,7 +2234,7 @@ public class OrderReturnServices { List<GenericValue> returnItemList = returnItemsByOrderId.get(orderId); if (returnItemList == null) { - returnItemList = FastList.newInstance(); + returnItemList = new LinkedList<GenericValue>(); } if (totalForOrder == null) { totalForOrder = BigDecimal.ZERO; @@ -2284,7 +2283,7 @@ public class OrderReturnServices { String returnId = (String) context.get("returnId"); Locale locale = (Locale) context.get("locale"); List<GenericValue> returnItems = null; - Map<String, Object> returnAmountByOrder = FastMap.newInstance(); + Map<String, Object> returnAmountByOrder = new HashMap<String, Object>(); try { returnItems = EntityQuery.use(delegator).from("ReturnItem").where("returnId", returnId).queryList(); @@ -2294,7 +2293,7 @@ public class OrderReturnServices { "OrderErrorGettingReturnHeaderItemInformation", locale)); } if ((returnItems != null) && (returnItems.size() > 0)) { - List<String> paymentList = FastList.newInstance(); + List<String> paymentList = new LinkedList<String>(); for (GenericValue returnItem : returnItems) { String orderId = returnItem.getString("orderId"); try { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Apr 10 20:22:54 2015 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -35,10 +36,7 @@ import java.util.concurrent.Callable; import javax.transaction.Transaction; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - +import org.apache.tools.ant.taskdefs.condition.HasMethod; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GeneralRuntimeException; @@ -98,8 +96,8 @@ public class OrderServices { public static final String resourceProduct = "ProductUiLabels"; public static final String resourceCommon = "CommonUiLabels"; - public static Map<String, String> salesAttributeRoleMap = FastMap.newInstance(); - public static Map<String, String> purchaseAttributeRoleMap = FastMap.newInstance(); + public static Map<String, String> salesAttributeRoleMap = new HashMap<String, String>(); + public static Map<String, String> purchaseAttributeRoleMap = new HashMap<String, String>(); static { salesAttributeRoleMap.put("placingCustomerPartyId", "PLACING_CUSTOMER"); salesAttributeRoleMap.put("billToCustomerPartyId", "BILL_TO_CUSTOMER"); @@ -256,10 +254,10 @@ public class OrderServices { List<GenericValue> orderItemPriceInfo = UtilGenerics.checkList(context.get("orderItemPriceInfos")); // check inventory and other things for each item - List<String> errorMessages = FastList.newInstance(); - Map<String, BigDecimal> normalizedItemQuantities = FastMap.newInstance(); - Map<String, String> normalizedItemNames = FastMap.newInstance(); - Map<String, GenericValue> itemValuesBySeqId = FastMap.newInstance(); + List<String> errorMessages = new LinkedList<String>(); + Map<String, BigDecimal> normalizedItemQuantities = new HashMap<String, BigDecimal>(); + Map<String, String> normalizedItemNames = new HashMap<String, String>(); + Map<String, GenericValue> itemValuesBySeqId = new HashMap<String, GenericValue>(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); // need to run through the items combining any cases where multiple lines refer to the @@ -434,7 +432,7 @@ public class OrderServices { } if (UtilValidate.isNotEmpty(orgPartyId)) { - Map<String, Object> getNextOrderIdContext = FastMap.newInstance(); + Map<String, Object> getNextOrderIdContext = new HashMap<String, Object>(); getNextOrderIdContext.putAll(context); getNextOrderIdContext.put("partyId", orgPartyId); getNextOrderIdContext.put("userLogin", userLogin); @@ -833,7 +831,7 @@ public class OrderServices { } // set the order item ship groups - List<String> dropShipGroupIds = FastList.newInstance(); // this list will contain the ids of all the ship groups for drop shipments (no reservations) + List<String> dropShipGroupIds = new LinkedList<String>(); // this list will contain the ids of all the ship groups for drop shipments (no reservations) if (UtilValidate.isNotEmpty(orderItemShipGroupInfo)) { for (GenericValue valueObj : orderItemShipGroupInfo) { valueObj.set("orderId", orderId); @@ -1101,7 +1099,7 @@ public class OrderServices { } } - Map<String, Object> ripCtx = FastMap.newInstance(); + Map<String, Object> ripCtx = new HashMap<String, Object>(); if (UtilValidate.isNotEmpty(inventoryFacilityId) && UtilValidate.isNotEmpty(productId) && orderItem.getBigDecimal("quantity").compareTo(BigDecimal.ZERO) > 0) { // do something tricky here: run as the "system" user GenericValue permUserLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").cache().queryOne(); @@ -2151,7 +2149,7 @@ public class OrderServices { changeComments = itemCommentMap.get(orderItem.getString("orderItemSeqId")); } - Map<String, Object> serviceCtx = FastMap.newInstance(); + Map<String, Object> serviceCtx = new HashMap<String, Object>(); serviceCtx.put("orderId", orderItem.getString("orderId")); serviceCtx.put("orderItemSeqId", orderItem.getString("orderItemSeqId")); serviceCtx.put("cancelQuantity", thisCancelQty); @@ -2574,7 +2572,7 @@ public class OrderServices { } // prepare the order information - Map<String, Object> sendMap = FastMap.newInstance(); + Map<String, Object> sendMap = new HashMap<String, Object>(); // get the order header and store GenericValue orderHeader = null; @@ -3243,7 +3241,7 @@ public class OrderServices { } // single list with all invoice items - List<GenericValue> itemsToInvoice = FastList.newInstance(); + List<GenericValue> itemsToInvoice = new LinkedList<GenericValue>(); itemsToInvoice.addAll(nonProductItems); itemsToInvoice.addAll(digitalItems); @@ -3369,7 +3367,7 @@ public class OrderServices { if (UtilValidate.isEmpty(allProductContent) && ("Y".equals(product.getString("isVariant")))) { GenericValue parentProduct = ProductWorker.getParentProduct(product.getString("productId"), delegator); if (allProductContent == null) { - allProductContent = FastList.newInstance(); + allProductContent = new LinkedList<GenericValue>(); } if (parentProduct != null) { allProductContent.addAll(parentProduct.getRelated("ProductContent", null, null, false)); @@ -3472,7 +3470,7 @@ public class OrderServices { orderItems = orh.getOrderItemsByCondition(EntityCondition.makeCondition("statusId", "ITEM_APPROVED")); // find any service items - List<GenericValue> serviceItems = FastList.newInstance(); + List<GenericValue> serviceItems = new LinkedList<GenericValue>(); if (UtilValidate.isNotEmpty(orderItems)) { for (GenericValue item : orderItems) { GenericValue product = null; @@ -3493,7 +3491,7 @@ public class OrderServices { // now process the service items if (UtilValidate.isNotEmpty(serviceItems)) { // Make sure there is actually something needing invoicing because createInvoiceForOrder doesn't check - List<GenericValue> billItems = FastList.newInstance(); + List<GenericValue> billItems = new LinkedList<GenericValue>(); for (GenericValue item : serviceItems) { BigDecimal orderQuantity = OrderReadHelper.getOrderItemQuantity(item); BigDecimal invoiceQuantity = OrderReadHelper.getOrderItemInvoicedQuantity(item); @@ -3519,7 +3517,7 @@ public class OrderServices { // update the status of service goods to COMPLETED; for (GenericValue item : serviceItems) { - Map<String, Object> statusCtx = FastMap.newInstance(); + Map<String, Object> statusCtx = new HashMap<String, Object>(); statusCtx.put("orderId", item.getString("orderId")); statusCtx.put("orderItemSeqId", item.getString("orderItemSeqId")); statusCtx.put("statusId", "ITEM_COMPLETED"); @@ -3653,7 +3651,7 @@ public class OrderServices { // set the order item attributes if (itemAttributesMap != null) { // go through the item attributes map once to get a list of key names - Set<String> attributeNames =FastSet.newInstance(); + Set<String> attributeNames = new HashSet<String>(); Set<String> keys = itemAttributesMap.keySet(); for (String key : keys) { attributeNames.add(key); @@ -3837,7 +3835,7 @@ public class OrderServices { // update the order item attributes if (itemAttributesMap != null) { // go through the item attributes map once to get a list of key names - Set<String> attributeNames =FastSet.newInstance(); + Set<String> attributeNames = new HashSet<String>(); Set<String> keys = itemAttributesMap.keySet(); for (String key : keys) { String[] attributeInfo = key.split(":"); @@ -4241,8 +4239,8 @@ public class OrderServices { } // get the new orderItems, adjustments, shipping info, payments and order item attributes from the cart - List<Map<String, Object>> modifiedItems = FastList.newInstance(); - List<Map<String, Object>> newItems = FastList.newInstance(); + List<Map<String, Object>> modifiedItems = new LinkedList<Map<String,Object>>(); + List<Map<String, Object>> newItems = new LinkedList<Map<String,Object>>(); List<GenericValue> toStore = new LinkedList<GenericValue>(); List<GenericValue> toAddList = new ArrayList<GenericValue>(); toAddList.addAll(cart.makeAllAdjustments()); @@ -4299,20 +4297,19 @@ public class OrderServices { } } } - } else { + } else { // add all the cart adjustments toStore.addAll(toAddList); } - + // Creating objects for New Shipping and Handling Charges Adjustment and Sales Tax Adjustment toStore.addAll(cart.makeAllShipGroupInfos()); toStore.addAll(cart.makeAllOrderPaymentInfos(dispatcher)); - toStore.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.FILLED_ONLY)); + toStore.addAll(cart.makeAllOrderItemAttributes(orderId, ShoppingCart.FILLED_ONLY)); - - List<GenericValue> toRemove = FastList.newInstance(); + List<GenericValue> toRemove = new LinkedList<GenericValue>(); if (deleteItems) { - // flag to delete existing order items and adjustments + // flag to delete existing order items and adjustments try { toRemove.addAll(EntityQuery.use(delegator).from("OrderItemShipGroupAssoc").where("orderId", orderId).queryList()); toRemove.addAll(EntityQuery.use(delegator).from("OrderItemContactMech").where("orderId", orderId).queryList()); @@ -4355,7 +4352,7 @@ public class OrderServices { toRemove.addAll(existingPromoUses); // set the orderId & other information on all new value objects - List<String> dropShipGroupIds = FastList.newInstance(); // this list will contain the ids of all the ship groups for drop shipments (no reservations) + List<String> dropShipGroupIds = new LinkedList<String>(); // this list will contain the ids of all the ship groups for drop shipments (no reservations) for (GenericValue valueObj : toStore) { valueObj.set("orderId", orderId); if ("OrderItemShipGroup".equals(valueObj.getEntityName())) { @@ -4391,7 +4388,7 @@ public class OrderServices { // ignore promotion items. They are added/canceled automatically if ("Y".equals(valueObj.getString("isPromo"))) { //Fetching the new promo items and adding it to list so that we can create OrderStatus record for that items. - Map<String, Object> promoItem = FastMap.newInstance(); + Map<String, Object> promoItem = new HashMap<String, Object>(); promoItem.put("orderId", valueObj.getString("orderId")); promoItem.put("orderItemSeqId", valueObj.getString("orderItemSeqId")); promoItem.put("quantity", valueObj.getBigDecimal("quantity")); @@ -4414,7 +4411,7 @@ public class OrderServices { String oldItemComment = oldOrderItem.getString("comments") != null ? oldOrderItem.getString("comments") : ""; boolean changeFound = false; - Map<String, Object> modifiedItem = FastMap.newInstance(); + Map<String, Object> modifiedItem = new HashMap<String, Object>(); if (!oldItemDescription.equals(valueObj.getString("itemDescription"))) { modifiedItem.put("itemDescription", oldItemDescription); changeFound = true; @@ -4454,7 +4451,7 @@ public class OrderServices { // this is a new item appended to the order Map<String, String> itemReasonMap = UtilGenerics.checkMap(changeMap.get("itemReasonMap")); Map<String, String> itemCommentMap = UtilGenerics.checkMap(changeMap.get("itemCommentMap")); - Map<String, Object> appendedItem = FastMap.newInstance(); + Map<String, Object> appendedItem = new HashMap<String, Object>(); if (UtilValidate.isNotEmpty(itemReasonMap)) { String changeReasonId = itemReasonMap.get("reasonEnumId"); appendedItem.put("reasonEnumId", changeReasonId); @@ -4473,7 +4470,7 @@ public class OrderServices { } } } - + if (Debug.verboseOn()) Debug.logVerbose("To Store Contains: " + toStore, module); @@ -4496,7 +4493,7 @@ public class OrderServices { // store the OrderItemChange if (UtilValidate.isNotEmpty(modifiedItems)) { for (Map<String, Object> modifiendItem: modifiedItems) { - Map<String, Object> serviceCtx = FastMap.newInstance(); + Map<String, Object> serviceCtx = new HashMap<String, Object>(); serviceCtx.put("orderId", modifiendItem.get("orderId")); serviceCtx.put("orderItemSeqId", modifiendItem.get("orderItemSeqId")); serviceCtx.put("itemDescription", modifiendItem.get("itemDescription")); @@ -4776,7 +4773,7 @@ public class OrderServices { "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale)); } - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("statusId", statusId); ctx.put("orderId", orderId); ctx.put("setItemStatus", "Y"); @@ -4818,7 +4815,7 @@ public class OrderServices { "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale)); } - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("statusId", statusId); ctx.put("orderId", orderId); ctx.put("userLogin", userLogin); @@ -4846,7 +4843,7 @@ public class OrderServices { if (UtilValidate.isEmpty(orderId)) { continue; } - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("userLogin", userLogin); ctx.put("orderId", orderId); @@ -4871,7 +4868,7 @@ public class OrderServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); // grouped by facility - Map<String, List<String>> facilityOrdersMap = FastMap.newInstance(); + Map<String, List<String>> facilityOrdersMap = new HashMap<String, List<String>>(); // make the list per facility List<String> orderIds = UtilGenerics.checkList(context.get("orderIdList")); @@ -4903,7 +4900,7 @@ public class OrderServices { for (String facilityId : facilityOrdersMap.keySet()) { List<String> orderIdList = facilityOrdersMap.get(facilityId); - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("userLogin", userLogin); ctx.put("orderIdList", orderIdList); ctx.put("facilityId", facilityId); @@ -4936,7 +4933,7 @@ public class OrderServices { if (UtilValidate.isEmpty(orderId)) { continue; } - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("userLogin", userLogin); ctx.put("screenLocation", screenLocation); //ctx.put("contentType", "application/postscript"); @@ -4965,7 +4962,7 @@ public class OrderServices { if (UtilValidate.isEmpty(orderId)) { continue; } - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("userLogin", userLogin); ctx.put("screenLocation", screenLocation); //ctx.put("contentType", "application/postscript"); @@ -4991,7 +4988,7 @@ public class OrderServices { if (UtilValidate.isEmpty(orderId)) { continue; } - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("orderId", orderId); ctx.put("userLogin", userLogin); @@ -6290,7 +6287,7 @@ public class OrderServices { } for (String orderId: orderIds) { - Map<String, Object> svcIn = FastMap.newInstance(); + Map<String, Object> svcIn = new HashMap<String, Object>(); svcIn.put("userLogin", context.get("userLogin")); svcIn.put("orderId", orderId); try { @@ -6355,7 +6352,7 @@ public class OrderServices { updateCtx.put("quantity", newQuantity); dispatcher.runSync("updateProductAssoc", updateCtx); } else { - Map<String, Object> createCtx = FastMap.newInstance(); + Map<String, Object> createCtx = new HashMap<String, Object>(); createCtx.put("userLogin", context.get("userLogin")); createCtx.put("productId", productId); createCtx.put("productIdTo", productIdTo); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/quote/QuoteServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/quote/QuoteServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/quote/QuoteServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/quote/QuoteServices.java Fri Apr 10 20:22:54 2015 @@ -19,12 +19,11 @@ package org.ofbiz.order.quote; import java.sql.Timestamp; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; @@ -59,7 +58,7 @@ public class QuoteServices { String note = (String) context.get("note"); // prepare the order information - Map<String, Object> sendMap = FastMap.newInstance(); + Map<String, Object> sendMap = new HashMap<String, Object>(); // get the quote and store GenericValue quote = null; @@ -167,7 +166,7 @@ public class QuoteServices { //TODO create Quote Term Attributes still to be implemented //List<GenericValue> quoteTermAttributes = UtilGenerics.cast(context.get("quoteTermAttributes")); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); try { Map<String, Object> quoteIn = UtilMisc.toMap("quoteTypeId", quoteTypeId, "partyId", partyId, "issueDate", issueDate, "statusId", statusId, "currencyUomId", currencyUomId); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java Fri Apr 10 20:22:54 2015 @@ -22,10 +22,6 @@ import java.util.*; import java.math.BigDecimal; import java.sql.Timestamp; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.Delegator; @@ -86,23 +82,23 @@ public class RequirementServices { .queryList(); // maps to cache the associated suppliers and products data, so we don't do redundant DB and service requests - Map<String, GenericValue> suppliers = FastMap.newInstance(); - Map<String, GenericValue> gids = FastMap.newInstance(); - Map<String, Map<String, Object>> inventories = FastMap.newInstance(); - Map<String, BigDecimal> productsSold = FastMap.newInstance(); + Map<String, GenericValue> suppliers = new HashMap<String, GenericValue>(); + Map<String, GenericValue> gids = new HashMap<String, GenericValue>(); + Map<String, Map<String, Object>> inventories = new HashMap<String, Map<String,Object>>(); + Map<String, BigDecimal> productsSold = new HashMap<String, BigDecimal>(); // to count quantity, running total, and distinct products in list BigDecimal quantity = BigDecimal.ZERO; BigDecimal amountTotal = BigDecimal.ZERO; - Set<String> products = FastSet.newInstance(); + Set<String> products = new HashSet<String>(); // time period to count products ordered from, six months ago and the 1st of that month Timestamp timePeriodStart = UtilDateTime.getMonthStart(UtilDateTime.nowTimestamp(), 0, -6); // join in fields with extra data about the suppliers and products - List<Map<String, Object>> requirements = FastList.newInstance(); + List<Map<String, Object>> requirements = new LinkedList<Map<String,Object>>(); for (GenericValue requirement : requirementAndRoles) { - Map<String, Object> union = FastMap.newInstance(); + Map<String, Object> union = new HashMap<String, Object>(); String productId = requirement.getString("productId"); partyId = requirement.getString("partyId"); String facilityId = requirement.getString("facilityId"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Fri Apr 10 20:22:54 2015 @@ -29,8 +29,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GeneralRuntimeException; @@ -304,7 +302,7 @@ public class CheckOutEvents { if (paymentMethods != null) { for (int i = 0; i < paymentMethods.length; i++) { - Map<String, Object> paymentMethodInfo = FastMap.newInstance(); + Map<String, Object> paymentMethodInfo = new HashMap<String, Object>(); String securityCode = request.getParameter("securityCode_" + paymentMethods[i]); if (UtilValidate.isNotEmpty(securityCode)) { 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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -38,9 +38,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.GeneralRuntimeException; @@ -128,22 +125,22 @@ public class ShoppingCart implements Ite private String autoSaveListId = null; /** Holds value of order adjustments. */ - private List<GenericValue> adjustments = FastList.newInstance(); + private List<GenericValue> adjustments = new LinkedList<GenericValue>(); // OrderTerms private boolean orderTermSet = false; private List<GenericValue> orderTerms = new LinkedList<GenericValue>(); - private List<ShoppingCartItem> cartLines = FastList.newInstance(); - private Map<String, ShoppingCartItemGroup> itemGroupByNumberMap = FastMap.newInstance(); + private List<ShoppingCartItem> cartLines = new LinkedList<ShoppingCartItem>(); + private Map<String, ShoppingCartItemGroup> itemGroupByNumberMap = new HashMap<String, ShoppingCartItemGroup>(); protected long nextGroupNumber = 1; - private List<CartPaymentInfo> paymentInfo = FastList.newInstance(); - private List<CartShipInfo> shipInfo = FastList.<CartShipInfo> newInstance(); + private List<CartPaymentInfo> paymentInfo = new LinkedList<ShoppingCart.CartPaymentInfo>(); + private List<CartShipInfo> shipInfo = new LinkedList<ShoppingCart.CartShipInfo>(); private Map<String, String> contactMechIdsMap = new HashMap<String, String>(); - private Map<String, String> orderAttributes = FastMap.newInstance(); - private Map<String, Object> attributes = FastMap.newInstance(); // user defined attributes + private Map<String, String> orderAttributes = new HashMap<String, String>(); + private Map<String, Object> attributes = new HashMap<String, Object>(); // user defined attributes // Lists of internal/public notes: when the order is stored they are transformed into OrderHeaderNotes - private List<String> internalOrderNotes = FastList.newInstance(); // internal notes - private List<String> orderNotes = FastList.newInstance(); // public notes (printed on documents etc.) + private List<String> internalOrderNotes = new LinkedList<String>(); // internal notes + private List<String> orderNotes = new LinkedList<String>(); // public notes (printed on documents etc.) /** contains a list of partyId for each roleTypeId (key) */ private Map<String, List<String>> additionalPartyRole = new HashMap<String, List<String>>(); @@ -153,7 +150,7 @@ public class ShoppingCart implements Ite private Timestamp defaultShipBeforeDate = null; /** Contains a List for each productPromoId (key) containing a productPromoCodeId (or empty string for no code) for each use of the productPromoId */ - private List<ProductPromoUseInfo> productPromoUseInfoList = FastList.newInstance(); + private List<ProductPromoUseInfo> productPromoUseInfoList = new LinkedList<ShoppingCart.ProductPromoUseInfo>(); /** Contains the promo codes entered */ private Set<String> productPromoCodes = new HashSet<String>(); private List<GenericValue> freeShippingProductPromoActions = new ArrayList<GenericValue>(); @@ -707,7 +704,7 @@ public class ShoppingCart implements Ite public List<ShoppingCartItem> findAllCartItems(String productId, String groupNumber) { if (productId == null) return this.items(); - List<ShoppingCartItem> itemsToReturn = FastList.newInstance(); + List<ShoppingCartItem> itemsToReturn = new LinkedList<ShoppingCartItem>(); // Check for existing cart item. for (ShoppingCartItem cartItem : cartLines) { if (UtilValidate.isNotEmpty(groupNumber) && !cartItem.isInItemGroup(groupNumber)) { @@ -725,7 +722,7 @@ public class ShoppingCart implements Ite if (productCategoryId == null) return this.items(); Delegator delegator = this.getDelegator(); - List<ShoppingCartItem> itemsToReturn = FastList.newInstance(); + List<ShoppingCartItem> itemsToReturn = new LinkedList<ShoppingCartItem>(); try { // Check for existing cart item for (ShoppingCartItem cartItem : cartLines) { @@ -769,7 +766,7 @@ public class ShoppingCart implements Ite if (multipleItems.size() <= maxItems) return; // remove all except first <maxItems> in list from the cart, first because new cart items are added to the beginning... - List<ShoppingCartItem> localList = FastList.newInstance(); + List<ShoppingCartItem> localList = new LinkedList<ShoppingCartItem>(); localList.addAll(multipleItems); // the ones to keep... for (int i=0; i<maxItems; i++) localList.remove(0); @@ -787,7 +784,7 @@ public class ShoppingCart implements Ite } public static List<GenericValue> getItemsProducts(List<ShoppingCartItem> cartItems) { - List<GenericValue> productList = FastList.newInstance(); + List<GenericValue> productList = new LinkedList<GenericValue>(); for (ShoppingCartItem item : cartItems) { GenericValue product = item.getProduct(); if (product != null) { @@ -955,7 +952,7 @@ public class ShoppingCart implements Ite /** Returns a Collection of items in the cart object. */ public List<ShoppingCartItem> items() { - List<ShoppingCartItem> result = FastList.newInstance(); + List<ShoppingCartItem> result = new LinkedList<ShoppingCartItem>(); result.addAll(cartLines); return result; } @@ -999,7 +996,7 @@ public class ShoppingCart implements Ite } public List<ShoppingCartItem> getCartItemsInNoGroup() { - List<ShoppingCartItem> cartItemList = FastList.newInstance(); + List<ShoppingCartItem> cartItemList = new LinkedList<ShoppingCartItem>(); for (ShoppingCartItem cartItem : cartLines) { if (cartItem.getItemGroup() == null) { cartItemList.add(cartItem); @@ -1009,7 +1006,7 @@ public class ShoppingCart implements Ite } public List<ShoppingCartItem> getCartItemsInGroup(String groupNumber) { - List<ShoppingCartItem> cartItemList = FastList.newInstance(); + List<ShoppingCartItem> cartItemList = new LinkedList<ShoppingCartItem>(); ShoppingCart.ShoppingCartItemGroup itemGroup = this.getItemGroupByNumber(groupNumber); if (itemGroup != null) { for (ShoppingCartItem cartItem : cartLines) { @@ -1792,7 +1789,7 @@ public class ShoppingCart implements Ite /** Returns the Payment Method Ids */ public List<String> getPaymentMethodTypeIds() { - List<String> pmt = FastList.newInstance(); + List<String> pmt = new LinkedList<String>(); for (CartPaymentInfo inf : paymentInfo) { if (inf.paymentMethodTypeId != null) { pmt.add(inf.paymentMethodTypeId); @@ -1803,7 +1800,7 @@ public class ShoppingCart implements Ite /** Returns a list of PaymentMethod value objects selected in the cart */ public List<GenericValue> getPaymentMethods() { - List<GenericValue> methods = FastList.newInstance(); + List<GenericValue> methods = new LinkedList<GenericValue>(); if (UtilValidate.isNotEmpty(paymentInfo)) { for (String paymentMethodId : getPaymentMethodIds()) { try { @@ -2045,7 +2042,7 @@ public class ShoppingCart implements Ite /** Returns the ShoppingCartItem (key) and quantity (value) associated with the ship group */ public Map<ShoppingCartItem, BigDecimal> getShipGroupItems(int idx) { CartShipInfo csi = this.getShipInfo(idx); - Map<ShoppingCartItem, BigDecimal> qtyMap = FastMap.newInstance(); + Map<ShoppingCartItem, BigDecimal> qtyMap = new HashMap<ShoppingCartItem, BigDecimal>(); for (ShoppingCartItem item : csi.shipItemInfo.keySet()) { CartShipInfo.CartShipItemInfo csii = csi.shipItemInfo.get(item); qtyMap.put(item, csii.quantity); @@ -2714,8 +2711,8 @@ public class ShoppingCart implements Ite return itemsTotal; } public BigDecimal getOrderGlobalAdjusments() { - List cartAdjustments = this.getAdjustments(); - List tempAdjustmentsList = FastList.newInstance(); + List<GenericValue> cartAdjustments = this.getAdjustments(); + List<GenericValue> tempAdjustmentsList = new LinkedList<GenericValue>(); if (cartAdjustments != null) { Iterator cartAdjustmentIter = cartAdjustments.iterator(); while (cartAdjustmentIter.hasNext()) { @@ -2937,7 +2934,7 @@ public class ShoppingCart implements Ite if (orderAdjustmentTypeId == null) return; // make a list of adjustment lists including the cart adjustments and the cartItem adjustments for each item - List<List<GenericValue>> adjsLists = FastList.newInstance(); + List<List<GenericValue>> adjsLists = new LinkedList<List<GenericValue>>(); adjsLists.add(this.getAdjustments()); @@ -3037,7 +3034,7 @@ public class ShoppingCart implements Ite /** Returns a List of shippable item's size for a specific ship group. */ public List<BigDecimal> getShippableSizes(int idx) { CartShipInfo info = this.getShipInfo(idx); - List<BigDecimal> shippableSizes = FastList.newInstance(); + List<BigDecimal> shippableSizes = new LinkedList<BigDecimal>(); for (ShoppingCartItem item : info.shipItemInfo.keySet()) { CartShipInfo.CartShipItemInfo csii = info.shipItemInfo.get(item); @@ -3054,7 +3051,7 @@ public class ShoppingCart implements Ite /** Returns a List of shippable item info (quantity, size, weight) for a specific ship group */ public List<Map<String, Object>> getShippableItemInfo(int idx) { CartShipInfo info = this.getShipInfo(idx); - List<Map<String, Object>> itemInfos = FastList.newInstance(); + List<Map<String, Object>> itemInfos = new LinkedList<Map<String,Object>>(); for (ShoppingCartItem item : info.shipItemInfo.keySet()) { CartShipInfo.CartShipItemInfo csii = info.shipItemInfo.get(item); @@ -3097,7 +3094,7 @@ public class ShoppingCart implements Ite /** Returns a Map of all features applied to products in the cart with quantities for a specific ship group. */ public Map<String, BigDecimal> getFeatureIdQtyMap(int idx) { CartShipInfo info = this.getShipInfo(idx); - Map<String, BigDecimal> featureMap = FastMap.newInstance(); + Map<String, BigDecimal> featureMap = new HashMap<String, BigDecimal>(); for (ShoppingCartItem item : info.shipItemInfo.keySet()) { CartShipInfo.CartShipItemInfo csii = info.shipItemInfo.get(item); @@ -3542,7 +3539,7 @@ public class ShoppingCart implements Ite } public List<GenericValue> makeOrderItemGroups() { - List<GenericValue> result = FastList.newInstance(); + List<GenericValue> result = new LinkedList<GenericValue>(); for (ShoppingCart.ShoppingCartItemGroup itemGroup : this.itemGroupByNumberMap.values()) { result.add(itemGroup.makeOrderItemGroup(this.getDelegator())); } @@ -3617,7 +3614,7 @@ public class ShoppingCart implements Ite // now build the lines synchronized (cartLines) { - List<GenericValue> result = FastList.newInstance(); + List<GenericValue> result = new LinkedList<GenericValue>(); for (ShoppingCartItem item : cartLines) { if (UtilValidate.isEmpty(item.getOrderItemSeqId())) { @@ -3716,7 +3713,7 @@ public class ShoppingCart implements Ite /** make a list of all adjustments including order adjustments, order line adjustments, and special adjustments (shipping and tax if applicable) */ public List<GenericValue> makeAllAdjustments() { - List<GenericValue> allAdjs = FastList.newInstance(); + List<GenericValue> allAdjs = new LinkedList<GenericValue>(); // before returning adjustments, go through them to find all that need counter adjustments (for instance: free shipping) for (GenericValue orderAdjustment: this.getAdjustments()) { @@ -3804,7 +3801,7 @@ public class ShoppingCart implements Ite * Internally, the quote adjustments are created from the order adjustments. */ public List<GenericValue> makeAllQuoteAdjustments() { - List<GenericValue> quoteAdjs = FastList.newInstance(); + List<GenericValue> quoteAdjs = new LinkedList<GenericValue>(); for (GenericValue orderAdj: makeAllAdjustments()) { GenericValue quoteAdj = this.getDelegator().makeValue("QuoteAdjustment"); @@ -3898,7 +3895,7 @@ public class ShoppingCart implements Ite } public List<GenericValue> makeProductPromoUses() { - List<GenericValue> productPromoUses = FastList.newInstance(); + List<GenericValue> productPromoUses = new LinkedList<GenericValue>(); String partyId = this.getPartyId(); int sequenceValue = 0; for (ProductPromoUseInfo productPromoUseInfo: this.productPromoUseInfoList) { @@ -4013,7 +4010,7 @@ public class ShoppingCart implements Ite // now build order item attributes synchronized (cartLines) { - List<GenericValue> result = FastList.newInstance(); + List<GenericValue> result = new LinkedList<GenericValue>(); for (ShoppingCartItem item : cartLines) { Map<String, String> orderItemAttributes = item.getOrderItemAttributes(); @@ -4060,7 +4057,7 @@ public class ShoppingCart implements Ite public List<GenericValue> makeAllOrderAttributes(String orderId, int mode) { - List<GenericValue> allOrderAttributes = FastList.newInstance(); + List<GenericValue> allOrderAttributes = new LinkedList<GenericValue>(); for (Map.Entry<String, String> entry: orderAttributes.entrySet()) { GenericValue orderAtt = this.getDelegator().makeValue("OrderAttribute"); @@ -4499,8 +4496,8 @@ public class ShoppingCart implements Ite } public static class CartShipInfo implements Serializable { - public Map<ShoppingCartItem, CartShipItemInfo> shipItemInfo = FastMap.newInstance(); - public List<GenericValue> shipTaxAdj = FastList.newInstance(); + public Map<ShoppingCartItem, CartShipItemInfo> shipItemInfo = new HashMap<ShoppingCartItem, CartShipItemInfo>(); + public List<GenericValue> shipTaxAdj = new LinkedList<GenericValue>(); public String orderTypeId = null; private String internalContactMechId = null; public String telecomContactMechId = null; @@ -4520,7 +4517,7 @@ public class ShoppingCart implements Ite private String associatedShipGroupSeqId = null; public String vendorPartyId = null; public String productStoreShipMethId = null; - public Map<String, Object> attributes = FastMap.newInstance(); + public Map<String, Object> attributes = new HashMap<String, Object>(); public void setAttribute(String name, Object value) { this.attributes.put(name, value); @@ -4626,7 +4623,7 @@ public class ShoppingCart implements Ite values.add(shipGroup); //set estimated ship dates - FastList<Timestamp> estimatedShipDates = FastList.newInstance(); + LinkedList<Timestamp> estimatedShipDates = new LinkedList<Timestamp>(); for (ShoppingCartItem item : shipItemInfo.keySet()) { Timestamp estimatedShipDate = item.getEstimatedShipDate(); if (estimatedShipDate != null) { @@ -4640,7 +4637,7 @@ public class ShoppingCart implements Ite } //set estimated delivery dates - FastList<Timestamp> estimatedDeliveryDates = FastList.newInstance(); + LinkedList<Timestamp> estimatedDeliveryDates = new LinkedList<Timestamp>(); for (ShoppingCartItem item : shipItemInfo.keySet()) { Timestamp estimatedDeliveryDate = item.getDesiredDeliveryDate(); if (estimatedDeliveryDate != null) { @@ -4770,7 +4767,7 @@ public class ShoppingCart implements Ite } public BigDecimal getTotalTax(ShoppingCart cart) { - List<GenericValue> taxAdjustments = FastList.newInstance(); + List<GenericValue> taxAdjustments = new LinkedList<GenericValue>(); taxAdjustments.addAll(shipTaxAdj); for (CartShipItemInfo info : shipItemInfo.values()) { taxAdjustments.addAll(info.itemTaxAdj); @@ -5126,7 +5123,7 @@ public class ShoppingCart implements Ite .where("productId", itemProductId) .filterByDate() .queryList(); - Map<String, BigDecimal> productPriceMap = FastMap.newInstance(); + Map<String, BigDecimal> productPriceMap = new HashMap<String, BigDecimal>(); for (GenericValue productPrice : productPriceList) { productPriceMap.put(productPrice.getString("productPriceTypeId"), productPrice.getBigDecimal("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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -34,9 +34,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilDateTime; @@ -580,7 +577,7 @@ public class ShoppingCartEvents { EntityCondition.makeCondition(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityOperator.OR, EntityCondition.makeCondition("productIdTo", EntityOperator.EQUALS, productId)), EntityCondition.makeCondition("productAssocTypeId", EntityOperator.EQUALS, "PRODUCT_INCOMPATABLE")), EntityOperator.AND); productAssocs = EntityQuery.use(delegator).from("ProductAssoc").where(cond).filterByDate().queryList(); - List<String> productList = FastList.newInstance(); + List<String> productList = new LinkedList<String>(); for (GenericValue productAssoc : productAssocs) { if (productId.equals(productAssoc.getString("productId"))) { productList.add(productAssoc.getString("productIdTo")); @@ -988,7 +985,7 @@ public class ShoppingCartEvents { } List<ShoppingCart> cartList = UtilGenerics.checkList(session.getAttribute("shoppingCartList")); if (UtilValidate.isEmpty(cartList)) { - cartList = FastList.newInstance(); + cartList = new LinkedList<ShoppingCart>(); session.setAttribute("shoppingCartList", cartList); } ShoppingCart currentCart = (ShoppingCart) session.getAttribute("shoppingCart"); @@ -2067,7 +2064,7 @@ public class ShoppingCartEvents { ", quantity = " + quantity + ", itemType = " + itemType + " and itemDescription = " + itemDescription, module); HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - Map<String, Object> appendOrderItemMap = FastMap.newInstance(); + Map<String, Object> appendOrderItemMap = new HashMap<String, Object>(); appendOrderItemMap.put("productId", productId); appendOrderItemMap.put("quantity", quantity); appendOrderItemMap.put("orderId", orderId); 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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -31,8 +31,6 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; @@ -210,7 +208,7 @@ public class ShoppingCartHelper { // Get the additional features selected for the product (if any) Map<String, Object> selectedFeatures = UtilHttp.makeParamMapWithPrefix(context, null, "FT", null); - Map<String, GenericValue> additionalFeaturesMap = FastMap.newInstance(); + Map<String, GenericValue> additionalFeaturesMap = new HashMap<String, GenericValue>(); for (String selectedFeatureType : selectedFeatures.keySet()) { String selectedFeatureValue = (String)selectedFeatures.get(selectedFeatureType); if (UtilValidate.isNotEmpty(selectedFeatureValue)) { @@ -231,7 +229,7 @@ public class ShoppingCartHelper { } // get order item attributes - Map<String, String> orderItemAttributes = FastMap.newInstance(); + Map<String, String> orderItemAttributes = new HashMap<String, String>(); String orderItemAttributePrefix = EntityUtilProperties.getPropertyValue("order.properties", "order.item.attr.prefix", delegator); for (Entry<String, ? extends Object> entry : context.entrySet()) { if (entry.getKey().toString().contains(orderItemAttributePrefix) && UtilValidate.isNotEmpty(entry.getValue())) { |
Re: svn commit: r1672752 [7/18] - in /ofbiz/trunk: applications/accounting/src/or
|
|
This is an example of why having a HUGE commit is wrong. This problem
listed below was not discovered, because there were too many changes to review. My maven branch at OFBIZ-6271 is doing things in a much better way. ps: I discovered this because I am attempting to compile each and every component with no dependent jars listed, then adding back *just* what is required. Any ant deps get extra attention, as they really shouldn't be needed. On 04/10/2015 03:22 PM, [hidden email] wrote: > ============================================================================== > --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) > +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri Apr 10 20:22:54 2015 > @@ -24,6 +24,7 @@ import java.util.ArrayList; > import java.util.Collection; > import java.util.Date; > import java.util.HashMap; > +import java.util.HashSet; > import java.util.Iterator; > import java.util.LinkedList; > import java.util.List; > @@ -35,10 +36,7 @@ import java.util.concurrent.Callable; > > import javax.transaction.Transaction; > > -import javolution.util.FastList; > -import javolution.util.FastMap; > -import javolution.util.FastSet; > - > +import org.apache.tools.ant.taskdefs.condition.HasMethod; What is this import supposed to do? Nothing makes use of that class. |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |