svn commit: r1672752 [6/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [6/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java Fri Apr 10 20:22:54 2015 @@ -21,11 +21,10 @@ package org.ofbiz.manufacturing.bom; import java.math.BigDecimal; import java.util.Date; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; @@ -106,7 +105,7 @@ public class BOMTree { .where("productId", productId, "productFeatureApplTypeId", "STANDARD_FEATURE") .queryList(); - List<GenericValue> productFeatures = FastList.newInstance(); + List<GenericValue> productFeatures = new LinkedList<GenericValue>(); GenericValue oneProductFeatureAppl = null; for (int i = 0; i < productFeaturesAppl.size(); i++) { oneProductFeatureAppl = productFeaturesAppl.get(i); @@ -184,7 +183,7 @@ public class BOMTree { * */ public boolean isConfigured() { - List<BOMNode> notConfiguredParts = FastList.newInstance(); + List<BOMNode> notConfiguredParts = new LinkedList<BOMNode>(); root.isConfigured(notConfiguredParts); return (notConfiguredParts.size() == 0); } @@ -301,8 +300,8 @@ public class BOMTree { * @return List containing all the tree's productId. */ public List<String> getAllProductsId() { - List<BOMNode> nodeArr = FastList.newInstance(); - List<String> productsId = FastList.newInstance(); + List<BOMNode> nodeArr = new LinkedList<BOMNode>(); + List<String> productsId = new LinkedList<String>(); print(nodeArr); for (int i = 0; i < nodeArr.size(); i++) { productsId.add((nodeArr.get(i)).getProduct().getString("productId")); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Fri Apr 10 20:22:54 2015 @@ -22,11 +22,10 @@ package org.ofbiz.manufacturing.jobshopm import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Iterator; +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.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -329,7 +328,7 @@ public class ProductionRun { if (productionRunRoutingTasks == null) this.getProductionRunRoutingTasks(); if (productionRunRoutingTasks != null) { try { - productionRunComponents = FastList.newInstance(); + productionRunComponents = new LinkedList<GenericValue>(); GenericValue routingTask; for (Iterator<GenericValue> iter = productionRunRoutingTasks.iterator(); iter.hasNext();) { routingTask = iter.next(); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java Fri Apr 10 20:22:54 2015 @@ -21,14 +21,13 @@ package org.ofbiz.manufacturing.jobshopm import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Collection; +import java.util.HashMap; import java.util.Map; import javax.servlet.http.HttpServletRequest; 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.UtilHttp; import org.ofbiz.base.util.UtilMisc; @@ -62,7 +61,7 @@ public class ProductionRunEvents { } Collection<Map<String, Object>> componentRows = UtilHttp.parseMultiFormData(parameters); - Map<GenericPK, Object> componentsLocationMap = FastMap.newInstance(); + Map<GenericPK, Object> componentsLocationMap = new HashMap<GenericPK, Object>(); for (Map<String, Object>componentRow : componentRows) { Timestamp fromDate = null; try { Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java Fri Apr 10 20:22:54 2015 @@ -18,11 +18,10 @@ *******************************************************************************/ package org.ofbiz.manufacturing.jobshopmgt; +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.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -54,7 +53,7 @@ public class ProductionRunHelper { * <li> the productionRunProduct */ public static Map<String, Object> getProductionRun(Delegator delegator, String productionRunId) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); try { if (productionRunId != null) { Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri Apr 10 20:22:54 2015 @@ -21,16 +21,15 @@ package org.ofbiz.manufacturing.jobshopm import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; +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 java.util.SortedMap; import java.util.TreeMap; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -89,7 +88,7 @@ public class ProductionRunServices { * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> cancelProductionRun(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"); @@ -107,7 +106,7 @@ public class ProductionRunServices { if (currentStatusId.equals("PRUN_CREATED") || currentStatusId.equals("PRUN_DOC_PRINTED") || currentStatusId.equals("PRUN_SCHEDULED")) { try { // First of all, make sure that there aren't production runs that depend on this one. - List<ProductionRun> mandatoryWorkEfforts = FastList.newInstance(); + List<ProductionRun> mandatoryWorkEfforts = new LinkedList<ProductionRun>(); ProductionRunHelper.getLinkedProductionRuns(delegator, dispatcher, productionRunId, mandatoryWorkEfforts); for (int i = 1; i < mandatoryWorkEfforts.size(); i++) { GenericValue mandatoryWorkEffort = (mandatoryWorkEfforts.get(i)).getGenericValue(); @@ -115,7 +114,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChangedMandatoryProductionRunFound", locale)); } } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); // change the production run (header) status to PRUN_CANCELLED serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_CANCELLED"); @@ -182,7 +181,7 @@ public class ProductionRunServices { * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> createProductionRun(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"); @@ -246,7 +245,7 @@ public class ProductionRunServices { // The components are retrieved using the getManufacturingComponents service // (that performs a bom breakdown and if needed runs the configurator). List<BOMNode> components = null; - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.put("productId", productId); // the product that we want to manufacture serviceContext.put("quantity", pRQuantity); // the quantity that we want to manufacture serviceContext.put("userLogin", userLogin); @@ -556,7 +555,7 @@ public class ProductionRunServices { } public static Map<String, Object> changeProductionRunStatus(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"); @@ -580,7 +579,7 @@ public class ProductionRunServices { // PRUN_CREATED --> PRUN_SCHEDULED if ("PRUN_CREATED".equals(currentStatusId) && "PRUN_SCHEDULED".equals(statusId)) { // change the production run status to PRUN_SCHEDULED - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", statusId); @@ -612,7 +611,7 @@ public class ProductionRunServices { // PRUN_CREATED or PRUN_SCHEDULED --> PRUN_DOC_PRINTED if ((currentStatusId.equals("PRUN_CREATED") || currentStatusId.equals("PRUN_SCHEDULED")) && (statusId == null || statusId.equals("PRUN_DOC_PRINTED"))) { // change only the production run (header) status to PRUN_DOC_PRINTED - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_DOC_PRINTED"); @@ -664,7 +663,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChanged", locale)); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_RUNNING"); @@ -685,7 +684,7 @@ public class ProductionRunServices { // this should be called only when the last task is completed if (currentStatusId.equals("PRUN_RUNNING") && (statusId == null || statusId.equals("PRUN_COMPLETED"))) { // change only the production run (header) status to PRUN_COMPLETED - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_COMPLETED"); @@ -705,7 +704,7 @@ public class ProductionRunServices { // PRUN_COMPLETED --> PRUN_CLOSED if (currentStatusId.equals("PRUN_COMPLETED") && (statusId == null || statusId.equals("PRUN_CLOSED"))) { // change the production run status to PRUN_CLOSED - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", productionRunId); serviceContext.put("currentStatusId", "PRUN_CLOSED"); @@ -739,7 +738,7 @@ public class ProductionRunServices { } public static Map<String, Object> changeProductionRunTaskStatus(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"); @@ -799,7 +798,7 @@ public class ProductionRunServices { if (productionRun.getGenericValue().getString("currentStatusId").equals("PRUN_CREATED")) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunTaskCannotStartDocsNotPrinted", locale)); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", taskId); serviceContext.put("currentStatusId", "PRUN_RUNNING"); @@ -832,7 +831,7 @@ public class ProductionRunServices { // PRUN_RUNNING --> PRUN_COMPLETED // this should be called only when the last task is completed if (currentStatusId.equals("PRUN_RUNNING") && (statusId == null || statusId.equals("PRUN_COMPLETED"))) { - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); if (issueAllComponents.booleanValue()) { // Issue all the components, if this task needs components and they still need to be issued try { @@ -974,7 +973,7 @@ public class ProductionRunServices { } public static Map<String, Object> getWorkEffortCosts(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 workEffortId = (String)context.get("workEffortId"); Locale locale = (Locale) context.get("locale"); @@ -1008,7 +1007,7 @@ public class ProductionRunServices { } public static Map<String, Object> getProductionRunCost(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(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1152,7 +1151,7 @@ public class ProductionRunServices { } // materials costs: these are the costs derived from the materials used by the production run task try { - Map<String, BigDecimal> materialsCostByCurrency = FastMap.newInstance(); + Map<String, BigDecimal> materialsCostByCurrency = new HashMap<String, BigDecimal>(); for (GenericValue inventoryConsumed : EntityQuery.use(delegator).from("WorkEffortAndInventoryAssign") .where("workEffortId", productionRunTaskId).queryList()) { BigDecimal quantity = inventoryConsumed.getBigDecimal("quantity"); @@ -1266,7 +1265,7 @@ public class ProductionRunServices { } public static Map<String, Object> addProductionRunComponent(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(); Timestamp now = UtilDateTime.nowTimestamp(); @@ -1316,7 +1315,7 @@ public class ProductionRunServices { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", workEffortId); serviceContext.put("productId", productId); @@ -1337,7 +1336,7 @@ public class ProductionRunServices { } public static Map<String, Object> updateProductionRunComponent(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"); @@ -1390,7 +1389,7 @@ public class ProductionRunServices { Debug.logWarning(e.getMessage(), module); return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", theComponent.getString("workEffortId")); serviceContext.put("workEffortGoodStdTypeId", "PRUNT_PROD_NEEDED"); @@ -1411,7 +1410,7 @@ public class ProductionRunServices { } public static Map<String, Object> addProductionRunRoutingTask(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"); @@ -1487,7 +1486,7 @@ public class ProductionRunServices { long totalTime = ProductionRun.getEstimatedTaskTime(routingTask, pRQuantity, dispatcher); estimatedCompletionDate = TechDataServices.addForward(TechDataServices.getTechDataCalendar(routingTask), estimatedStartDate, totalTime); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("priority", priority); serviceContext.put("workEffortPurposeTypeId", routingTask.get("workEffortPurposeTypeId")); @@ -1555,7 +1554,7 @@ public class ProductionRunServices { } public static Map<String, Object> productionRunProduce(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"); @@ -1583,7 +1582,7 @@ public class ProductionRunServices { autoCreateLot = Boolean.FALSE; } - List<String> inventoryItemIds = FastList.newInstance(); + List<String> inventoryItemIds = new LinkedList<String>(); result.put("inventoryItemIds", inventoryItemIds); // The production run is loaded ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); @@ -1707,7 +1706,7 @@ public class ProductionRunServices { serviceContext.put("inventoryItemId", inventoryItemId); resultService = dispatcher.runSync("createWorkEffortInventoryProduced", serviceContext); // Recompute reservations - serviceContext = FastMap.newInstance(); + serviceContext = new HashMap<String, Object>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); @@ -1745,7 +1744,7 @@ public class ProductionRunServices { serviceContext.put("inventoryItemId", inventoryItemId); resultService = dispatcher.runSync("createWorkEffortInventoryProduced", serviceContext); // Recompute reservations - serviceContext = FastMap.newInstance(); + serviceContext = new HashMap<String, Object>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); if (orderItem != null) { @@ -1775,7 +1774,7 @@ public class ProductionRunServices { } public static Map<String, Object> productionRunDeclareAndProduce(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"); @@ -1832,7 +1831,7 @@ public class ProductionRunServices { } } try { - Map<String, Object> inputMap = FastMap.newInstance(); + Map<String, Object> inputMap = new HashMap<String, Object>(); inputMap.putAll(context); inputMap.remove("componentsLocationMap"); result = dispatcher.runSync("productionRunProduce", inputMap); @@ -1844,7 +1843,7 @@ public class ProductionRunServices { } public static Map<String, Object> productionRunTaskProduce(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(); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -1872,7 +1871,7 @@ public class ProductionRunServices { ProductionRun productionRun = new ProductionRun(productionRunTaskId, delegator, dispatcher); facilityId = productionRun.getGenericValue().getString("facilityId"); } - List<String> inventoryItemIds = FastList.newInstance(); + List<String> inventoryItemIds = new LinkedList<String>(); if ("SERIALIZED_INV_ITEM".equals(inventoryItemTypeId)) { try { int numOfItems = quantity.intValue(); @@ -1908,7 +1907,7 @@ public class ProductionRunServices { resultService = dispatcher.runSync("createWorkEffortInventoryProduced", serviceContext); inventoryItemIds.add(inventoryItemId); // Recompute reservations - serviceContext = FastMap.newInstance(); + serviceContext = new HashMap<String, Object>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); @@ -1949,7 +1948,7 @@ public class ProductionRunServices { resultService = dispatcher.runSync("createWorkEffortInventoryProduced", serviceContext); inventoryItemIds.add(inventoryItemId); // Recompute reservations - serviceContext = FastMap.newInstance(); + serviceContext = new HashMap<String, Object>(); serviceContext.put("inventoryItemId", inventoryItemId); serviceContext.put("userLogin", userLogin); resultService = dispatcher.runSync("balanceInventoryItems", serviceContext); @@ -2027,7 +2026,7 @@ public class ProductionRunServices { } public static Map<String, Object> updateProductionRunTask(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"); @@ -2177,7 +2176,7 @@ public class ProductionRunServices { GenericValue timeEntry = delegator.makeValue("TimeEntry", timeEntryFields); timeEntry.create(); */ - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("workEffortId", workEffortId); if (addTaskTime != null) { @@ -2233,7 +2232,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunFromRequirement(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"); @@ -2258,7 +2257,7 @@ public class ProductionRunServices { if (quantity == null) { quantity = requirement.getBigDecimal("quantity"); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("productId", requirement.getString("productId")); serviceContext.put("quantity", quantity); @@ -2293,7 +2292,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunFromConfiguration(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"); @@ -2327,7 +2326,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(e.getMessage()); } - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.clear(); serviceContext.put("productId", instanceProductId); serviceContext.put("pRQuantity", quantity); @@ -2344,7 +2343,7 @@ public class ProductionRunServices { String productionRunId = (String)resultService.get("productionRunId"); result.put("productionRunId", productionRunId); - Map<String, BigDecimal> components = FastMap.newInstance(); + Map<String, BigDecimal> components = new HashMap<String, BigDecimal>(); for (ConfigOption co : config.getSelectedOptions()) { //components.addAll(co.getComponents()); for (GenericValue selComponent : co.getComponents()) { @@ -2431,7 +2430,7 @@ public class ProductionRunServices { componentQuantity = BigDecimal.ONE; } resultService = null; - serviceContext = FastMap.newInstance(); + serviceContext = new HashMap<String, Object>(); serviceContext.put("productionRunId", productionRunId); serviceContext.put("productId", productId); serviceContext.put("estimatedQuantity", componentQuantity); @@ -2455,7 +2454,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunForMktgPkg(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"); @@ -2510,7 +2509,7 @@ public class ProductionRunServices { // how many should we produce? If there already is some inventory, then just produce enough to bring ATP back up to zero. BigDecimal qtyRequired = BigDecimal.ZERO.subtract(existingAtp); // ok so that's how many we WANT to produce, but let's check how many we can actually produce based on the available components - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.put("productId", orderItem.getString("productId")); serviceContext.put("facilityId", facilityId); serviceContext.put("userLogin", userLogin); @@ -2567,7 +2566,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunsForOrder(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue)context.get("userLogin"); @@ -2620,7 +2619,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, "OrderProblemsReadingOrderItemInformation", UtilMisc.toMap("errorString", gee.getMessage()), locale)); } } - List<String> productionRuns = FastList.newInstance(); + List<String> productionRuns = new LinkedList<String>(); for (int i = 0; i < orderItems.size(); i++) { GenericValue orderItemOrShipGroupAssoc = orderItems.get(i); String productId = null; @@ -2673,7 +2672,7 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturinWorkOrderItemFulfillmentError", UtilMisc.toMap("errorString", gee.getMessage()), locale)); } try { - List<BOMNode> components = FastList.newInstance(); + List<BOMNode> components = new LinkedList<BOMNode>(); BOMTree tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.setRootAmount(amount); @@ -2688,7 +2687,7 @@ public class ProductionRunServices { } public static Map<String, Object> createProductionRunsForProductBom(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin =(GenericValue)context.get("userLogin"); @@ -2705,7 +2704,7 @@ public class ProductionRunServices { quantity = BigDecimal.ONE; } try { - List<BOMNode> components = FastList.newInstance(); + List<BOMNode> components = new LinkedList<BOMNode>(); BOMTree tree = new BOMTree(productId, "MANUF_COMPONENT", startDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.setRootAmount(BigDecimal.ZERO); @@ -2717,7 +2716,7 @@ public class ProductionRunServices { if (workEffortId == null) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunIsNotRequiredForProductId", UtilMisc.toMap("productId", productId, "startDate", startDate), locale)); } - List<String> productionRuns = FastList.newInstance(); + List<String> productionRuns = new LinkedList<String>(); result.put("productionRuns" , productionRuns); result.put("productionRunId" , workEffortId); return result; @@ -2741,7 +2740,7 @@ public class ProductionRunServices { String taskId = (String) context.get("taskId"); try { - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); Map<String, Object> resultService = null; GenericValue task = EntityQuery.use(delegator).from("WorkEffort").where("workEffortId", taskId).queryOne(); String currentStatusId = task.getString("currentStatusId"); @@ -2794,7 +2793,7 @@ public class ProductionRunServices { oneTask = tasks.get(i); taskId = oneTask.getString("workEffortId"); try { - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.put("productionRunId", productionRunId); serviceContext.put("taskId", taskId); serviceContext.put("userLogin", userLogin); @@ -2863,7 +2862,7 @@ public class ProductionRunServices { String startAllTasks = (String) context.get("startAllTasks"); try { - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); // Change the task status to running if (statusId.equals("PRUN_DOC_PRINTED") || @@ -2931,13 +2930,13 @@ public class ProductionRunServices { } BigDecimal totQty = BigDecimal.ZERO; try { - List<EntityCondition> findOutgoingProductionRunsConds = FastList.newInstance(); + List<EntityCondition> findOutgoingProductionRunsConds = new LinkedList<EntityCondition>(); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "WEGS_CREATED")); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.LESS_THAN_EQUAL_TO, startDate)); - List<EntityCondition> findOutgoingProductionRunsStatusConds = FastList.newInstance(); + List<EntityCondition> findOutgoingProductionRunsStatusConds = new LinkedList<EntityCondition>(); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_CREATED")); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_SCHEDULED")); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_DOC_PRINTED")); @@ -3006,7 +3005,7 @@ public class ProductionRunServices { } public static Map<String, Object> decomposeInventoryItem(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(); Timestamp now = UtilDateTime.nowTimestamp(); @@ -3015,7 +3014,7 @@ public class ProductionRunServices { // Mandatory input fields String inventoryItemId = (String)context.get("inventoryItemId"); BigDecimal quantity = (BigDecimal)context.get("quantity"); - List<String> inventoryItemIds = FastList.newInstance(); + List<String> inventoryItemIds = new LinkedList<String>(); try { GenericValue inventoryItem = EntityQuery.use(delegator).from("InventoryItem") .where("inventoryItemId", inventoryItemId).queryOne(); @@ -3115,7 +3114,7 @@ public class ProductionRunServices { Delegator delegator = ctx.getDelegator(); Timestamp now = UtilDateTime.nowTimestamp(); Locale locale = (Locale) context.get("locale"); - Map<String, TreeMap<Timestamp, Object>> products = FastMap.newInstance(); + Map<String, TreeMap<Timestamp, Object>> products = new HashMap<String, TreeMap<Timestamp,Object>>(); try { List<GenericValue> resultList = EntityQuery.use(delegator).from("WorkEffortAndGoods") @@ -3151,7 +3150,7 @@ public class ProductionRunServices { TreeMap<Timestamp, Object> productMap = products.get(productId); if (!productMap.containsKey(estimatedShipDate)) { productMap.put(estimatedShipDate, - UtilMisc.<String, Object>toMap("remainingQty", BigDecimal.ZERO, "reservations", FastList.newInstance())); + UtilMisc.<String, Object>toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList())); } Map<String, Object> dateMap = UtilGenerics.checkMap(productMap.get(estimatedShipDate)); BigDecimal remainingQty = (BigDecimal)dateMap.get("remainingQty"); @@ -3200,7 +3199,7 @@ public class ProductionRunServices { } TreeMap<Timestamp, Object> productMap = products.get(productId); if (!productMap.containsKey(estimatedShipDate)) { - productMap.put(estimatedShipDate, UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", FastList.newInstance())); + productMap.put(estimatedShipDate, UtilMisc.toMap("remainingQty", BigDecimal.ZERO, "reservations", new LinkedList())); } Map<String, Object> dateMap = UtilGenerics.checkMap(productMap.get(estimatedShipDate)); BigDecimal remainingQty = (BigDecimal)dateMap.get("remainingQty"); @@ -3210,7 +3209,7 @@ public class ProductionRunServices { } // backorders - List<EntityCondition> backordersCondList = FastList.newInstance(); + List<EntityCondition> backordersCondList = new LinkedList<EntityCondition>(); backordersCondList.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.NOT_EQUAL, null)); backordersCondList.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.GREATER_THAN, BigDecimal.ZERO)); //backordersCondList.add(EntityCondition.makeCondition(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "ITEM_CREATED"), EntityOperator.OR, EntityCondition.makeCondition("statusId", EntityOperator.LESS_THAN, "ITEM_APPROVED"))); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Fri Apr 10 20:22:54 2015 @@ -21,14 +21,13 @@ package org.ofbiz.manufacturing.mrp; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.HashMap; +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.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -92,7 +91,7 @@ public class MrpServices { // Proposed requirements are deleted listResult = null; - List<GenericValue> listResultRoles = FastList.newInstance(); + List<GenericValue> listResultRoles = new LinkedList<GenericValue>(); try { listResult = EntityQuery.use(delegator).from("Requirement") .where("requirementTypeId", "PRODUCT_REQUIREMENT", @@ -494,7 +493,7 @@ public class MrpServices { } } } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); Debug.logInfo("return from initMrpEvent", module); return result; @@ -833,8 +832,8 @@ public class MrpServices { // if there are 3 levels with no inventoryEvenPanned we stop } while (bomLevelWithNoEvent < 3); - result = FastMap.newInstance(); - List<Object> msgResult = FastList.newInstance(); + result = new HashMap<String, Object>(); + List<Object> msgResult = new LinkedList<Object>(); result.put("msgResult", msgResult); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); Debug.logInfo("return from executeMrp", module); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java Fri Apr 10 20:22:54 2015 @@ -21,13 +21,12 @@ package org.ofbiz.manufacturing.mrp; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Map; -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; @@ -115,7 +114,7 @@ public class ProposedOrder { if (routing == null) { // try to find a routing linked to the virtual product BOMTree tree = null; - List<BOMNode> components = FastList.newInstance(); + List<BOMNode> components = new LinkedList<BOMNode>(); try { tree = new BOMTree(product.getString("productId"), "MANUF_COMPONENT", requiredByDate, BOMTree.EXPLOSION_SINGLE_LEVEL, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); @@ -136,7 +135,7 @@ public class ProposedOrder { } } if (routing != null) { - result = FastMap.newInstance(); + result = new HashMap<String, Object>(); //Looks for all the routingTask (ordered by inversed (begin from the end) sequence number) if (listRoutingTaskAssoc == null) { try { @@ -234,7 +233,7 @@ public class ProposedOrder { Map<String, Object> parameters = UtilMisc.<String, Object>toMap("userLogin", userLogin); if (isBuilt) { try { - List<BOMNode> bom = FastList.newInstance(); + List<BOMNode> bom = new LinkedList<BOMNode>(); BOMTree tree = new BOMTree(productId, "MANUF_COMPONENT", null, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.print(bom); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java Fri Apr 10 20:22:54 2015 @@ -19,11 +19,10 @@ package org.ofbiz.manufacturing.routing; import java.math.BigDecimal; +import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.entity.Delegator; @@ -51,7 +50,7 @@ public class RoutingServices { * @return Map with the result of the service, the output parameters. */ public static Map<String, Object> getEstimatedTaskTime(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"); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,12 @@ package org.ofbiz.manufacturing.techdata import java.sql.Time; import java.sql.Timestamp; +import java.util.HashMap; +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.UtilDateTime; import org.ofbiz.base.util.UtilMisc; @@ -64,13 +63,13 @@ public class TechDataServices { */ public static Map<String, Object> lookupRoutingTask(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Locale locale = (Locale) context.get("locale"); String workEffortName = (String) context.get("workEffortName"); String fixedAssetId = (String) context.get("fixedAssetId"); List<GenericValue> listRoutingTask = null; - List<EntityExpr> constraints = FastList.newInstance(); + List<EntityExpr> constraints = new LinkedList<EntityExpr>(); if (UtilValidate.isNotEmpty(workEffortName)) { constraints.add(EntityCondition.makeCondition("workEffortName", EntityOperator.GREATER_THAN_EQUAL_TO, workEffortName)); @@ -91,7 +90,7 @@ public class TechDataServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingTechDataWorkEffortNotExist", UtilMisc.toMap("errorString", e.toString()), locale)); } if (listRoutingTask == null) { - listRoutingTask = FastList.newInstance(); + listRoutingTask = new LinkedList<GenericValue>(); } if (listRoutingTask.size() == 0) { //FIXME is it correct ? @@ -111,15 +110,15 @@ public class TechDataServices { */ public static Map<String, Object> checkRoutingTaskAssoc(DispatchContext ctx, Map<String, ? extends Object> context) { Delegator delegator = ctx.getDelegator(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); String sequenceNumNotOk = "N"; Locale locale = (Locale) context.get("locale"); String workEffortIdFrom = (String) context.get("workEffortIdFrom"); String workEffortIdTo = (String) context.get("workEffortIdTo"); String workEffortAssocTypeId = (String) context.get("workEffortAssocTypeId"); Long sequenceNum = (Long) context.get("sequenceNum"); - Timestamp fromDate = (Timestamp) context.get("fromDate"); - Timestamp thruDate = (Timestamp) context.get("thruDate"); + Timestamp fromDate = (Timestamp) context.get("fromDate"); + Timestamp thruDate = (Timestamp) context.get("thruDate"); String create = (String) context.get("create"); boolean createProcess = (create !=null && create.equals("Y")) ? true : false; @@ -217,7 +216,7 @@ public class TechDataServices { * @return a map with the capacity (Double) available and moveDay (int): the number of day it's necessary to move to have capacity available */ public static Map<String, Object> dayStartCapacityAvailable(GenericValue techDataCalendarWeek, int dayStart) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); int moveDay = 0; Double capacity = null; Time startTime = null; @@ -301,7 +300,7 @@ public class TechDataServices { * @return a map with Timestamp dateTo, Double nextCapacity */ public static Map<String, Object> startNextDay(GenericValue techDataCalendar, Timestamp dateFrom) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Timestamp dateTo = null; GenericValue techDataCalendarWeek = null; // TODO read TechDataCalendarExcWeek to manage execption week (maybe it's needed to refactor the entity definition @@ -351,7 +350,7 @@ public class TechDataServices { amount = 0; } else amount -= nextCapacity; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); while (amount > 0) { result = startNextDay(techDataCalendar, dateTo); dateTo = (Timestamp) result.get("dateTo"); @@ -372,7 +371,7 @@ public class TechDataServices { * @return a map with the capacity (Double) available, the startTime and moveDay (int): the number of day it's necessary to move to have capacity available */ public static Map<String, Object> dayEndCapacityAvailable(GenericValue techDataCalendarWeek, int dayEnd) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); int moveDay = 0; Double capacity = null; Time startTime = null; @@ -455,7 +454,7 @@ public class TechDataServices { * @return a map with Timestamp dateTo, Double previousCapacity */ public static Map<String, Object> endPreviousDay(GenericValue techDataCalendar, Timestamp dateFrom) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Timestamp dateTo = null; GenericValue techDataCalendarWeek = null; // TODO read TechDataCalendarExcWeek to manage exception week (maybe it's needed to refactor the entity definition @@ -507,7 +506,7 @@ public class TechDataServices { amount = 0; } else amount -= previousCapacity; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); while (amount > 0) { result = endPreviousDay(techDataCalendar, dateTo); dateTo = (Timestamp) result.get("dateTo"); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Fri Apr 10 20:22:54 2015 @@ -25,8 +25,6 @@ import org.ofbiz.entity.GenericValue; import org.ofbiz.widget.renderer.html.HtmlFormWrapper; import org.ofbiz.manufacturing.jobshopmgt.ProductionRun; -import javolution.util.FastList; - productionRunId = parameters.productionRunId ?: parameters.workEffortId; if (productionRunId) { ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); @@ -160,9 +158,9 @@ if (productionRunId) { // Product components list productionRunComponents = productionRun.getProductionRunComponents(); - productionRunComponentsData = FastList.newInstance(); - productionRunComponentsDataReadyForIssuance = FastList.newInstance(); - productionRunComponentsAlreadyIssued = FastList.newInstance(); + productionRunComponentsData = []; + productionRunComponentsDataReadyForIssuance = []; + productionRunComponentsAlreadyIssued = []; if (productionRunComponents) { productionRunComponents.each { component -> product = component.getRelatedOne("Product", false); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy Fri Apr 10 20:22:54 2015 @@ -19,13 +19,11 @@ import org.ofbiz.manufacturing.jobshopmgt.ProductionRun; -import javolution.util.FastList; - productionRunId = parameters.productionRunId ?: parameters.workEffortId; if (productionRunId) { ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher); if (productionRun.exist()) { - productionRunFixedAssetsData = FastList.newInstance(); + productionRunFixedAssetsData = []; productionRunRoutingTasks = productionRun.getProductionRunRoutingTasks(); productionRunRoutingTasks.each { prodRunTask -> taskFixedAssets = prodRunTask.getRelated("WorkEffortFixedAssetAssign", null, null, false); Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java (original) +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java Fri Apr 10 20:22:54 2015 @@ -18,12 +18,14 @@ *******************************************************************************/ package org.ofbiz.marketing.report; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; -import java.util.*; -import javolution.util.FastList; -import javolution.util.FastMap; /** * Marketing Report Helper @@ -42,11 +44,11 @@ public class ReportHelper { * conversionRate - # orders/# visits */ public static List<Map<String, Object>> calcConversionRates(List<GenericValue> visits, List<GenericValue> orders, String keyFieldName) { - List<Map<String, Object>> conversionRates = FastList.newInstance(); + List<Map<String, Object>> conversionRates = new LinkedList<Map<String, Object>>(); // loop through all the visits for (GenericValue visit: visits) { - Map<String, Object> reportValue = FastMap.newInstance(); + Map<String, Object> reportValue = new HashMap<String, Object>(); reportValue.put(keyFieldName, visit.getString(keyFieldName)); reportValue.put("visits", visit.getLong("visitId")); // actually # of visits Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original) +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Fri Apr 10 20:22:54 2015 @@ -19,6 +19,7 @@ package org.ofbiz.marketing.tracking; import java.sql.Timestamp; +import java.util.LinkedList; import java.util.List; import javax.servlet.http.Cookie; @@ -26,8 +27,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; @@ -286,7 +285,7 @@ public class TrackingCodeEvents { String prodCatalogId = trackingCode.getString("prodCatalogId"); if (UtilValidate.isNotEmpty(prodCatalogId)) { session.setAttribute("CURRENT_CATALOG_ID", prodCatalogId); - CategoryWorker.setTrail(request, FastList.<String>newInstance()); + CategoryWorker.setTrail(request, new LinkedList()); } // if forward/redirect is needed, do a response.sendRedirect and return null to tell the control servlet to not do any other requests/views @@ -435,7 +434,7 @@ public class TrackingCodeEvents { public static List<GenericValue> makeTrackingCodeOrders(HttpServletRequest request) { Delegator delegator = (Delegator) request.getAttribute("delegator"); java.sql.Timestamp nowStamp = UtilDateTime.nowTimestamp(); - List<GenericValue> trackingCodeOrders = FastList.newInstance(); + List<GenericValue> trackingCodeOrders = new LinkedList<GenericValue>(); Cookie[] cookies = request.getCookies(); Timestamp affiliateReferredTimeStamp = null; Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java (original) +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java Fri Apr 10 20:22:54 2015 @@ -26,11 +26,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; import net.wimpi.pim.Pim; import net.wimpi.pim.contact.basicimpl.AddressImpl; import net.wimpi.pim.contact.basicimpl.EmailAddressImpl; @@ -85,7 +85,7 @@ public class VCard { InputStream in = new ByteArrayInputStream(inputByteArray); String partyType = (String) context.get("partyType"); Boolean isGroup = "PartyGroup".equals(partyType); // By default we import a Person. - Map<String, Object> serviceCtx = FastMap.newInstance(); + Map<String, Object> serviceCtx = new HashMap<String, Object>(); try { ContactIOFactory ciof = Pim.getContactIOFactory(); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java Fri Apr 10 20:22:54 2015 @@ -19,6 +19,7 @@ package org.ofbiz.order; import java.math.BigDecimal; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -27,8 +28,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; @@ -68,7 +67,7 @@ public class OrderManagerEvents { if (session.getAttribute("OFFLINE_PAYMENTS") != null) { String orderId = (String) request.getAttribute("orderId"); - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); List<GenericValue> paymentPrefs = null; GenericValue placingCustomer = null; try { @@ -220,7 +219,7 @@ public class OrderManagerEvents { } } - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); for (GenericValue paymentMethodType : paymentMethodTypes) { String paymentMethodTypeId = paymentMethodType.getString("paymentMethodTypeId"); String amountStr = request.getParameter(paymentMethodTypeId + "_amount"); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java Fri Apr 10 20:22:54 2015 @@ -21,13 +21,12 @@ package org.ofbiz.order.order; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; +import java.util.HashMap; import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilHttp; @@ -140,7 +139,7 @@ public class OrderContentWrapper { .cache().filterByDate().queryFirst(); if (orderContent != null) { // when rendering the order content, always include the OrderHeader/OrderItem and OrderContent records that this comes from - Map<String, Object> inContext = FastMap.newInstance(); + Map<String, Object> inContext = new HashMap<String, Object>(); inContext.put("order", order); inContext.put("orderContent", orderContent); ContentWorker.renderContentAsText(dispatcher, delegator, orderContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, null, null, false); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java Fri Apr 10 20:22:54 2015 @@ -20,6 +20,7 @@ package org.ofbiz.order.order; import java.io.IOException; import java.io.OutputStream; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -37,14 +38,11 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityQuery; - import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; import org.ofbiz.webapp.website.WebSiteWorker; -import javolution.util.FastMap; - /** * Order Events */ @@ -109,7 +107,7 @@ public class OrderEvents { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); Locale locale = UtilHttp.getLocale(request); - Map<String, Object> resultMap = FastMap.newInstance(); + Map<String, Object> resultMap = new HashMap<String, Object>(); String orderId = request.getParameter("orderId"); String[] orderItemSeqIds = request.getParameterValues("selectedItem"); @@ -122,7 +120,7 @@ public class OrderEvents { GenericValue orderItemShipGroup = orderItemShipGroupAssoc.getRelatedOne("OrderItemShipGroup", false); String shipGroupSeqId = orderItemShipGroup.getString("shipGroupSeqId"); - Map<String, Object> contextMap = FastMap.newInstance(); + Map<String, Object> contextMap = new HashMap<String, Object>(); contextMap.put("orderId", orderId); contextMap.put("orderItemSeqId", orderItemSeqId); contextMap.put("shipGroupSeqId", shipGroupSeqId); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Fri Apr 10 20:22:54 2015 @@ -20,16 +20,15 @@ package org.ofbiz.order.order; import java.io.Serializable; import java.sql.Timestamp; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilValidate; @@ -76,7 +75,7 @@ public class OrderListState implements S protected static final Map<String, String> parameterToOrderTypeId; protected static final Map<String, String> parameterToFilterId; static { - Map<String, String> map = FastMap.newInstance(); + Map<String, String> map = new HashMap<String, String>(); map.put("viewcompleted", "ORDER_COMPLETED"); map.put("viewcancelled", "ORDER_CANCELLED"); map.put("viewrejected", "ORDER_REJECTED"); @@ -87,12 +86,12 @@ public class OrderListState implements S map.put("viewhold", "ORDER_HOLD"); parameterToOrderStatusId = map; - map = FastMap.newInstance(); + map = new HashMap<String, String>(); map.put("view_SALES_ORDER", "SALES_ORDER"); map.put("view_PURCHASE_ORDER", "PURCHASE_ORDER"); parameterToOrderTypeId = map; - map = FastMap.newInstance(); + map = new HashMap<String, String>(); map.put("filterInventoryProblems", "filterInventoryProblems"); map.put("filterAuthProblems", "filterAuthProblems"); map.put("filterPartiallyReceivedPOs", "filterPartiallyReceivedPOs"); @@ -110,9 +109,9 @@ public class OrderListState implements S protected OrderListState() { viewSize = 10; viewIndex = 0; - orderStatusState = FastMap.newInstance(); - orderTypeState = FastMap.newInstance(); - orderFilterState = FastMap.newInstance(); + orderStatusState = new HashMap<String, String>(); + orderTypeState = new HashMap<String, String>(); + orderFilterState = new HashMap<String, String>(); // defaults (TODO: configuration) orderStatusState.put("viewcreated", "Y"); @@ -226,25 +225,25 @@ public class OrderListState implements S * Get the OrderHeaders corresponding to the state. */ public List<GenericValue> getOrders(String facilityId, Timestamp filterDate, Delegator delegator) throws GenericEntityException { - List<EntityCondition> allConditions = FastList.newInstance(); + List<EntityCondition> allConditions = new LinkedList<EntityCondition>(); if (facilityId != null) { allConditions.add(EntityCondition.makeCondition("originFacilityId", EntityOperator.EQUALS, facilityId)); } if (filterDate != null) { - List<EntityCondition> andExprs = FastList.newInstance(); + List<EntityCondition> andExprs = new LinkedList<EntityCondition>(); andExprs.add(EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, UtilDateTime.getDayStart(filterDate))); andExprs.add(EntityCondition.makeCondition("orderDate", EntityOperator.LESS_THAN_EQUAL_TO, UtilDateTime.getDayEnd(filterDate))); allConditions.add(EntityCondition.makeCondition(andExprs, EntityOperator.AND)); } - List<EntityCondition> statusConditions = FastList.newInstance(); + List<EntityCondition> statusConditions = new LinkedList<EntityCondition>(); for (String status : orderStatusState.keySet()) { if (!hasStatus(status)) continue; statusConditions.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, parameterToOrderStatusId.get(status))); } - List<EntityCondition> typeConditions = FastList.newInstance(); + List<EntityCondition> typeConditions = new LinkedList<EntityCondition>(); for (String type : orderTypeState.keySet()) { if (!hasType(type)) continue; typeConditions.add(EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, parameterToOrderTypeId.get(type))); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Fri Apr 10 20:22:54 2015 @@ -20,14 +20,13 @@ package org.ofbiz.order.order; import java.math.BigDecimal; +import java.util.HashSet; +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.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; @@ -77,7 +76,7 @@ public class OrderLookupServices { } // list of fields to select (initial list) - Set<String> fieldsToSelect = FastSet.newInstance(); + Set<String> fieldsToSelect = new HashSet<String>(); fieldsToSelect.add("orderId"); fieldsToSelect.add("orderName"); fieldsToSelect.add("statusId"); @@ -91,10 +90,10 @@ public class OrderLookupServices { List<String> orderBy = UtilMisc.toList("-orderDate", "-orderId"); // list to hold the parameters - List<String> paramList = FastList.newInstance(); + List<String> paramList = new LinkedList<String>(); // list of conditions - List<EntityCondition> conditions = FastList.newInstance(); + List<EntityCondition> conditions = new LinkedList<EntityCondition>(); // check security flag for purchase orders boolean canViewPo = security.hasEntityPermission("ORDERMGR", "_PURCHASE_VIEW", userLogin); @@ -119,7 +118,7 @@ public class OrderLookupServices { // the base order header fields List<String> orderTypeList = UtilGenerics.checkList(context.get("orderTypeId")); if (orderTypeList != null) { - List<EntityExpr> orExprs = FastList.newInstance(); + List<EntityExpr> orExprs = new LinkedList<EntityExpr>(); for (String orderTypeId : orderTypeList) { paramList.add("orderTypeId=" + orderTypeId); @@ -138,11 +137,11 @@ public class OrderLookupServices { List<String> orderStatusList = UtilGenerics.checkList(context.get("orderStatusId")); if (orderStatusList != null) { - List<EntityCondition> orExprs = FastList.newInstance(); + List<EntityCondition> orExprs = new LinkedList<EntityCondition>(); for (String orderStatusId : orderStatusList) { paramList.add("orderStatusId=" + orderStatusId); if ("PENDING".equals(orderStatusId)) { - List<EntityExpr> pendExprs = FastList.newInstance(); + List<EntityExpr> pendExprs = new LinkedList<EntityExpr>(); pendExprs.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "ORDER_CREATED")); pendExprs.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "ORDER_PROCESSING")); pendExprs.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "ORDER_APPROVED")); @@ -156,7 +155,7 @@ public class OrderLookupServices { List<String> productStoreList = UtilGenerics.checkList(context.get("productStoreId")); if (productStoreList != null) { - List<EntityExpr> orExprs = FastList.newInstance(); + List<EntityExpr> orExprs = new LinkedList<EntityExpr>(); for (String productStoreId : productStoreList) { paramList.add("productStoreId=" + productStoreId); orExprs.add(EntityCondition.makeCondition("productStoreId", EntityOperator.EQUALS, productStoreId)); @@ -166,7 +165,7 @@ public class OrderLookupServices { List<String> webSiteList = UtilGenerics.checkList(context.get("orderWebSiteId")); if (webSiteList != null) { - List<EntityExpr> orExprs = FastList.newInstance(); + List<EntityExpr> orExprs = new LinkedList<EntityExpr>(); for (String webSiteId : webSiteList) { paramList.add("webSiteId=" + webSiteId); orExprs.add(EntityCondition.makeCondition("webSiteId", EntityOperator.EQUALS, webSiteId)); @@ -176,7 +175,7 @@ public class OrderLookupServices { List<String> saleChannelList = UtilGenerics.checkList(context.get("salesChannelEnumId")); if (saleChannelList != null) { - List<EntityExpr> orExprs = FastList.newInstance(); + List<EntityExpr> orExprs = new LinkedList<EntityExpr>(); for (String salesChannelEnumId : saleChannelList) { paramList.add("salesChannelEnumId=" + salesChannelEnumId); orExprs.add(EntityCondition.makeCondition("salesChannelEnumId", EntityOperator.EQUALS, salesChannelEnumId)); @@ -329,7 +328,7 @@ public class OrderLookupServices { if (roleTypeList != null) { fieldsToSelect.add("roleTypeId"); - List<EntityExpr> orExprs = FastList.newInstance(); + List<EntityExpr> orExprs = new LinkedList<EntityExpr>(); for (String roleTypeId : roleTypeList) { paramList.add("roleTypeId=" + roleTypeId); orExprs.add(makeExpr("roleTypeId", roleTypeId)); @@ -393,7 +392,7 @@ public class OrderLookupServices { if (product != null) { String isVirtual = product.getString("isVirtual"); if (isVirtual != null && "Y".equals(isVirtual)) { - List<EntityExpr> orExprs = FastList.newInstance(); + List<EntityExpr> orExprs = new LinkedList<EntityExpr>(); orExprs.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); Map<String, Object> varLookup = null; @@ -532,7 +531,7 @@ public class OrderLookupServices { conditions.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.NOT_EQUAL, null)); conditions.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.GREATER_THAN, BigDecimal.ZERO)); } else if ("N".equals(hasBackOrders)) { - List<EntityExpr> orExpr = FastList.newInstance(); + List<EntityExpr> orExpr = new LinkedList<EntityExpr>(); orExpr.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.EQUALS, null)); orExpr.add(EntityCondition.makeCondition("quantityNotAvailable", EntityOperator.EQUALS, BigDecimal.ZERO)); conditions.add(EntityCondition.makeCondition(orExpr, EntityOperator.OR)); @@ -577,7 +576,7 @@ public class OrderLookupServices { Debug.logInfo("Find order query: " + cond.toString(), module); } - List<GenericValue> orderList = FastList.newInstance(); + List<GenericValue> orderList = new LinkedList<GenericValue>(); int orderCount = 0; // get the index for the partial list @@ -648,7 +647,7 @@ public class OrderLookupServices { } public static void filterInventoryProblems(Map<String, ? extends Object> context, Map<String, Object> result, List<GenericValue> orderList, List<String> paramList) { - List<String> filterInventoryProblems = FastList.newInstance(); + List<String> filterInventoryProblems = new LinkedList<String>(); String doFilter = (String) context.get("filterInventoryProblems"); if (doFilter == null) { @@ -666,9 +665,9 @@ public class OrderLookupServices { } } - List<String> filterPOsOpenPastTheirETA = FastList.newInstance(); - List<String> filterPOsWithRejectedItems = FastList.newInstance(); - List<String> filterPartiallyReceivedPOs = FastList.newInstance(); + List<String> filterPOsOpenPastTheirETA = new LinkedList<String>(); + List<String> filterPOsWithRejectedItems = new LinkedList<String>(); + List<String> filterPartiallyReceivedPOs = new LinkedList<String>(); String filterPOReject = (String) context.get("filterPOsWithRejectedItems"); String filterPOPast = (String) context.get("filterPOsOpenPastTheirETA"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |