svn commit: r1672752 [8/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [8/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -33,9 +33,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -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.UtilDateTime; @@ -143,9 +140,9 @@ public class ShoppingCartItem implements private Timestamp estimatedShipDate = null; private Timestamp cancelBackOrderDate = null; - private Map<String, String> contactMechIdsMap = FastMap.newInstance(); + private Map<String, String> contactMechIdsMap = new HashMap<String, String>(); private List<GenericValue> orderItemPriceInfos = null; - private List<GenericValue> itemAdjustments = FastList.newInstance(); + private List<GenericValue> itemAdjustments = new LinkedList<GenericValue>(); private boolean isPromo = false; private BigDecimal promoQuantityUsed = BigDecimal.ZERO; private Map<GenericPK, BigDecimal> quantityUsedPerPromoCandidate = new HashMap<GenericPK, BigDecimal>(); @@ -679,7 +676,7 @@ public class ShoppingCartItem implements this.orderItemAssocTypeId = item.getOrderItemAssocTypeId(); this.setStatusId(item.getStatusId()); if (UtilValidate.isEmpty(item.getOrderItemAttributes())) { - this.orderItemAttributes = FastMap.<String, String>newInstance(); + this.orderItemAttributes = new HashMap<String, String>(); this.orderItemAttributes.putAll(item.getOrderItemAttributes()); } this.attributes = item.getAttributes() == null ? new HashMap<String, Object>() : new HashMap<String, Object>(item.getAttributes()); @@ -700,7 +697,7 @@ public class ShoppingCartItem implements this.additionalProductFeatureAndAppls = item.getAdditionalProductFeatureAndAppls() == null ? null : new HashMap<String, GenericValue>(item.getAdditionalProductFeatureAndAppls()); if (item.getAlternativeOptionProductIds() != null) { - List<String> tempAlternativeOptionProductIds = FastList.newInstance(); + List<String> tempAlternativeOptionProductIds = new LinkedList<String>(); tempAlternativeOptionProductIds.addAll(item.getAlternativeOptionProductIds()); this.setAlternativeOptionProductIds(tempAlternativeOptionProductIds); } @@ -1132,7 +1129,7 @@ public class ShoppingCartItem implements // set basePrice using the calculateProductPrice service if (_product != null && isModifiedPrice == false) { try { - Map<String, Object> priceContext = FastMap.newInstance(); + Map<String, Object> priceContext = new HashMap<String, Object>(); String partyId = cart.getPartyId(); if (partyId != null) { @@ -1270,7 +1267,7 @@ public class ShoppingCartItem implements } // no try to do a recurring price calculation; not all products have recurring prices so may be null - Map<String, Object> recurringPriceContext = FastMap.newInstance(); + Map<String, Object> recurringPriceContext = new HashMap<String, Object>(); recurringPriceContext.putAll(priceContext); recurringPriceContext.put("productPricePurposeId", "RECURRING_CHARGE"); Map<String, Object> recurringPriceResult = dispatcher.runSync("calculateProductPrice", recurringPriceContext); @@ -1936,7 +1933,7 @@ public class ShoppingCartItem implements public Map<String, Object> getItemProductInfo() { - Map<String, Object> itemInfo = FastMap.newInstance(); + Map<String, Object> itemInfo = new HashMap<String, Object>(); itemInfo.put("productId", this.getProductId()); itemInfo.put("weight", this.getWeight()); itemInfo.put("weightUomId", this.getProduct().getString("weightUomId")); @@ -2176,7 +2173,7 @@ public class ShoppingCartItem implements } public Map<String, BigDecimal> getFeatureIdQtyMap(BigDecimal quantity) { - Map<String, BigDecimal> featureMap = FastMap.newInstance(); + Map<String, BigDecimal> featureMap = new HashMap<String, BigDecimal>(); GenericValue product = this.getProduct(); if (product != null) { List<GenericValue> featureAppls = null; @@ -2242,7 +2239,7 @@ public class ShoppingCartItem implements /** Creates an OrderItemAttribute entry. */ public void setOrderItemAttribute(String name, String value) { - if (orderItemAttributes == null) orderItemAttributes = FastMap.newInstance(); + if (orderItemAttributes == null) orderItemAttributes = new HashMap<String, String>(); this.orderItemAttributes.put(name, value); } @@ -2253,7 +2250,7 @@ public class ShoppingCartItem implements } public Map<String, String> getOrderItemAttributes() { - Map<String, String> attrs = FastMap.newInstance(); + Map<String, String> attrs = new HashMap<String, String>(); if (orderItemAttributes != null) { attrs.putAll(orderItemAttributes); } @@ -2497,7 +2494,7 @@ public class ShoppingCartItem implements return ProductWorker.getOptionalProductFeatures(getDelegator(), this.productId); } else { // non-product items do not have features - return FastMap.newInstance(); + return new HashMap<String, List<GenericValue>>(); } } 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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -23,13 +23,11 @@ import java.math.MathContext; import java.sql.Timestamp; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; 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.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -366,8 +364,8 @@ public class ShoppingCartServices { try { product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne(); if ("DIGITAL_GOOD".equals(product.getString("productTypeId"))) { - Map<String, Object> surveyResponseMap = FastMap.newInstance(); - Map<String, Object> answers = FastMap.newInstance(); + Map<String, Object> surveyResponseMap = new HashMap<String, Object>(); + Map<String, Object> answers = new HashMap<String, Object>(); List<GenericValue> surveyResponseAndAnswers = EntityQuery.use(delegator).from("SurveyResponseAndAnswer").where("orderId", orderId, "orderItemSeqId", orderItemSeqId).queryList(); if (UtilValidate.isNotEmpty(surveyResponseAndAnswers)) { String surveyId = EntityUtil.getFirst(surveyResponseAndAnswers).getString("surveyId"); @@ -757,11 +755,11 @@ public class ShoppingCartServices { // Convert the quote adjustment to order header adjustments and // put them in a map: the key/values pairs are quoteItemSeqId/List of adjs - Map<String, List<GenericValue>> orderAdjsMap = FastMap.newInstance() ; + Map<String, List<GenericValue>> orderAdjsMap = new HashMap<String, List<GenericValue>>() ; for (GenericValue quoteAdj : quoteAdjs) { List<GenericValue> orderAdjs = orderAdjsMap.get(UtilValidate.isNotEmpty(quoteAdj.getString("quoteItemSeqId")) ? quoteAdj.getString("quoteItemSeqId") : quoteId); if (orderAdjs == null) { - orderAdjs = FastList.newInstance(); + orderAdjs = new LinkedList<GenericValue>(); orderAdjsMap.put(UtilValidate.isNotEmpty(quoteAdj.getString("quoteItemSeqId")) ? quoteAdj.getString("quoteItemSeqId") : quoteId, orderAdjs); } // convert quote adjustments to order adjustments @@ -1113,7 +1111,7 @@ 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)); - Map<String, Object> cartItemData = FastMap.newInstance(); + Map<String, Object> cartItemData = new HashMap<String, Object>(); for (ShoppingCartItem cartLine : shoppingCart) { int cartLineIndex = shoppingCart.getItemIndex(cartLine); cartItemData.put("displayItemQty_" + cartLineIndex, cartLine.getQuantity()); @@ -1166,7 +1164,7 @@ public class ShoppingCartServices { Debug.logError(e.toString(), module); return ServiceUtil.returnError(e.toString()); } - Map<String, Object> vendorMap = FastMap.newInstance(); + Map<String, Object> vendorMap = new HashMap<String, Object>(); for (ShoppingCartItem item : cart) { GenericValue vendorProduct = null; String productId = item.getParentProductId(); 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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -24,15 +24,13 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; @@ -67,7 +65,7 @@ public class ProductDisplayWorker { List<GenericValue> cartAssocs = null; try { - Map<String, GenericValue> products = FastMap.newInstance(); + Map<String, GenericValue> products = new HashMap<String, GenericValue>(); Iterator<ShoppingCartItem> cartiter = cart.iterator(); @@ -117,16 +115,16 @@ public class ProductDisplayWorker { String currentCatalogId = CatalogWorker.getCurrentCatalogId(request); String viewProductCategoryId = CatalogWorker.getCatalogViewAllowCategoryId(delegator, currentCatalogId); if (viewProductCategoryId != null) { - List<GenericValue> tempList = FastList.newInstance(); + List<GenericValue> tempList = new LinkedList<GenericValue>(); tempList.addAll(products.values()); tempList = CategoryWorker.filterProductsInCategory(delegator, tempList, viewProductCategoryId, "productId"); - cartAssocs = FastList.newInstance(); + cartAssocs = new LinkedList<GenericValue>(); cartAssocs.addAll(tempList); } } if (cartAssocs == null) { - cartAssocs = FastList.newInstance(); + cartAssocs = new LinkedList<GenericValue>(); cartAssocs.addAll(products.values()); } @@ -150,7 +148,7 @@ public class ProductDisplayWorker { Delegator delegator = (Delegator) request.getAttribute("delegator"); HttpServletRequest httpRequest = (HttpServletRequest) request; GenericValue userLogin = (GenericValue) httpRequest.getSession().getAttribute("userLogin"); - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); if (userLogin == null) userLogin = (GenericValue) httpRequest.getSession().getAttribute("autoUserLogin"); if (userLogin == null) return results; @@ -250,7 +248,7 @@ public class ProductDisplayWorker { } //} - List<GenericValue> reorderProds = FastList.newInstance(); + List<GenericValue> reorderProds = new LinkedList<GenericValue>(); reorderProds.addAll(products.values()); /* @@ -264,7 +262,7 @@ public class ProductDisplayWorker { // sort descending by new metric... BigDecimal occurancesModifier = BigDecimal.ONE; BigDecimal quantityModifier = BigDecimal.ONE; - Map<String, Object> newMetric = FastMap.newInstance(); + Map<String, Object> newMetric = new HashMap<String, Object>(); for (Map.Entry<String, Integer> entry : productOccurances.entrySet()) { String prodId = entry.getKey(); Integer quantity = entry.getValue(); @@ -301,7 +299,7 @@ public class ProductDisplayWorker { if (values == null) return null; if (values.size() == 0) return UtilMisc.toList(values); - List<GenericValue> result = FastList.newInstance(); + List<GenericValue> result = new LinkedList<GenericValue>(); result.addAll(values); Collections.sort(result, new ProductByMapComparator(orderByMap, descending)); 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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -24,7 +24,9 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -33,10 +35,6 @@ import java.util.Set; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -82,7 +80,7 @@ public class ProductPromoWorker { public static final MathContext generalRounding = new MathContext(10); public static List<GenericValue> getStoreProductPromos(Delegator delegator, LocalDispatcher dispatcher, ServletRequest request) { - List<GenericValue> productPromos = FastList.newInstance(); + List<GenericValue> productPromos = new LinkedList<GenericValue>(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); // get the ShoppingCart out of the session. @@ -161,7 +159,7 @@ public class ProductPromoWorker { } public static Set<String> getStoreProductPromoCodes(ShoppingCart cart) { - Set<String> promoCodes = FastSet.newInstance(); + Set<String> promoCodes = new HashSet<String>(); Delegator delegator = cart.getDelegator(); String productStoreId = cart.getProductStoreId(); @@ -198,7 +196,7 @@ public class ProductPromoWorker { } public static List<GenericValue> getProductStorePromotions(ShoppingCart cart, Timestamp nowTimestamp, LocalDispatcher dispatcher) { - List<GenericValue> productPromoList = FastList.newInstance(); + List<GenericValue> productPromoList = new LinkedList<GenericValue>(); Delegator delegator = cart.getDelegator(); @@ -241,7 +239,7 @@ public class ProductPromoWorker { } public static List<GenericValue> getAgreementPromotions(ShoppingCart cart, Timestamp nowTimestamp, LocalDispatcher dispatcher) { - List<GenericValue> productPromoList = FastList.newInstance(); + List<GenericValue> productPromoList = new LinkedList<GenericValue>(); Delegator delegator = cart.getDelegator(); @@ -633,7 +631,7 @@ public class ProductPromoWorker { } // check email address in ProductPromoCodeEmail - List<EntityCondition> validEmailCondList = FastList.newInstance(); + List<EntityCondition> validEmailCondList = new LinkedList<EntityCondition>(); validEmailCondList.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)); validEmailCondList.add(EntityCondition.makeCondition("productPromoCodeId", EntityOperator.EQUALS, productPromoCodeId)); validEmailCondList.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp)); @@ -1462,7 +1460,7 @@ public class ProductPromoWorker { } } - List<String> optionProductIds = FastList.newInstance(); + List<String> optionProductIds = new LinkedList<String>(); String productId = productPromoAction.getString("productId"); GenericValue product = null; @@ -1711,7 +1709,7 @@ public class ProductPromoWorker { Set<String> productIds = ProductPromoWorker.getPromoRuleActionProductIds(productPromoAction, delegator, nowTimestamp); - List<ShoppingCartItem> cartItemsUsed = FastList.newInstance(); + List<ShoppingCartItem> cartItemsUsed = new LinkedList<ShoppingCartItem>(); List<ShoppingCartItem> lineOrderedByBasePriceList = cart.getLineListOrderedByBasePrice(false); Iterator<ShoppingCartItem> lineOrderedByBasePriceIter = lineOrderedByBasePriceList.iterator(); while (quantityDesired.compareTo(BigDecimal.ZERO) > 0 && lineOrderedByBasePriceIter.hasNext()) { @@ -1833,7 +1831,7 @@ public class ProductPromoWorker { } protected static List<ShoppingCartItem> getCartItemsUsed(ShoppingCart cart, GenericValue productPromoAction) { - List<ShoppingCartItem> cartItemsUsed = FastList.newInstance(); + List<ShoppingCartItem> cartItemsUsed = new LinkedList<ShoppingCartItem>(); for (ShoppingCartItem cartItem : cart) { BigDecimal quantityUsed = cartItem.getPromoQuantityCandidateUseActionAndAllConds(productPromoAction); if (quantityUsed.compareTo(BigDecimal.ZERO) > 0) { @@ -1976,7 +1974,7 @@ public class ProductPromoWorker { List<GenericValue> productPromoProducts = EntityUtil.filterByAnd(productPromoProductsAll, UtilMisc.toMap("productPromoRuleId", "_NA_", "productPromoCondSeqId", "_NA_")); productPromoProducts.addAll(EntityUtil.filterByAnd(productPromoProductsAll, UtilMisc.toMap("productPromoRuleId", productPromoCond.get("productPromoRuleId"), "productPromoCondSeqId", productPromoCond.get("productPromoCondSeqId")))); - Set<String> productIds = FastSet.newInstance(); + Set<String> productIds = new HashSet<String>(); makeProductPromoIdSet(productIds, productPromoCategories, productPromoProducts, delegator, nowTimestamp, false); return productIds; } @@ -1991,7 +1989,7 @@ public class ProductPromoWorker { List<GenericValue> productPromoProducts = EntityUtil.filterByAnd(productPromoProductsAll, UtilMisc.toMap("productPromoRuleId", "_NA_", "productPromoActionSeqId", "_NA_")); productPromoProducts.addAll(EntityUtil.filterByAnd(productPromoProductsAll, UtilMisc.toMap("productPromoRuleId", productPromoAction.get("productPromoRuleId"), "productPromoActionSeqId", productPromoAction.get("productPromoActionSeqId")))); - Set<String> productIds = FastSet.newInstance(); + Set<String> productIds = new HashSet<String>(); makeProductPromoIdSet(productIds, productPromoCategories, productPromoProducts, delegator, nowTimestamp, false); return productIds; } @@ -2022,10 +2020,10 @@ public class ProductPromoWorker { List<GenericValue> productPromoCategoriesAll = EntityQuery.use(delegator).from("ProductPromoCategory").where("productPromoId", productPromoId).cache(true).queryList(); List<GenericValue> productPromoProductsAll = EntityQuery.use(delegator).from("ProductPromoProduct").where("productPromoId", productPromoId).cache(true).queryList(); - List<GenericValue> productPromoProductsCond = FastList.newInstance(); - List<GenericValue> productPromoCategoriesCond = FastList.newInstance(); - List<GenericValue> productPromoProductsAction = FastList.newInstance(); - List<GenericValue> productPromoCategoriesAction = FastList.newInstance(); + List<GenericValue> productPromoProductsCond = new LinkedList<GenericValue>(); + List<GenericValue> productPromoCategoriesCond = new LinkedList<GenericValue>(); + List<GenericValue> productPromoProductsAction = new LinkedList<GenericValue>(); + List<GenericValue> productPromoCategoriesAction = new LinkedList<GenericValue>(); for (GenericValue productPromoProduct : productPromoProductsAll) { // if the rule id is null then this is a global promo one, so always include @@ -2080,12 +2078,12 @@ public class ProductPromoWorker { protected static void handleProductPromoCategories(Set<String> productIds, List<GenericValue> productPromoCategories, String productPromoApplEnumId, Delegator delegator, Timestamp nowTimestamp) throws GenericEntityException { boolean include = !"PPPA_EXCLUDE".equals(productPromoApplEnumId); - Set<String> productCategoryIds = FastSet.newInstance(); - Map<String, List<Set<String>>> productCategoryGroupSetListMap = FastMap.newInstance(); + Set<String> productCategoryIds = new HashSet<String>(); + Map<String, List<Set<String>>> productCategoryGroupSetListMap = new HashMap<String, List<Set<String>>>(); for (GenericValue productPromoCategory : productPromoCategories) { if (productPromoApplEnumId.equals(productPromoCategory.getString("productPromoApplEnumId"))) { - Set<String> tempCatIdSet = FastSet.newInstance(); + Set<String> tempCatIdSet = new HashSet<String>(); if ("Y".equals(productPromoCategory.getString("includeSubCategories"))) { ProductSearch.getAllSubCategoryIds(productPromoCategory.getString("productCategoryId"), tempCatIdSet, delegator, nowTimestamp); } else { @@ -2098,7 +2096,7 @@ public class ProductPromoWorker { } else { List<Set<String>> catIdSetList = productCategoryGroupSetListMap.get(andGroupId); if (catIdSetList == null) { - catIdSetList = FastList.newInstance(); + catIdSetList = new LinkedList<Set<String>>(); } catIdSetList.add(tempCatIdSet); } @@ -2134,11 +2132,11 @@ public class ProductPromoWorker { 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(); + List<Set<String>> productIdSetList = new LinkedList<Set<String>>(); for (Set<String> catIdSet : catIdSetList) { // make a Set of productIds including all ids from all categories - Set<String> groupProductIdSet = FastSet.newInstance(); + Set<String> groupProductIdSet = new HashSet<String>(); getAllProductIds(catIdSet, groupProductIdSet, delegator, nowTimestamp, true); productIdSetList.add(groupProductIdSet); } Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java Fri Apr 10 20:22:54 2015 @@ -19,11 +19,10 @@ package org.ofbiz.order.shoppingcart.shipping; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; @@ -86,7 +85,7 @@ public class ShippingEstimateWrapper { } protected void loadEstimates() { - this.shippingEstimates = FastMap.newInstance(); + this.shippingEstimates = new HashMap<GenericValue, BigDecimal>(); if (shippingMethods != null) { for (GenericValue shipMethod : shippingMethods) { String shippingMethodTypeId = shipMethod.getString("shipmentMethodTypeId"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Fri Apr 10 20:22:54 2015 @@ -19,15 +19,14 @@ package org.ofbiz.order.shoppingcart.shipping; import java.math.BigDecimal; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -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.UtilMisc; @@ -148,7 +147,7 @@ public class ShippingEvents { String productStoreId, String supplierPartyId, List<Map<String, Object>> itemInfo, BigDecimal shippableWeight, BigDecimal shippableQuantity, BigDecimal shippableTotal, String partyId, String productStoreShipMethId) { String standardMessage = "A problem occurred calculating shipping. Fees will be calculated offline."; - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); if ("NO_SHIPPING".equals(shipmentMethodTypeId)) { return ServiceUtil.returnSuccess(); @@ -208,7 +207,7 @@ public class ShippingEvents { BigDecimal shippingTotal = BigDecimal.ZERO; // prepare the service invocation fields - Map<String, Object> serviceFields = FastMap.newInstance(); + Map<String, Object> serviceFields = new HashMap<String, Object>(); serviceFields.put("initialEstimateAmt", shippingTotal); serviceFields.put("shippableTotal", shippableTotal); serviceFields.put("shippableQuantity", shippableQuantity); 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=1672752&r1=1672751&r2=1672752&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 Fri Apr 10 20:22:54 2015 @@ -20,6 +20,8 @@ package org.ofbiz.order.shoppinglist; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -30,9 +32,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.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -223,7 +222,7 @@ public class ShoppingListEvents { shoppingListItems = shoppingList.getRelated("ShoppingListItem", null, null, false); if (shoppingListItems == null) { - shoppingListItems = FastList.newInstance(); + shoppingListItems = new LinkedList<GenericValue>(); } // include all items of child lists if flagged to do so @@ -272,7 +271,7 @@ public class ShoppingListEvents { String listId = shoppingListItem.getString("shoppingListId"); String itemId = shoppingListItem.getString("shoppingListItemSeqId"); - Map<String, Object> attributes = FastMap.newInstance(); + Map<String, Object> attributes = new HashMap<String, Object>(); // list items are noted in the shopping cart if (setAsListItem) { attributes.put("shoppingListId", listId); @@ -335,7 +334,7 @@ public class ShoppingListEvents { // do nothing, just won't pass to service if it is null } - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("shoppingListId", request.getParameter("shoppingListId")); serviceInMap.put("shoppingListItemSeqId", request.getParameter("shoppingListItemSeqId")); serviceInMap.put("productId", request.getParameter("add_product_id")); @@ -571,7 +570,7 @@ public class ShoppingListEvents { * Returns Map keyed on item sequence ID containing a list of survey response IDs */ public static Map<String, List<String>> getItemSurveyInfos(List<GenericValue> items) { - Map<String, List<String>> surveyInfos = FastMap.newInstance(); + Map<String, List<String>> surveyInfos = new HashMap<String, List<String>>(); if (UtilValidate.isNotEmpty(items)) { for (GenericValue item : items) { String listId = item.getString("shoppingListId"); @@ -587,7 +586,7 @@ public class ShoppingListEvents { * Returns a list of survey response IDs for a shopping list item */ public static List<String> getItemSurveyInfo(GenericValue item) { - List<String> responseIds = FastList.newInstance(); + List<String> responseIds = new LinkedList<String>(); List<GenericValue> surveyResp = null; try { surveyResp = item.getRelated("ShoppingListItemSurvey", null, null, false); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Fri Apr 10 20:22:54 2015 @@ -21,12 +21,11 @@ package org.ofbiz.order.shoppinglist; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; +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.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -355,7 +354,7 @@ public class ShoppingListServices { GenericValue paymentPref = EntityUtil.getFirst(orh.getPaymentPreferences()); GenericValue shipGroup = EntityUtil.getFirst(orh.getOrderItemShipGroups()); - Map<String, Object> slCtx = FastMap.newInstance(); + Map<String, Object> slCtx = new HashMap<String, Object>(); slCtx.put("shipmentMethodTypeId", shipGroup.get("shipmentMethodTypeId")); slCtx.put("carrierRoleTypeId", shipGroup.get("carrierRoleTypeId")); slCtx.put("carrierPartyId", shipGroup.get("carrierPartyId")); @@ -551,7 +550,7 @@ public class ShoppingListServices { * @return Map with the result of the service, the output parameters */ public static Map<String, Object> updateShoppingListQuantitiesFromOrder(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); String orderId = (String) context.get("orderId"); try { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java Fri Apr 10 20:22:54 2015 @@ -19,13 +19,12 @@ package org.ofbiz.order.test; import java.math.BigDecimal; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Random; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; @@ -85,11 +84,11 @@ public class OrderTestServices { salesChannel = "WEB_SALES_CHANNEL"; } - List<String> productsList = FastList.newInstance(); + List<String> productsList = new LinkedList<String>(); try { if (UtilValidate.isNotEmpty(productId)) { productsList.add(productId); - numberOfProductsPerOrder = Integer.valueOf(1); + numberOfProductsPerOrder = 1; } else { Map<String, Object> result = dispatcher.runSync("getProductCategoryMembers", UtilMisc.toMap("categoryId", productCategoryId)); if (result.get("categoryMembers") != null) { Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java Fri Apr 10 20:22:54 2015 @@ -19,12 +19,11 @@ package org.ofbiz.order.test; import java.math.BigDecimal; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityQuery; @@ -50,7 +49,7 @@ public class PurchaseOrderTest extends O } public void testCreatePurchaseOrder() throws Exception { - Map <String, Object> ctx = FastMap.newInstance(); + Map <String, Object> ctx = new HashMap<String, Object>(); ctx.put("partyId", "Company"); ctx.put("orderTypeId", "PURCHASE_ORDER"); ctx.put("currencyUom", "USD"); @@ -61,30 +60,30 @@ public class PurchaseOrderTest extends O orderItem.set("unitListPrice", BigDecimal.ZERO); orderItem.set("isModifiedPrice", "N"); orderItem.set("statusId", "ITEM_CREATED"); - List <GenericValue> orderItems = FastList.newInstance(); + List <GenericValue> orderItems = new LinkedList<GenericValue>(); orderItems.add(orderItem); ctx.put("orderItems", orderItems); GenericValue orderContactMech = delegator.makeValue("OrderContactMech", UtilMisc.toMap("contactMechPurposeTypeId", "SHIPPING_LOCATION", "contactMechId", "9000")); - List <GenericValue> orderContactMechs = FastList.newInstance(); + List <GenericValue> orderContactMechs = new LinkedList<GenericValue>(); orderContactMechs.add(orderContactMech); ctx.put("orderContactMechs", orderContactMechs); GenericValue orderItemContactMech = delegator.makeValue("OrderItemContactMech", UtilMisc.toMap("contactMechPurposeTypeId", "SHIPPING_LOCATION", "contactMechId", "9000", "orderItemSeqId", "00001")); - List <GenericValue> orderItemContactMechs = FastList.newInstance(); + List <GenericValue> orderItemContactMechs = new LinkedList<GenericValue>(); orderItemContactMechs.add(orderItemContactMech); ctx.put("orderItemContactMechs", orderItemContactMechs); GenericValue orderItemShipGroup = delegator.makeValue("OrderItemShipGroup", UtilMisc.toMap("carrierPartyId", "UPS", "contactMechId", "9000", "isGift", "N", "maySplit", "N", "shipGroupSeqId", "00001", "shipmentMethodTypeId", "NEXT_DAY")); orderItemShipGroup.set("carrierRoleTypeId","CARRIER"); - List <GenericValue> orderItemShipGroupInfo = FastList.newInstance(); + List <GenericValue> orderItemShipGroupInfo = new LinkedList<GenericValue>(); orderItemShipGroupInfo.add(orderItemShipGroup); ctx.put("orderItemShipGroupInfo", orderItemShipGroupInfo); - List <GenericValue> orderTerms = FastList.newInstance(); + List <GenericValue> orderTerms = new LinkedList<GenericValue>(); ctx.put("orderTerms", orderTerms); - List <GenericValue> orderAdjustments = FastList.newInstance(); + List <GenericValue> orderAdjustments = new LinkedList<GenericValue>(); ctx.put("orderAdjustments", orderAdjustments); ctx.put("billToCustomerPartyId", "Company"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java Fri Apr 10 20:22:54 2015 @@ -19,12 +19,10 @@ package org.ofbiz.order.test; import java.math.BigDecimal; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityQuery; @@ -50,7 +48,7 @@ public class SalesOrderTest extends OFBi public void testCreateSalesOrder() throws Exception { Map<String, Object> ctx = UtilMisc.<String, Object>toMap("partyId", "DemoCustomer", "orderTypeId", "SALES_ORDER", "currencyUom", "USD", "productStoreId", "9000"); - List<GenericValue> orderPaymentInfo = FastList.newInstance(); + List<GenericValue> orderPaymentInfo = new LinkedList<GenericValue>(); GenericValue orderContactMech = delegator.makeValue("OrderContactMech", UtilMisc.toMap("contactMechId", "9015", "contactMechPurposeTypeId", "BILLING_LOCATION")); orderPaymentInfo.add(orderContactMech); @@ -59,7 +57,7 @@ public class SalesOrderTest extends OFBi orderPaymentInfo.add(orderPaymentPreference); ctx.put("orderPaymentInfo", orderPaymentInfo); - List<GenericValue> orderItemShipGroupInfo = FastList.newInstance(); + List<GenericValue> orderItemShipGroupInfo = new LinkedList<GenericValue>(); orderContactMech.set("contactMechPurposeTypeId", "SHIPPING_LOCATION"); orderItemShipGroupInfo.add(orderContactMech); @@ -103,12 +101,12 @@ public class SalesOrderTest extends OFBi ctx.put("orderItemShipGroupInfo", orderItemShipGroupInfo); - List<GenericValue> orderAdjustments = FastList.newInstance(); + List<GenericValue> orderAdjustments = new LinkedList<GenericValue>(); orderAdjustment = delegator.makeValue("OrderAdjustment", UtilMisc.toMap("orderAdjustmentTypeId", "PROMOTION_ADJUSTMENT", "productPromoActionSeqId", "01", "productPromoId", "9011", "productPromoRuleId", "01", "amount", new BigDecimal(-3.84))); orderAdjustments.add(orderAdjustment); ctx.put("orderAdjustments", orderAdjustments); - List<GenericValue> orderItems = FastList.newInstance(); + List<GenericValue> orderItems = new LinkedList<GenericValue>(); GenericValue orderItem = delegator.makeValue("OrderItem", UtilMisc.toMap("orderItemSeqId", "00001", "orderItemTypeId", "PRODUCT_ORDER_ITEM", "prodCatalogId", "DemoCatalog", "productId", "GZ-2644", "quantity", BigDecimal.ONE, "selectedAmount", BigDecimal.ZERO)); orderItem.set("isPromo", "N"); orderItem.set("isModifiedPrice", "N"); @@ -127,13 +125,13 @@ public class SalesOrderTest extends OFBi ctx.put("orderItems", orderItems); - List<GenericValue> orderTerms = FastList.newInstance(); + List<GenericValue> orderTerms = new LinkedList<GenericValue>(); ctx.put("orderTerms", orderTerms); - GenericValue OrderContactMech = delegator.makeValue("OrderContactMech", FastMap.newInstance()); + GenericValue OrderContactMech = delegator.makeValue("OrderContactMech"); OrderContactMech.set("contactMechPurposeTypeId", "SHIPPING_LOCATION"); OrderContactMech.set("contactMechId", "10000"); - List<GenericValue> orderContactMechs = FastList.newInstance(); + List<GenericValue> orderContactMechs = new LinkedList<GenericValue>(); orderContactMechs.add(OrderContactMech); ctx.put("placingCustomerPartyId", "DemoCustomer"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java Fri Apr 10 20:22:54 2015 @@ -19,14 +19,13 @@ package org.ofbiz.order.thirdparty.paypal; import java.io.IOException; +import java.util.HashMap; import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; @@ -128,7 +127,7 @@ public class ExpressCheckoutEvents { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); CheckoutType checkoutType = determineCheckoutType(request); if (checkoutType.equals(CheckoutType.STANDARD)) { - Map<String, Object> inMap = FastMap.newInstance(); + Map<String, Object> inMap = new HashMap<String, Object>(); inMap.put("request", request); inMap.put("response", response); try { @@ -180,7 +179,7 @@ public class ExpressCheckoutEvents { } else if (checkoutType.equals(CheckoutType.STANDARD)) { serviceName = "payPalDoExpressCheckout"; } - Map<String, Object> inMap = FastMap.newInstance(); + Map<String, Object> inMap = new HashMap<String, Object>(); inMap.put("userLogin", userLogin); inMap.put("orderPaymentPreference", paymentPref); Map<String, Object> result = null; Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Fri Apr 10 20:22:54 2015 @@ -23,12 +23,11 @@ import java.net.URL; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; @@ -226,8 +225,8 @@ public class ZipSalesServices { String city = shippingAddress.getString("city"); // setup the return lists. - List<GenericValue> orderAdjustments = FastList.newInstance(); - List<List<GenericValue>> itemAdjustments = FastList.newInstance(); + List<GenericValue> orderAdjustments = new LinkedList<GenericValue>(); + List<List<GenericValue>> itemAdjustments = new LinkedList<List<GenericValue>>(); // check for a valid state/province geo String validStates = EntityUtilProperties.getPropertyValue("zipsales.properties", "zipsales.valid.states", delegator); @@ -264,7 +263,7 @@ public class ZipSalesServices { } private static List<GenericValue>getItemTaxList(Delegator delegator, GenericValue item, String zipCode, String city, BigDecimal itemAmount, BigDecimal shippingAmount, boolean isUseTax) throws GeneralException { - List<GenericValue> adjustments = FastList.newInstance(); + List<GenericValue> adjustments = new LinkedList<GenericValue>(); // check the item for tax status if (item != null && item.get("taxable") != null && "N".equals(item.getString("taxable"))) { Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy Fri Apr 10 20:22:54 2015 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -import javolution.util.FastList; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; @@ -31,7 +30,7 @@ if (productStoreId == null) { // Get Gift cards availbale in data giftCardCategories = from("ProductCategory").where("productCategoryTypeId", "GIFT_CARD_CATEGORY").queryList(); -giftCardProductList = FastList.newInstance(); +giftCardProductList = []; if (UtilValidate.isNotEmpty(giftCardCategories)) { giftCardCategories.each { giftCardCategory -> giftCardCategoryMembers = from("ProductCategoryMember").where("productCategoryId", giftCardCategory.productCategoryId).queryList(); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy Fri Apr 10 20:22:54 2015 @@ -26,7 +26,6 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityExpr; import org.ofbiz.entity.condition.EntityOperator; -import javolution.util.FastList; cart = session.getAttribute("shoppingCart"); party = userLogin.getRelatedOne("Party", false); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Fri Apr 10 20:22:54 2015 @@ -26,9 +26,6 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.util.EntityUtil; -import javolution.util.FastMap; -import javolution.util.FastList; - cart = session.getAttribute("shoppingCart"); if (cart) { @@ -84,7 +81,7 @@ if ("SALES_ORDER".equals(cart.getOrderTy companyId = cart.getBillToCustomerPartyId(); if (companyId) { - facilityMaps = FastList.newInstance(); + facilityMaps = [:]; facilities = from("Facility").where("ownerPartyId", companyId).cache(true).queryList(); // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. @@ -96,7 +93,7 @@ if ("SALES_ORDER".equals(cart.getOrderTy } } facilities.each { facility -> - facilityMap = FastMap.newInstance(); + facilityMap = [:]; facilityContactMechValueMaps = ContactMechWorker.getFacilityContactMechValueMaps(delegator, facility.facilityId, false, null); facilityMap.facilityContactMechList = facilityContactMechValueMaps; facilityMap.facility = facility; Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy Fri Apr 10 20:22:54 2015 @@ -25,7 +25,6 @@ import org.ofbiz.base.util.*; import org.ofbiz.product.catalog.*; import org.ofbiz.product.category.*; -import javolution.util.FastMap; CategoryWorker.getRelatedCategories(request, "topLevelList", CatalogWorker.getCatalogTopCategoryId(request, CatalogWorker.getCurrentCatalogId(request)), true); curCategoryId = parameters.category_id ?: parameters.CATEGORY_ID ?: ""; @@ -34,7 +33,7 @@ CategoryWorker.setTrail(request, curCate categoryList = request.getAttribute("topLevelList"); if (categoryList) { - catContentWrappers = FastMap.newInstance(); + catContentWrappers = [:]; CategoryWorker.getCategoryContentWrappers(catContentWrappers, categoryList, request); context.catContentWrappers = catContentWrappers; } Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy Fri Apr 10 20:22:54 2015 @@ -17,7 +17,6 @@ * under the License. */ -import javolution.util.FastList; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; @@ -32,7 +31,7 @@ if (productId != null) { products = EntityUtil.filterByAnd(prodAssocs, [EntityCondition.makeCondition("productAssocTypeId", EntityOperator.NOT_EQUAL, "PRODUCT_VARIANT")]); if (UtilValidate.isNotEmpty(products)) { - productList = FastList.newInstance(); + productList = []; products.each { product -> if (product != null) { String productIdTo = product.getString("productIdTo"); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Fri Apr 10 20:22:54 2015 @@ -31,8 +31,6 @@ import org.ofbiz.product.inventory.Inven import org.ofbiz.product.catalog.CatalogWorker; import org.ofbiz.accounting.payment.*; -import javolution.util.FastMap; - orderId = parameters.orderId; context.orderId = orderId; @@ -348,7 +346,7 @@ if (orderHeader) { facilitiesForShipGroup = [:]; if (orderReadHelper.getBillToParty()) { ownerPartyId = orderReadHelper.getBillToParty().partyId; - Map ownedFacilities = FastMap.newInstance(); + Map ownedFacilities = [:]; shipGroups.each { shipGroup -> lookupMap = [ownerPartyId : ownerPartyId]; if (shipGroup.contactMechId) { @@ -412,8 +410,8 @@ if (orderHeader) { onOrderMap = InventoryWorker.getOutstandingProductQuantitiesForPurchaseOrders(productIds, delegator); context.onOrderProductQuantityMap = onOrderMap; } else { - context.requiredProductQuantityMap = FastMap.newInstance(); - context.onOrderProductQuantityMap = FastMap.newInstance(); + context.requiredProductQuantityMap = [:]; + context.onOrderProductQuantityMap = [:]; } // list to find all the POSTAL_ADDRESS for the shipment party. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy Fri Apr 10 20:22:54 2015 @@ -17,9 +17,6 @@ * under the License. */ -import javolution.util.FastMap; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.util.EntityTypeUtil; import org.ofbiz.entity.util.EntityUtil; @@ -37,12 +34,12 @@ shipGroups = from("OrderItemShipGroup"). context.shipGroups = shipGroups; // method to expand the marketing packages -FastList expandProductGroup(product, quantityInGroup, quantityShipped, quantityOpen, assocType) { - sublines = FastList.newInstance(); +LinkedList expandProductGroup(product, quantityInGroup, quantityShipped, quantityOpen, assocType) { + sublines = []; associations = product.getRelated("MainProductAssoc", [productAssocTypeId : assocType], null, false); associations = EntityUtil.filterByDate(associations); associations.each { association -> - line = FastMap.newInstance(); + line = [:]; line.product = association.getRelatedOne("AssocProduct", false); // determine the quantities @@ -56,9 +53,9 @@ FastList expandProductGroup(product, qua return sublines; } -groupData = FastMap.newInstance(); +groupData = [:]; shipGroups.each { shipGroup -> - data = FastMap.newInstance(); + data = [:]; address = shipGroup.getRelatedOne("PostalAddress", false); data.address = address; @@ -73,14 +70,14 @@ shipGroups.each { shipGroup -> } // the lines in a page, each line being a row of data to display - lines = FastList.newInstance(); + lines = []; // process the order item to ship group associations, each being a line item for the group orderItemAssocs = shipGroup.getRelated("OrderItemShipGroupAssoc", null, ["orderItemSeqId"], false); orderItemAssocs.each { orderItemAssoc -> orderItem = orderItemAssoc.getRelatedOne("OrderItem", false); product = orderItem.getRelatedOne("Product", false); - line = FastMap.newInstance(); + line = []; // the quantity in group quantityInGroup = orderItemAssoc.quantity; Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Fri Apr 10 20:22:54 2015 @@ -21,16 +21,17 @@ package org.ofbiz.party.contact; import java.security.SecureRandom; import java.sql.Timestamp; + import com.ibm.icu.util.Calendar; + import java.util.Date; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Locale; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.crypto.HashCrypt; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; @@ -68,13 +69,13 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createContactMech(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Timestamp now = UtilDateTime.nowTimestamp(); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_CREATE"); @@ -131,13 +132,13 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updateContactMech(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Timestamp now = UtilDateTime.nowTimestamp(); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); boolean isModified = false; String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_UPDATE"); @@ -265,7 +266,7 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> deleteContactMech(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -323,13 +324,13 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createPostalAddress(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Timestamp now = UtilDateTime.nowTimestamp(); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_CREATE"); @@ -395,13 +396,13 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updatePostalAddress(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Timestamp now = UtilDateTime.nowTimestamp(); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); boolean isModified = false; String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_UPDATE"); @@ -563,13 +564,13 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createTelecomNumber(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Timestamp now = UtilDateTime.nowTimestamp(); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_CREATE"); @@ -617,13 +618,13 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updateTelecomNumber(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); Timestamp now = UtilDateTime.nowTimestamp(); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); boolean isModified = false; String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_UPDATE"); @@ -798,7 +799,7 @@ public class ContactMechServices { */ public static Map<String, Object> createPartyContactMechPurpose(DispatchContext ctx, Map<String, ? extends Object> context) { //Debug.logInfo(new Exception(), "In createPartyContactMechPurpose context: " + context, module); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -860,7 +861,7 @@ public class ContactMechServices { public static Map<String, Object> deletePartyContactMechPurposeIfExists(DispatchContext ctx, Map<String, ? extends Object> context) { //Debug.logInfo(new Exception(), "In createPartyContactMechPurpose context: " + context, module); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -916,7 +917,7 @@ public class ContactMechServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> deletePartyContactMechPurpose(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Fri Apr 10 20:22:54 2015 @@ -22,15 +22,14 @@ package org.ofbiz.party.contact; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.servlet.ServletRequest; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; @@ -57,14 +56,14 @@ public class ContactMechWorker { } public static List<Map<String, Object>> getPartyContactMechValueMaps(Delegator delegator, String partyId, boolean showOld, String contactMechTypeId) { - List<Map<String, Object>> partyContactMechValueMaps = FastList.newInstance(); + List<Map<String, Object>> partyContactMechValueMaps = new LinkedList<Map<String,Object>>(); List<GenericValue> allPartyContactMechs = null; try { List<GenericValue> tempCol = EntityQuery.use(delegator).from("PartyContactMech").where("partyId", partyId).queryList(); if (contactMechTypeId != null) { - List<GenericValue> tempColTemp = FastList.newInstance(); + List<GenericValue> tempColTemp = new LinkedList<GenericValue>(); for (GenericValue partyContactMech: tempCol) { GenericValue contactMech = delegator.getRelatedOne("ContactMech", partyContactMech, false); if (contactMech != null && contactMechTypeId.equals(contactMech.getString("contactMechTypeId"))) { @@ -91,7 +90,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } if (contactMech != null) { - Map<String, Object> partyContactMechValueMap = FastMap.newInstance(); + Map<String, Object> partyContactMechValueMap = new HashMap<String, Object>(); partyContactMechValueMaps.add(partyContactMechValueMap); partyContactMechValueMap.put("contactMech", contactMech); @@ -128,14 +127,14 @@ public class ContactMechWorker { } public static List<Map<String, Object>> getFacilityContactMechValueMaps(Delegator delegator, String facilityId, boolean showOld, String contactMechTypeId) { - List<Map<String, Object>> facilityContactMechValueMaps = FastList.newInstance(); + List<Map<String, Object>> facilityContactMechValueMaps = new LinkedList<Map<String,Object>>(); List<GenericValue> allFacilityContactMechs = null; try { List<GenericValue> tempCol = EntityQuery.use(delegator).from("FacilityContactMech").where("facilityId", facilityId).queryList(); if (contactMechTypeId != null) { - List<GenericValue> tempColTemp = FastList.newInstance(); + List<GenericValue> tempColTemp = new LinkedList<GenericValue>(); for (GenericValue partyContactMech: tempCol) { GenericValue contactMech = delegator.getRelatedOne("ContactMech", partyContactMech, false); if (contactMech != null && contactMechTypeId.equals(contactMech.getString("contactMechTypeId"))) { @@ -162,7 +161,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } if (contactMech != null) { - Map<String, Object> facilityContactMechValueMap = FastMap.newInstance(); + Map<String, Object> facilityContactMechValueMap = new HashMap<String, Object>(); facilityContactMechValueMaps.add(facilityContactMechValueMap); facilityContactMechValueMap.put("contactMech", contactMech); @@ -200,7 +199,7 @@ public class ContactMechWorker { public static List<Map<String, GenericValue>> getOrderContactMechValueMaps(Delegator delegator, String orderId) { - List<Map<String, GenericValue>> orderContactMechValueMaps = FastList.newInstance(); + List<Map<String, GenericValue>> orderContactMechValueMaps = new LinkedList<Map<String,GenericValue>>(); List<GenericValue> allOrderContactMechs = null; @@ -224,7 +223,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } if (contactMech != null) { - Map<String, GenericValue> orderContactMechValueMap = FastMap.newInstance(); + Map<String, GenericValue> orderContactMechValueMap = new HashMap<String, GenericValue>(); orderContactMechValueMaps.add(orderContactMechValueMap); orderContactMechValueMap.put("contactMech", contactMech); @@ -260,7 +259,7 @@ public class ContactMechWorker { } public static Collection<Map<String, GenericValue>> getWorkEffortContactMechValueMaps(Delegator delegator, String workEffortId) { - Collection<Map<String, GenericValue>> workEffortContactMechValueMaps = FastList.newInstance(); + Collection<Map<String, GenericValue>> workEffortContactMechValueMaps = new LinkedList<Map<String,GenericValue>>(); List<GenericValue> allWorkEffortContactMechs = null; @@ -284,7 +283,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } if (contactMech != null) { - Map<String, GenericValue> workEffortContactMechValueMap = FastMap.newInstance(); + Map<String, GenericValue> workEffortContactMechValueMap = new HashMap<String, GenericValue>(); workEffortContactMechValueMaps.add(workEffortContactMechValueMap); workEffortContactMechValueMap.put("contactMech", contactMech); @@ -391,7 +390,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } - Collection<GenericValue> purposeTypes = FastList.newInstance(); + Collection<GenericValue> purposeTypes = new LinkedList<GenericValue>(); Iterator<GenericValue> typePurposes = null; try { @@ -495,7 +494,7 @@ public class ContactMechWorker { for (String purposeType: purposeTypes) { List<GenericValue> facilityContactMechPurposes = null; - List<EntityCondition> conditionList = FastList.newInstance(); + List<EntityCondition> conditionList = new LinkedList<EntityCondition>(); conditionList.add(EntityCondition.makeCondition("facilityId", facilityId)); conditionList.add(EntityCondition.makeCondition("contactMechPurposeTypeId", purposeType)); EntityCondition entityCondition = EntityCondition.makeCondition(conditionList); @@ -513,7 +512,7 @@ public class ContactMechWorker { for (GenericValue facilityContactMechPurpose: facilityContactMechPurposes) { String contactMechId = facilityContactMechPurpose.getString("contactMechId"); List<GenericValue> facilityContactMechs = null; - conditionList = FastList.newInstance(); + conditionList = new LinkedList<EntityCondition>(); conditionList.add(EntityCondition.makeCondition("facilityId", facilityId)); conditionList.add(EntityCondition.makeCondition("contactMechId", contactMechId)); entityCondition = EntityCondition.makeCondition(conditionList); @@ -616,7 +615,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } - Collection<GenericValue> purposeTypes = FastList.newInstance(); + Collection<GenericValue> purposeTypes = new LinkedList<GenericValue>(); Iterator<GenericValue> typePurposes = null; try { @@ -710,7 +709,7 @@ public class ContactMechWorker { public static List<Map<String, Object>> getPartyPostalAddresses(ServletRequest request, String partyId, String curContactMechId) { Delegator delegator = (Delegator) request.getAttribute("delegator"); - List<Map<String, Object>> postalAddressInfos = FastList.newInstance(); + List<Map<String, Object>> postalAddressInfos = new LinkedList<Map<String,Object>>(); List<GenericValue> allPartyContactMechs = null; @@ -731,7 +730,7 @@ public class ContactMechWorker { Debug.logWarning(e, module); } if (contactMech != null && "POSTAL_ADDRESS".equals(contactMech.getString("contactMechTypeId")) && !contactMech.getString("contactMechId").equals(curContactMechId)) { - Map<String, Object> postalAddressInfo = FastMap.newInstance(); + Map<String, Object> postalAddressInfo = new HashMap<String, Object>(); postalAddressInfos.add(postalAddressInfo); postalAddressInfo.put("contactMech", contactMech); @@ -758,7 +757,7 @@ public class ContactMechWorker { public static Map<String, Object> getCurrentPostalAddress(ServletRequest request, String partyId, String curContactMechId) { Delegator delegator = (Delegator) request.getAttribute("delegator"); - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); if (curContactMechId != null) { List<GenericValue> partyContactMechs = null; @@ -869,7 +868,7 @@ public class ContactMechWorker { // get all company addresses Delegator delegator = postalAddress.getDelegator(); - List<GenericValue> postalAddresses = FastList.newInstance(); + List<GenericValue> postalAddresses = new LinkedList<GenericValue>(); try { List<GenericValue> partyContactMechs = EntityQuery.use(delegator).from("PartyContactMech") .where("partyId", companyPartyId) Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java Fri Apr 10 20:22:54 2015 @@ -32,14 +32,12 @@ import org.ofbiz.entity.model.ModelEntit import org.ofbiz.service.LocalDispatcher; import javax.servlet.http.HttpServletRequest; + import java.util.*; import java.io.Writer; import java.io.IOException; import java.io.StringWriter; -import javolution.util.FastList; -import javolution.util.FastMap; - /** * WorkEffortContentWrapper; gets work effort content for display */ @@ -224,7 +222,7 @@ public class PartyContentWrapper impleme } if (partyContent != null) { // when rendering the product content, always include the Product and ProductContent records that this comes from - Map<String, Object> inContext = FastMap.newInstance(); + Map<String, Object> inContext = new HashMap<String, Object>(); inContext.put("party", party); inContext.put("partyContent", partyContent); ContentWorker.renderContentAsText(dispatcher, delegator, partyContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false); @@ -239,11 +237,11 @@ public class PartyContentWrapper impleme .filterByDate() .queryList(); - List<String> contentList = FastList.newInstance(); + List<String> contentList = new LinkedList<String>(); if (partyContentList != null) { for (GenericValue partyContent: partyContentList) { StringWriter outWriter = new StringWriter(); - Map<String, Object> inContext = FastMap.newInstance(); + Map<String, Object> inContext = new HashMap<String, Object>(); inContext.put("party", party); inContext.put("partyContent", partyContent); ContentWorker.renderContentAsText(dispatcher, delegator, partyContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java Fri Apr 10 20:22:54 2015 @@ -20,11 +20,10 @@ package org.ofbiz.party.party; import java.sql.Timestamp; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; @@ -56,7 +55,7 @@ public class PartyRelationshipHelper { String partyRelationshipTypeId = (String) partyRelationshipValues.get("partyRelationshipTypeId") ; Timestamp fromDate = UtilDateTime.nowTimestamp(); - List<EntityCondition> condList = FastList.newInstance(); + List<EntityCondition> condList = new LinkedList<EntityCondition>(); condList.add(EntityCondition.makeCondition("partyIdFrom", partyIdFrom)); condList.add(EntityCondition.makeCondition("partyIdTo", partyIdTo)); condList.add(EntityCondition.makeCondition("roleTypeIdFrom", roleTypeIdFrom)); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java Fri Apr 10 20:22:54 2015 @@ -19,12 +19,11 @@ package org.ofbiz.party.party; +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.UtilDateTime; import org.ofbiz.base.util.UtilMisc; @@ -57,7 +56,7 @@ public class PartyRelationshipServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createPartyRelationshipType(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -109,7 +108,7 @@ public class PartyRelationshipServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createUpdatePartyRelationshipAndRoles(DispatchContext ctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); LocalDispatcher dispatcher = ctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |