svn commit: r1672752 [5/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [5/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Fri Apr 10 20:22:54 2015 @@ -33,6 +33,8 @@ import java.net.URL; import java.net.URLConnection; import java.nio.ByteBuffer; import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -43,9 +45,6 @@ import javax.servlet.http.HttpSession; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -119,11 +118,11 @@ public class DataResourceWorker impleme .where("parentCategoryId", parentCategoryId) .cache().queryList(); categoryNode.put("count", Integer.valueOf(categoryValues.size())); - List<Map<String, Object>> subCategoryIds = FastList.newInstance(); + List<Map<String, Object>> subCategoryIds = new LinkedList<Map<String,Object>>(); for (GenericValue category : categoryValues) { String id = (String) category.get("dataCategoryId"); String categoryName = (String) category.get("categoryName"); - Map<String, Object> newNode = FastMap.newInstance(); + Map<String, Object> newNode = new HashMap<String, Object>(); newNode.put("id", id); newNode.put("name", categoryName); errorMsg = getDataCategoryMap(delegator, depth + 1, newNode, categoryTypeIds, getAll); @@ -171,7 +170,7 @@ public class DataResourceWorker impleme String spc = ""; for (int i = 0; i < depth; i++) spc += " "; - Map<String, Object> map = FastMap.newInstance(); + Map<String, Object> map = new HashMap<String, Object>(); map.put("dataCategoryId", id); map.put("categoryName", spc + nm); if (id != null && !id.equals("ROOT") && !id.equals("")) { @@ -214,7 +213,7 @@ public class DataResourceWorker impleme FileItem fi = null; FileItem imageFi = null; String imageFileName = null; - Map<String, Object> passedParams = FastMap.newInstance(); + Map<String, Object> passedParams = new HashMap<String, Object>(); HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue)session.getAttribute("userLogin"); passedParams.put("userLogin", userLogin); @@ -290,14 +289,14 @@ public class DataResourceWorker impleme */ public static Map<String, Object> callDataResourcePermissionCheckResult(Delegator delegator, LocalDispatcher dispatcher, Map<String, Object> context) { - Map<String, Object> permResults = FastMap.newInstance(); + Map<String, Object> permResults = new HashMap<String, Object>(); String skipPermissionCheck = (String) context.get("skipPermissionCheck"); if (Debug.infoOn()) Debug.logInfo("in callDataResourcePermissionCheckResult, skipPermissionCheck:" + skipPermissionCheck,""); if (UtilValidate.isEmpty(skipPermissionCheck) || (!"true".equalsIgnoreCase(skipPermissionCheck) && !"granted".equalsIgnoreCase(skipPermissionCheck))) { GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("userLogin", userLogin); serviceInMap.put("targetOperationList", context.get("targetOperationList")); serviceInMap.put("contentPurposeList", context.get("contentPurposeList")); @@ -391,7 +390,7 @@ public class DataResourceWorker impleme } public static String buildRequestPrefix(Delegator delegator, Locale locale, String webSiteId, String https) { - Map<String, Object> prefixValues = FastMap.newInstance(); + Map<String, Object> prefixValues = new HashMap<String, Object>(); String prefix; NotificationServices.setBaseUrl(delegator, webSiteId, prefixValues); @@ -612,7 +611,7 @@ public class DataResourceWorker impleme throw new GeneralException("Cannot lookup data resource with for a null dataResourceId"); } if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } if (UtilValidate.isEmpty(targetMimeTypeId)) { targetMimeTypeId = "text/html"; @@ -731,7 +730,7 @@ public class DataResourceWorker impleme // prepare the map for preRenderedContent String textData = (String) context.get("textData"); if (UtilValidate.isNotEmpty(textData)) { - Map<String, Object> prc = FastMap.newInstance(); + Map<String, Object> prc = new HashMap<String, Object>(); String mapKey = (String) context.get("mapKey"); if (mapKey != null) { prc.put(mapKey, mapKey); @@ -794,7 +793,7 @@ public class DataResourceWorker impleme Delegator delegator, Appendable out, boolean cache) throws IOException, GeneralException { Map<String, Object> context = UtilGenerics.checkMap(templateContext.get("context")); if (context == null) { - context = FastMap.newInstance(); + context = new HashMap<String, Object>(); } String webSiteId = (String) templateContext.get("webSiteId"); if (UtilValidate.isEmpty(webSiteId)) { @@ -908,7 +907,7 @@ public class DataResourceWorker impleme if (mimeTypeTemplate != null && mimeTypeTemplate.get("templateLocation") != null) { // prepare the context - Map<String, Object> mimeContext = FastMap.newInstance(); + Map<String, Object> mimeContext = new HashMap<String, Object>(); mimeContext.putAll(context); mimeContext.put("dataResource", dataResource); mimeContext.put("textData", textData); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java Fri Apr 10 20:22:54 2015 @@ -28,11 +28,10 @@ import java.io.StringWriter; import java.io.Writer; import java.nio.ByteBuffer; import java.sql.Timestamp; +import java.util.HashMap; 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; @@ -75,7 +74,7 @@ public class DataServices { */ public static Map<String, Object> createDataResourceAndText(DispatchContext dctx, Map<String, ? extends Object> rcontext) { Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> thisResult = createDataResourceMethod(dctx, context); if (thisResult.get(ModelService.RESPONSE_MESSAGE) != null) { @@ -106,7 +105,7 @@ public class DataServices { public static Map<String, Object> createDataResourceMethod(DispatchContext dctx, Map<String, ? extends Object> rcontext) { Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String userLoginId = (String) userLogin.get("userLoginId"); @@ -167,7 +166,7 @@ public class DataServices { } public static Map<String, Object> createElectronicTextMethod(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(); String dataResourceId = (String) context.get("dataResourceId"); String textData = (String) context.get("textData"); @@ -300,7 +299,7 @@ public class DataServices { } public static Map<String, Object> updateDataResourceMethod(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(); GenericValue dataResource = null; Locale locale = (Locale) context.get("locale"); @@ -349,7 +348,7 @@ public class DataServices { * @return update the ElectronicText */ public static Map<String, Object> updateElectronicTextMethod(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(); GenericValue electronicText = null; Locale locale = (Locale) context.get("locale"); @@ -398,7 +397,7 @@ public class DataServices { } public static Map<String, Object> updateFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); //GenericValue fileText = null; Locale locale = (Locale) context.get("locale"); //String dataResourceId = (String) dataResource.get("dataResourceId"); @@ -470,7 +469,7 @@ public class DataServices { } public static Map<String, Object> renderDataResourceAsText(DispatchContext dctx, Map<String, ? extends Object> context) throws GeneralException, IOException { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); //LocalDispatcher dispatcher = dctx.getDispatcher(); Writer out = (Writer) context.get("outWriter"); @@ -488,7 +487,7 @@ public class DataServices { Locale locale = (Locale) context.get("locale"); if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } // GenericValue view = (GenericValue) context.get("subContentDataResourceView"); @@ -513,7 +512,7 @@ public class DataServices { } public static Map<String, Object> updateImageMethod(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(); //Locale locale = (Locale) context.get("locale"); String dataResourceId = (String) context.get("dataResourceId"); @@ -548,7 +547,7 @@ public class DataServices { } public static Map<String, Object> createImageMethod(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(); String dataResourceId = (String) context.get("dataResourceId"); ByteBuffer byteBuffer = (ByteBuffer)context.get("imageData"); @@ -584,7 +583,7 @@ public class DataServices { } public static Map<String, Object> createBinaryFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); GenericValue dataResource = (GenericValue) context.get("dataResource"); //String dataResourceId = (String) dataResource.get("dataResourceId"); String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId"); @@ -641,7 +640,7 @@ public class DataServices { } public static Map<String, Object> updateBinaryFileMethod(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); GenericValue dataResource = (GenericValue) context.get("dataResource"); //String dataResourceId = (String) dataResource.get("dataResourceId"); String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Fri Apr 10 20:22:54 2015 @@ -21,6 +21,8 @@ package org.ofbiz.content.layout; import java.nio.ByteBuffer; import java.sql.Timestamp; import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -29,9 +31,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.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -69,7 +68,7 @@ public class LayoutEvents { Map<String, Object> uploadResults = LayoutWorker.uploadImageAndParameters(request, "imageData"); //Debug.logVerbose("in createLayoutImage(java), uploadResults:" + uploadResults, ""); Map<String, Object> formInput = UtilGenerics.checkMap(uploadResults.get("formInput")); - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); ByteBuffer byteWrap = (ByteBuffer) uploadResults.get("imageData"); if (byteWrap == null) { String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.image_data_null", locale); @@ -87,7 +86,7 @@ public class LayoutEvents { } } String mimeTypeId = "image/" + imageFileNameExt; - List<Object> errorMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); if (locale == null) { locale = Locale.getDefault(); } @@ -120,7 +119,7 @@ public class LayoutEvents { String dataResourceId = (String) result.get("dataResourceId"); String activeContentId = (String) result.get("contentId"); if (UtilValidate.isNotEmpty(activeContentId)) { - Map<String, Object> context2 = FastMap.newInstance(); + Map<String, Object> context2 = new HashMap<String, Object>(); context2.put("activeContentId", activeContentId); //context2.put("dataResourceId", dataResourceId); context2.put("contentAssocTypeId", result.get("contentAssocTypeId")); @@ -228,7 +227,7 @@ public class LayoutEvents { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); HttpSession session = request.getSession(); Locale locale = UtilHttp.getLocale(request); - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); Map<String, Object> paramMap = UtilHttp.getParameterMap(request); Debug.logVerbose("in replaceSubContent, paramMap:" + paramMap, module); String dataResourceId = (String) paramMap.get("dataResourceId"); @@ -277,7 +276,7 @@ public class LayoutEvents { Map<String, Object> result = dispatcher.runSync("persistContentAndAssoc", context); //Debug.logVerbose("in replaceSubContent, result:" + result, module); request.setAttribute("contentId", contentIdTo); - Map<String, Object> context2 = FastMap.newInstance(); + Map<String, Object> context2 = new HashMap<String, Object>(); context2.put("activeContentId", contentId); //context2.put("dataResourceId", dataResourceId); context2.put("contentAssocTypeId", "SUB_CONTENT"); @@ -369,7 +368,7 @@ public class LayoutEvents { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; } - Map<String, Object> serviceIn = FastMap.newInstance(); + Map<String, Object> serviceIn = new HashMap<String, Object>(); Map<String, Object> results = null; serviceIn.put("fromDate", UtilDateTime.nowTimestamp()); serviceIn.put("contentId", contentId); @@ -389,14 +388,14 @@ public class LayoutEvents { return "error"; } - serviceIn = FastMap.newInstance(); + serviceIn = new HashMap<String, Object>(); serviceIn.put("userLogin", session.getAttribute("userLogin")); // Can't count on records being unique - Map<String, GenericValue> beenThere = FastMap.newInstance(); + Map<String, GenericValue> beenThere = new HashMap<String, GenericValue>(); for (int i=0; i<entityList.size(); i++) { GenericValue view = entityList.get(i); - List<Object> errorMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); if (locale == null) { locale = Locale.getDefault(); } @@ -450,7 +449,7 @@ public class LayoutEvents { Debug.logVerbose("in createSubContent, contentIdTo:" + contentIdTo, module); Debug.logVerbose("in createSubContent, mapKey:" + mapKey, module); } - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); List<Object> errorMessages = null; Locale loc = (Locale) request.getSession().getServletContext().getAttribute("locale"); if (loc == null) { @@ -497,7 +496,7 @@ public class LayoutEvents { request.setAttribute("contentId", contentId); request.setAttribute("drDataResourceId", dataResourceId); request.setAttribute("currentEntityName", "SubContentDataResourceId"); - Map<String, Object> context2 = FastMap.newInstance(); + Map<String, Object> context2 = new HashMap<String, Object>(); context2.put("activeContentId", contentId); //context2.put("dataResourceId", dataResourceId); context2.put("contentAssocTypeId", "SUB_CONTENT"); @@ -522,7 +521,7 @@ public class LayoutEvents { Map<String, Object> paramMap = UtilHttp.getParameterMap(request); // String contentIdTo = (String) paramMap.get("contentIdTo"); // String mapKey = (String) paramMap.get("mapKey"); - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); List<Object> errorMessages = null; Locale loc = (Locale) request.getSession().getServletContext().getAttribute("locale"); if (loc == null) { @@ -563,7 +562,7 @@ public class LayoutEvents { request.setAttribute("drDataResourceId", dataResourceId); request.setAttribute("currentEntityName", "SubContentDataResourceId"); /* - Map context2 = FastMap.newInstance(); + Map context2 = new HashMap<String, Object>(); context2.put("activeContentId", contentId); //context2.put("dataResourceId", dataResourceId); context2.put("contentAssocTypeId", "SUB_CONTENT"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java Fri Apr 10 20:22:54 2015 @@ -20,14 +20,13 @@ package org.ofbiz.content.layout; import java.io.File; import java.nio.ByteBuffer; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastMap; - import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -56,8 +55,8 @@ public class LayoutWorker { //Debug.logVerbose("in uploadAndStoreImage", ""); Locale locale = UtilHttp.getLocale(request); - Map<String, Object> results = FastMap.newInstance(); - Map<String, String> formInput = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); + Map<String, String> formInput = new HashMap<String, String>(); results.put("formInput", formInput); ServletFileUpload fu = new ServletFileUpload(new DiskFileItemFactory(10240, new File(new File("runtime"), "tmp"))); List<FileItem> lst = null; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java Fri Apr 10 20:22:54 2015 @@ -26,6 +26,7 @@ import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -47,8 +48,6 @@ import javax.print.attribute.PrintServic import javax.print.attribute.standard.PrinterName; import javax.xml.transform.stream.StreamSource; -import javolution.util.FastMap; - import org.apache.fop.apps.Fop; import org.apache.fop.apps.MimeConstants; import org.ofbiz.base.util.Debug; @@ -87,7 +86,7 @@ public class OutputServices { String printerContentType = (String) serviceContext.remove("printerContentType"); if (UtilValidate.isEmpty(screenContext)) { - screenContext = FastMap.newInstance(); + screenContext = new HashMap<String, Object>(); } screenContext.put("locale", locale); if (UtilValidate.isEmpty(contentType)) { @@ -200,7 +199,7 @@ public class OutputServices { String fileName = (String) serviceContext.remove("fileName"); if (UtilValidate.isEmpty(screenContext)) { - screenContext = FastMap.newInstance(); + screenContext = new HashMap<String, Object>(); } screenContext.put("locale", locale); if (UtilValidate.isEmpty(contentType)) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Fri Apr 10 20:22:54 2015 @@ -26,14 +26,13 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.sql.Timestamp; import java.util.Date; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -308,7 +307,7 @@ public class PdfSurveyServices { /** */ public static Map<String, Object> getAcroFieldsFromPdf(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> acroFieldMap = FastMap.newInstance(); + Map<String, Object> acroFieldMap = new HashMap<String, Object>(); try { ByteArrayOutputStream os = new ByteArrayOutputStream(); Delegator delegator = dctx.getDelegator(); @@ -488,7 +487,7 @@ public class PdfSurveyServices { //LocalDispatcher dispatcher = dctx.getDispatcher(); Map<String, Object> results = ServiceUtil.returnSuccess(); String surveyResponseId = (String)context.get("surveyResponseId"); - List<Object> qAndA = FastList.newInstance(); + List<Object> qAndA = new LinkedList<Object>(); try { List<GenericValue> responses = EntityQuery.use(delegator).from("SurveyResponseAnswer").where("surveyResponseId", surveyResponseId).queryList(); @@ -512,7 +511,7 @@ public class PdfSurveyServices { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map<String, Object> results = ServiceUtil.returnSuccess(); - Map<String, Object> acroFieldMap = FastMap.newInstance(); + Map<String, Object> acroFieldMap = new HashMap<String, Object>(); String surveyResponseId = (String)context.get("surveyResponseId"); String acroFormContentId = null; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Fri Apr 10 20:22:54 2015 @@ -25,14 +25,13 @@ import java.io.StringWriter; import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; +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 javolution.util.FastSet; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -101,7 +100,7 @@ public class SurveyWrapper { */ public void setPassThru(Map<String, Object> passThru) { if (passThru != null) { - this.passThru = FastMap.newInstance(); + this.passThru = new HashMap<String, Object>(); this.passThru.putAll(passThru); } } @@ -112,7 +111,7 @@ public class SurveyWrapper { */ public void setDefaultValues(Map<String, Object> defaultValues) { if (defaultValues != null) { - this.defaultValues = FastMap.newInstance(); + this.defaultValues = new HashMap<String, Object>(); this.defaultValues.putAll(defaultValues); } } @@ -124,7 +123,7 @@ public class SurveyWrapper { */ public void addToTemplateContext(String name, Object value) { if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } templateContext.put(name, value); } @@ -179,7 +178,7 @@ public class SurveyWrapper { currentAnswers = this.getResponseAnswers(null); } - Map<String, Object> sqaaWithColIdListByMultiRespId = FastMap.newInstance(); + Map<String, Object> sqaaWithColIdListByMultiRespId = new HashMap<String, Object>(); for (GenericValue surveyQuestionAndAppl : surveyQuestionAndAppls) { String surveyMultiRespColId = surveyQuestionAndAppl.getString("surveyMultiRespColId"); if (UtilValidate.isNotEmpty(surveyMultiRespColId)) { @@ -189,7 +188,7 @@ public class SurveyWrapper { } if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } templateContext.put("partyId", partyId); @@ -197,7 +196,7 @@ public class SurveyWrapper { templateContext.put("surveyResults", results); templateContext.put("surveyQuestionAndAppls", surveyQuestionAndAppls); templateContext.put("sqaaWithColIdListByMultiRespId", sqaaWithColIdListByMultiRespId); - templateContext.put("alreadyShownSqaaPkWithColId", FastSet.newInstance()); + templateContext.put("alreadyShownSqaaPkWithColId", new HashSet()); templateContext.put("surveyAnswers", currentAnswers); templateContext.put("surveyResponseId", responseId); templateContext.put("sequenceSort", UtilMisc.toList("sequenceNum")); @@ -283,7 +282,7 @@ public class SurveyWrapper { // returns a list of SurveyQuestions (in order by sequence number) for the current Survey public List<GenericValue> getSurveyQuestionAndAppls() { - List<GenericValue> questions = FastList.newInstance(); + List<GenericValue> questions = new LinkedList<GenericValue>(); try { questions = EntityQuery.use(delegator).from("SurveyQuestionAndAppl") @@ -355,7 +354,7 @@ public class SurveyWrapper { // returns a Map of answers keyed on SurveyQuestion ID from the most current SurveyResponse ID public Map<String, Object> getResponseAnswers(String responseId) throws SurveyWrapperException { - Map<String, Object> answerMap = FastMap.newInstance(); + Map<String, Object> answerMap = new HashMap<String, Object>(); if (responseId != null) { List<GenericValue> answers = null; @@ -378,7 +377,7 @@ public class SurveyWrapper { if (key.toUpperCase().startsWith("ANSWERS_")) { int splitIndex = key.indexOf('_'); String questionId = key.substring(splitIndex+1); - Map<String, Object> thisAnswer = FastMap.newInstance(); + Map<String, Object> thisAnswer = new HashMap<String, Object>(); String answer = (String) passThru.remove(key); thisAnswer.put("booleanResponse", answer); thisAnswer.put("currencyResponse", answer); @@ -432,7 +431,7 @@ public class SurveyWrapper { } public Map<String, Object> getResults(List<GenericValue> questions) throws SurveyWrapperException { - Map<String, Object> questionResults = FastMap.newInstance(); + Map<String, Object> questionResults = new HashMap<String, Object>(); if (questions != null) { for (GenericValue question : questions) { Map<String, Object> results = getResultInfo(question); @@ -446,7 +445,7 @@ public class SurveyWrapper { // returns a map of question reqsults public Map<String, Object> getResultInfo(GenericValue question) throws SurveyWrapperException { - Map<String, Object> resultMap = FastMap.newInstance(); + Map<String, Object> resultMap = new HashMap<String, Object>(); // special keys in the result: // "_q_type" - question type (SurveyQuestionTypeId) @@ -477,7 +476,7 @@ public class SurveyWrapper { // create the map of option info ("_total", "_percent") for (String optId : thisResult.keySet()) { - Map<String, Object> optMap = FastMap.newInstance(); + Map<String, Object> optMap = new HashMap<String, Object>(); Long optTotal = (Long) thisResult.get(optId); if (optTotal == null) { optTotal = Long.valueOf(0); @@ -671,7 +670,7 @@ public class SurveyWrapper { } private Map<String, Object> getOptionResult(GenericValue question) throws SurveyWrapperException { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); long total = 0; boolean beganTransaction = false; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Fri Apr 10 20:22:54 2015 @@ -20,14 +20,13 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilGenerics; @@ -96,7 +95,7 @@ public class CheckPermissionTransform im FreeMarkerWorker.overrideWithArgs(templateCtx, args); final String mode = (String)templateCtx.get("mode"); final String quickCheckContentId = (String)templateCtx.get("quickCheckContentId"); - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); //Debug.logInfo("in CheckPermission, contentId(1):" + templateCtx.get("contentId"),""); //Debug.logInfo("in CheckPermission, subContentId(1):" + templateCtx.get("subContentId"),""); @@ -151,7 +150,7 @@ public class CheckPermissionTransform im String passedStatusId = (String)templateCtx.get("statusId"); List<String> statusList = StringUtil.split(passedStatusId, "|"); if (statusList == null) { - statusList = FastList.newInstance(); + statusList = new LinkedList<String>(); } if (UtilValidate.isNotEmpty(statusId) && !statusList.contains(statusId)) { statusList.add(statusId); @@ -171,7 +170,7 @@ public class CheckPermissionTransform im //Debug.logInfo("in CheckPermission, templateCtx:" + templateCtx,""); throw new IOException("targetOperationList has zero size."); } - List<String> roleList = FastList.newInstance(); + List<String> roleList = new LinkedList<String>(); String privilegeEnumId = (String)currentContent.get("privilegeEnumId"); Map<String, Object> results = EntityPermissionChecker.checkPermission(currentContent, statusList, userLogin, purposeList, targetOperationList, roleList, delegator, security, entityOperation, privilegeEnumId, quickCheckContentId); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Fri Apr 10 20:22:54 2015 @@ -20,14 +20,13 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; +import java.util.HashMap; import java.util.List; 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.UtilGenerics; @@ -127,7 +126,7 @@ public class EditRenderSubContentCacheTr templateCtx.put("dataResourceId", dataResourceId); templateCtx.put("subContentIdSub", subContentIdSub); templateCtx.put("subDataResourceTypeId", subDataResourceTypeId); - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateCtx, saveKeyNames, savedValues); return new Writer(out) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Fri Apr 10 20:22:54 2015 @@ -21,15 +21,14 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; 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 javax.servlet.http.HttpServletRequest; -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.StringUtil; @@ -94,9 +93,9 @@ public class LimitedSubContentCacheTrans final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); FreeMarkerWorker.getSiteParameters(request, templateRoot); - final Map<String, Object> savedValuesUp = FastMap.newInstance(); + final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); FreeMarkerWorker.overrideWithArgs(templateRoot, args); String contentAssocTypeId = (String) templateRoot.get("contentAssocTypeId"); @@ -105,7 +104,7 @@ public class LimitedSubContentCacheTrans templateRoot.put("contentAssocTypeId ", contentAssocTypeId); } - final Map<String, GenericValue> pickedEntityIds = FastMap.newInstance(); + final Map<String, GenericValue> pickedEntityIds = new HashMap<String, GenericValue>(); List<String> assocTypes = StringUtil.split(contentAssocTypeId, "|"); String contentPurposeTypeId = (String) templateRoot.get("contentPurposeTypeId"); @@ -117,7 +116,7 @@ public class LimitedSubContentCacheTrans templateRoot.put("locale", locale); } - Map<String, Object> whenMap = FastMap.newInstance(); + Map<String, Object> whenMap = new HashMap<String, Object>(); whenMap.put("followWhen", templateRoot.get("followWhen")); whenMap.put("pickWhen", templateRoot.get("pickWhen")); whenMap.put("returnBeforePickWhen", templateRoot.get("returnBeforePickWhen")); @@ -266,7 +265,7 @@ public class LimitedSubContentCacheTrans isPickObj.booleanValue()) || (isFollowObj != null && isFollowObj.booleanValue()))) { List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(ctx.get("globalNodeTrail")); if (globalNodeTrail == null) { - globalNodeTrail = FastList.newInstance(); + globalNodeTrail = new LinkedList<Map<String,? extends Object>>(); } globalNodeTrail.add(trailNode); ctx.put("globalNodeTrail", globalNodeTrail); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Fri Apr 10 20:22:54 2015 @@ -61,11 +61,11 @@ public class RenderContentAndSubContent ((MapStack)templateRoot).push(envMap); if (Debug.verboseOn()) Debug.logVerbose("in RenderContentAndSubContent, contentId(0):" + templateRoot.get("contentId"), module); FreeMarkerWorker.getSiteParameters(request, templateRoot); - // final Map savedValuesUp = FastMap.newInstance(); + // final Map savedValuesUp = new HashMap<String, Object>(); // FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); FreeMarkerWorker.overrideWithArgs(templateRoot, args); - // final Map<String, Object> savedValues = FastMap.newInstance(); + // final Map<String, Object> savedValues = new HashMap<String, Object>(); return new Writer(out) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java Fri Apr 10 20:22:54 2015 @@ -20,6 +20,7 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -28,8 +29,6 @@ import javax.servlet.ServletContext; 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.GeneralException; import org.ofbiz.base.util.UtilFormatOut; @@ -61,7 +60,7 @@ public class RenderContentAsText impleme public Writer getWriter(final Writer out, Map args) { final Environment env = Environment.getCurrentEnvironment(); //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env); - //final Map templateCtx = FastMap.newInstance(); + //final Map templateCtx = new HashMap<String, Object>(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); @@ -71,7 +70,7 @@ public class RenderContentAsText impleme Debug.logVerbose("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module); } FreeMarkerWorker.getSiteParameters(request, templateRoot); - final Map<String, Object> savedValuesUp = FastMap.newInstance(); + final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); FreeMarkerWorker.overrideWithArgs(templateRoot, args); if (Debug.verboseOn()) { @@ -130,7 +129,7 @@ public class RenderContentAsText impleme templateRoot.put("subDataResourceTypeId", subDataResourceTypeId); */ - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); return new Writer(out) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Fri Apr 10 20:22:54 2015 @@ -20,14 +20,13 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; +import java.util.HashMap; import java.util.List; 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.UtilFormatOut; @@ -58,7 +57,7 @@ public class RenderSubContentAsText impl public Writer getWriter(final Writer out, Map args) { final Environment env = Environment.getCurrentEnvironment(); // final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env); - // final Map templateCtx = FastMap.newInstance(); + // final Map templateCtx = new HashMap<String, Object>(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); @@ -68,7 +67,7 @@ public class RenderSubContentAsText impl Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module); } FreeMarkerWorker.getSiteParameters(request, templateRoot); - final Map<String, Object> savedValuesUp = FastMap.newInstance(); + final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); FreeMarkerWorker.overrideWithArgs(templateRoot, args); if (Debug.infoOn()) { @@ -129,7 +128,7 @@ public class RenderSubContentAsText impl templateRoot.put("subDataResourceTypeId", subDataResourceTypeId); */ - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); return new Writer(out) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Fri Apr 10 20:22:54 2015 @@ -20,6 +20,7 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -28,8 +29,6 @@ import javax.servlet.ServletContext; 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.GeneralException; import org.ofbiz.base.util.UtilGenerics; @@ -61,7 +60,7 @@ public class RenderSubContentCacheTransf // final StringBuilder buf = new StringBuilder(); final Environment env = Environment.getCurrentEnvironment(); //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env); - //final Map templateCtx = FastMap.newInstance(); + //final Map templateCtx = new HashMap<String, Object>(); final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env); final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); @@ -69,7 +68,7 @@ public class RenderSubContentCacheTransf final Map<String, Object> templateRoot = FreeMarkerWorker.createEnvironmentMap(env); //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module); FreeMarkerWorker.getSiteParameters(request, templateRoot); - final Map<String, Object> savedValuesUp = FastMap.newInstance(); + final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); FreeMarkerWorker.overrideWithArgs(templateRoot, args); //if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); @@ -120,7 +119,7 @@ public class RenderSubContentCacheTransf templateRoot.put("subContentId", subContentIdSub); templateRoot.put("subDataResourceTypeId", subDataResourceTypeId); - //final Map savedValues = FastMap.newInstance(); + //final Map savedValues = new HashMap<String, Object>(); //FreeMarkerWorker.saveContextValues(templateCtx, saveKeyNames, savedValues); return new Writer(out) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java Fri Apr 10 20:22:54 2015 @@ -21,6 +21,7 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; import java.sql.Timestamp; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -28,8 +29,6 @@ import java.util.Map; import javax.servlet.ServletContext; 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.UtilDateTime; @@ -79,7 +78,7 @@ public class RenderSubContentTransform i final Environment env = Environment.getCurrentEnvironment(); Map<String, Object> ctx = FreeMarkerWorker.getWrappedObject("context", env); if (ctx == null) { - ctx = FastMap.newInstance(); + ctx = new HashMap<String, Object>(); } final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx); final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", ctx); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Fri Apr 10 20:22:54 2015 @@ -21,14 +21,13 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -86,9 +85,9 @@ public class TraverseSubContentCacheTran //final Map templateRoot = FreeMarkerWorker.getWrappedObject("context", env); final Map<String, Object> templateRoot = FreeMarkerWorker.createEnvironmentMap(env); //FreeMarkerWorker.convertContext(templateRoot); - final Map<String, Object> savedValuesUp = FastMap.newInstance(); + final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); FreeMarkerWorker.overrideWithArgs(templateRoot, args); String startContentAssocTypeId = (String)templateRoot.get("contentAssocTypeId"); // if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, startContentAssocTypeId:" + startContentAssocTypeId, module); @@ -114,9 +113,9 @@ public class TraverseSubContentCacheTran // final GenericValue view = val; - final Map<String, Object> traverseContext = FastMap.newInstance(); + final Map<String, Object> traverseContext = new HashMap<String, Object>(); traverseContext.put("delegator", delegator); - Map<String, Object> whenMap = FastMap.newInstance(); + Map<String, Object> whenMap = new HashMap<String, Object>(); whenMap.put("followWhen", templateRoot.get("followWhen")); whenMap.put("pickWhen", templateRoot.get("pickWhen")); whenMap.put("returnBeforePickWhen", templateRoot.get("returnBeforePickWhen")); @@ -170,7 +169,7 @@ public class TraverseSubContentCacheTran // if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, onStart, trailCsv(1):" + trailCsv , module); if (globalNodeTrail.size() > 0) { int sz = globalNodeTrail.size() ; - nodeTrail = FastList.newInstance(); + nodeTrail = new LinkedList<Map<String,? extends Object>>(); //nodeTrail = passedGlobalNodeTrail.subList(sz - 1, sz); node = UtilGenerics.checkMap(globalNodeTrail.get(sz - 1)); //if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, onStart, node(1):" + node , module); @@ -265,7 +264,7 @@ public class TraverseSubContentCacheTran Map<String, ? extends Object> ndStart = nodeTrail.get(0); contentIdStart = (String)ndStart.get("contentId"); } else { - globalNodeTrail = FastList.newInstance(); + globalNodeTrail = new LinkedList<Map<String,? extends Object>>(); } //if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, populateContext, contentIdEnd(1):" + contentIdEnd + " contentIdStart:" + contentIdStart + " equals:" + (contentIdStart.equals(contentIdEnd)), module); boolean bIdEnd = UtilValidate.isNotEmpty(contentIdEnd); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Fri Apr 10 20:22:54 2015 @@ -21,13 +21,12 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; 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.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -133,9 +132,9 @@ public class TraverseSubContentTransform } final GenericValue subContentDataResourceView = view; - final Map<String, Object> traverseContext = FastMap.newInstance(); + final Map<String, Object> traverseContext = new HashMap<String, Object>(); traverseContext.put("delegator", delegator); - Map<String, Object> whenMap = FastMap.newInstance(); + Map<String, Object> whenMap = new HashMap<String, Object>(); whenMap.put("followWhen", templateCtx.get("followWhen")); whenMap.put("pickWhen", templateCtx.get("pickWhen")); whenMap.put("returnBeforePickWhen", templateCtx.get("returnBeforePickWhen")); @@ -180,7 +179,7 @@ public class TraverseSubContentTransform @Override public int onStart() throws TemplateModelException, IOException { //templateContext.put("buf", new StringBuilder()); - List<Map<String, Object>> nodeTrail = FastList.newInstance(); + List<Map<String, Object>> nodeTrail = new LinkedList<Map<String,Object>>(); traverseContext.put("nodeTrail", nodeTrail); // GenericValue content = null; /* @@ -287,7 +286,7 @@ public class TraverseSubContentTransform private boolean checkWhen (GenericValue thisContent, String contentAssocTypeId) { boolean isPick = false; - Map<String, Object> assocContext = FastMap.newInstance(); + Map<String, Object> assocContext = new HashMap<String, Object>(); if (UtilValidate.isEmpty(contentAssocTypeId)) { contentAssocTypeId = ""; } @@ -309,7 +308,7 @@ public class TraverseSubContentTransform assocContext.put("content", thisContent); List<Object> purposes = ContentWorker.getPurposes(thisContent); assocContext.put("purposes", purposes); - List<String> contentTypeAncestry = FastList.newInstance(); + List<String> contentTypeAncestry = new LinkedList<String>(); String contentTypeId = (String)thisContent.get("contentTypeId"); try { ContentWorker.getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Fri Apr 10 20:22:54 2015 @@ -20,14 +20,13 @@ package org.ofbiz.content.webapp.ftl; import java.io.IOException; import java.io.Writer; +import java.util.HashMap; import java.util.List; 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.UtilGenerics; @@ -94,7 +93,7 @@ public class WrapSubContentCacheTransfor final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env); final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env); FreeMarkerWorker.getSiteParameters(request, templateCtx); - final Map<String, Object> savedValuesUp = FastMap.newInstance(); + final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateCtx, upSaveKeyNames, savedValuesUp); //if (Debug.infoOn()) Debug.logInfo("in Wrap(0a), savedValuesUp ." + savedValuesUp , module); FreeMarkerWorker.overrideWithArgs(templateCtx, args); @@ -135,7 +134,7 @@ public class WrapSubContentCacheTransfor // the parent context. But it will already have one and it is the same context that is // being passed. } - final Map<String, Object> savedValues = FastMap.newInstance(); + final Map<String, Object> savedValues = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateCtx, saveKeyNames, savedValues); //if (Debug.infoOn()) Debug.logInfo("in Wrap(1), savedValues ." + savedValues , module); // This order is taken so that the mimeType can be overridden in the transform arguments. Modified: ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java (original) +++ ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java Fri Apr 10 20:22:54 2015 @@ -19,14 +19,13 @@ package org.ofbiz.humanres; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; 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.UtilValidate; import org.ofbiz.entity.Delegator; @@ -82,10 +81,10 @@ public class HumanResEvents { title = memGroupCtx.getString("groupName"); } - Map josonMap = FastMap.newInstance(); - Map dataMap = FastMap.newInstance(); - Map dataAttrMap = FastMap.newInstance(); - Map attrMap = FastMap.newInstance(); + Map josonMap = new HashMap(); + Map dataMap = new HashMap(); + Map dataAttrMap = new HashMap(); + Map attrMap = new HashMap(); dataAttrMap.put("onClick", onclickFunction + "('" + memberId + additionParam + "')"); @@ -124,10 +123,10 @@ public class HumanResEvents { String catNameField = null; String title = null; - Map josonMap = FastMap.newInstance(); - Map dataMap = FastMap.newInstance(); - Map dataAttrMap = FastMap.newInstance(); - Map attrMap = FastMap.newInstance(); + Map josonMap = new HashMap(); + Map dataMap = new HashMap(); + Map dataAttrMap = new HashMap(); + Map attrMap = new HashMap(); catId = childOfCom.get("partyIdTo"); @@ -198,10 +197,10 @@ public class HumanResEvents { if (UtilValidate.isNotEmpty(isEmpls)) { for (GenericValue childOfEmpl : isEmpls ) { - Map emplMap = FastMap.newInstance(); - Map emplAttrMap = FastMap.newInstance(); - Map empldataMap = FastMap.newInstance(); - Map emplDataAttrMap = FastMap.newInstance(); + Map emplMap = new HashMap(); + Map emplAttrMap = new HashMap(); + Map empldataMap = new HashMap(); + Map emplDataAttrMap = new HashMap(); String emplId = (String) childOfEmpl.get("emplPositionId"); String typeId = (String) childOfEmpl.get("emplPositionTypeId"); Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy Fri Apr 10 20:22:54 2015 @@ -26,9 +26,6 @@ import org.ofbiz.base.util.*; import org.ofbiz.party.party.PartyHelper; import org.ofbiz.product.catalog.*; import org.ofbiz.product.category.*; -import javolution.util.FastMap; -import javolution.util.FastList; -import javolution.util.FastList.*; import org.ofbiz.entity.*; import java.util.List; @@ -36,17 +33,17 @@ import java.util.List; // The separateRootType function will return the list of category of given catalog. // PLEASE NOTE : The structure of the list of separateRootType function is according to the JSON_DATA plugin of the jsTree. -completedTree = FastList.newInstance(); -completedTreeContext = FastList.newInstance(); -existParties = FastList.newInstance(); -subtopLists = FastList.newInstance(); +completedTree = []; +completedTreeContext = []; +existParties = []; +subtopLists = []; //internalOrg list partyRelationships = from("PartyRelationship").where("partyIdFrom", partyId, "partyRelationshipTypeId", "GROUP_ROLLUP").filterByDate().queryList(); if (partyRelationships) { //root partyRoot = from("PartyGroup").where("partyId", partyId).queryOne(); - partyRootMap = FastMap.newInstance(); + partyRootMap = []; partyRootMap.put("partyId", partyId); partyRootMap.put("groupName", partyRoot.getString("groupName")); @@ -62,8 +59,8 @@ if (partyRelationships) { partyRootMap.put("child", completedTreeContext); completedTree.add(partyRootMap); - } + // The complete tree list for the category tree context.completedTree = completedTree; context.subtopLists = subtopLists; Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java Fri Apr 10 20:22:54 2015 @@ -22,12 +22,11 @@ package org.ofbiz.manufacturing.bom; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; +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.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -73,8 +72,8 @@ public class BOMNode { this.delegator = product.getDelegator(); this.dispatcher = dispatcher; this.userLogin = userLogin; - children = FastList.newInstance(); - childrenNodes = FastList.newInstance(); + children = new LinkedList<GenericValue>(); + childrenNodes = new LinkedList<BOMNode>(); parentNode = null; productForRules = null; bomTypeId = null; @@ -111,9 +110,9 @@ public class BOMNode { .orderBy("sequenceNum") .filterByDate(inDate).queryList(); } - children = FastList.newInstance(); + children = new LinkedList<GenericValue>(); children.addAll(rows); - childrenNodes = FastList.newInstance(); + childrenNodes = new LinkedList<BOMNode>(); BOMNode oneChildNode = null; for (GenericValue oneChild : children) { // Configurator @@ -272,7 +271,7 @@ public class BOMNode { // ----------------------------------------------------------- // We try to apply directly the selected features if (newNode.equals(oneChildNode)) { - Map<String, String> selectedFeatures = FastMap.newInstance(); + Map<String, String> selectedFeatures = new HashMap<String, String>(); if (productFeatures != null) { GenericValue feature = null; for (int j = 0; j < productFeatures.size(); j++) { @@ -282,7 +281,7 @@ public class BOMNode { } if (selectedFeatures.size() > 0) { - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); context.put("productId", node.get("productIdTo")); context.put("selectedFeatures", selectedFeatures); Map<String, Object> storeResult = null; @@ -338,9 +337,9 @@ public class BOMNode { .orderBy("sequenceNum") .filterByDate(inDate).queryList(); } - children = FastList.newInstance(); + children = new LinkedList<GenericValue>(); children.addAll(rows); - childrenNodes = FastList.newInstance(); + childrenNodes = new LinkedList<BOMNode>(); BOMNode oneChildNode = null; for (GenericValue oneChild : children) { @@ -506,7 +505,7 @@ public class BOMNode { Timestamp endDate = null; if (isManufactured(ignoreSupplierProducts)) { BOMNode oneChildNode = null; - List<String> childProductionRuns = FastList.newInstance(); + List<String> childProductionRuns = new LinkedList<String>(); Timestamp maxEndDate = null; for (int i = 0; i < childrenNodes.size(); i++) { oneChildNode = childrenNodes.get(i); @@ -528,7 +527,7 @@ public class BOMNode { } Timestamp startDate = UtilDateTime.toTimestamp(UtilDateTime.toDateTimeString(date)); - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); if (!useSubstitute) { serviceContext.put("productId", getProduct().getString("productId")); serviceContext.put("facilityId", getProduct().getString("facilityId")); Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Fri Apr 10 20:22:54 2015 @@ -22,13 +22,12 @@ package org.ofbiz.manufacturing.bom; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; +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.UtilGenerics; import org.ofbiz.base.util.UtilMisc; @@ -62,7 +61,7 @@ public class BOMServices { * @return returns the product's low level code (llc) i.e. the maximum depth */ public static Map<String, Object> getMaxDepth(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(); String productId = (String) context.get("productId"); String fromDateStr = (String) context.get("fromDate"); @@ -79,7 +78,7 @@ public class BOMServices { if (fromDate == null) { fromDate = new Date(); } - List<String> bomTypes = FastList.newInstance(); + List<String> bomTypes = new LinkedList<String>(); if (bomType == null) { try { List<GenericValue> bomTypesValues = EntityQuery.use(delegator).from("ProductAssocType") @@ -120,7 +119,7 @@ public class BOMServices { * @return the results of the updates the product's low level code */ public static Map<String, Object> updateLowLevelCode(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(); String productId = (String) context.get("productIdTo"); @@ -167,7 +166,7 @@ public class BOMServices { if (alsoComponents.booleanValue()) { Map<String, Object> treeResult = dispatcher.runSync("getBOMTree", UtilMisc.toMap("productId", productId, "bomType", "MANUF_COMPONENT")); BOMTree tree = (BOMTree)treeResult.get("tree"); - List<BOMNode> products = FastList.newInstance(); + List<BOMNode> products = new LinkedList<BOMNode>(); tree.print(products, llc.intValue()); for (int i = 0; i < products.size(); i++) { BOMNode oneNode = products.get(i); @@ -207,7 +206,7 @@ public class BOMServices { * @return the results of the updates the product's low level code */ public static Map<String, Object> initLowLevelCode(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(); Locale locale = (Locale) context.get("locale"); @@ -215,7 +214,7 @@ public class BOMServices { try { List<GenericValue> products = EntityQuery.use(delegator).from("Product").orderBy("isVirtual DESC").queryList(); Long zero = Long.valueOf(0); - List<GenericValue> allProducts = FastList.newInstance(); + List<GenericValue> allProducts = new LinkedList<GenericValue>(); for (GenericValue product : products) { product.set("billOfMaterialLevel", zero); allProducts.add(product); @@ -247,7 +246,7 @@ public class BOMServices { * @return returns the ProductAssoc generic value for a duplicate productIdKey ancestor if present */ public static Map<String, Object> searchDuplicatedAncestor(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"); @@ -280,7 +279,7 @@ public class BOMServices { * @return return the bill of material tree */ public static Map<String, Object> getBOMTree(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"); @@ -331,7 +330,7 @@ public class BOMServices { * @return return the list of manufacturing components */ public static Map<String, Object> getManufacturingComponents(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"); @@ -367,7 +366,7 @@ public class BOMServices { // Components // BOMTree tree = null; - List<BOMNode> components = FastList.newInstance(); + List<BOMNode> components = new LinkedList<BOMNode>(); try { tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_SINGLE_LEVEL, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); @@ -403,9 +402,9 @@ public class BOMServices { result.put("components", components); // also return a componentMap (useful in scripts and simple language code) - List<Map<String, Object>> componentsMap = FastList.newInstance(); + List<Map<String, Object>> componentsMap = new LinkedList<Map<String,Object>>(); for (BOMNode node : components) { - Map<String, Object> componentMap = FastMap.newInstance(); + Map<String, Object> componentMap = new HashMap<String, Object>(); componentMap.put("product", node.getProduct()); componentMap.put("quantity", node.getQuantity()); componentsMap.add(componentMap); @@ -415,7 +414,7 @@ public class BOMServices { } public static Map<String, Object> getNotAssembledComponents(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(); String productId = (String) context.get("productId"); @@ -444,8 +443,8 @@ public class BOMServices { } BOMTree tree = null; - List<BOMNode> components = FastList.newInstance(); - List<BOMNode> notAssembledComponents = FastList.newInstance(); + List<BOMNode> components = new LinkedList<BOMNode>(); + List<BOMNode> notAssembledComponents = new LinkedList<BOMNode>(); try { tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); @@ -467,7 +466,7 @@ public class BOMServices { // Service for the Product (Shipment) component // public static Map<String, Object> createShipmentPackages(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(); Locale locale = (Locale) context.get("locale"); @@ -489,8 +488,8 @@ public class BOMServices { } catch (GenericEntityException gee) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingBomErrorLoadingShipmentItems", locale)); } - Map<String, Object> orderReadHelpers = FastMap.newInstance(); - Map<String, Object> partyOrderShipments = FastMap.newInstance(); + Map<String, Object> orderReadHelpers = new HashMap<String, Object>(); + Map<String, Object> partyOrderShipments = new HashMap<String, Object>(); for (GenericValue shipmentItem : shipmentItems) { // Get the OrderShipments GenericValue orderShipment = null; @@ -511,7 +510,7 @@ public class BOMServices { String partyId = (orderReadHelper.getPlacingParty() != null? orderReadHelper.getPlacingParty().getString("partyId"): null); // FIXME: is it the customer? if (partyId != null) { if (!partyOrderShipments.containsKey(partyId)) { - List<Map<String, Object>> orderShipmentReadMapList = FastList.newInstance(); + List<Map<String, Object>> orderShipmentReadMapList = new LinkedList<Map<String,Object>>(); partyOrderShipments.put(partyId, orderShipmentReadMapList); } List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipments.get(partyId)); @@ -529,7 +528,7 @@ public class BOMServices { OrderReadHelper orderReadHelper = (OrderReadHelper)orderShipmentReadMap.get("orderReadHelper"); GenericValue orderItem = orderReadHelper.getOrderItem(orderShipment.getString("orderItemSeqId")); // getProductsInPackages - Map<String, Object> serviceContext = FastMap.newInstance(); + Map<String, Object> serviceContext = new HashMap<String, Object>(); serviceContext.put("productId", orderItem.getString("productId")); serviceContext.put("quantity", orderShipment.getBigDecimal("quantity")); Map<String, Object> resultService = null; @@ -556,9 +555,9 @@ public class BOMServices { } // Group together products and components // of the same box type. - Map<String, GenericValue> boxTypes = FastMap.newInstance(); + Map<String, GenericValue> boxTypes = new HashMap<String, GenericValue>(); for (Map.Entry<String, Object> partyOrderShipment : partyOrderShipments.entrySet()) { - Map<String, List<Map<String, Object>>> boxTypeContent = FastMap.newInstance(); + Map<String, List<Map<String, Object>>> boxTypeContent = new HashMap<String, List<Map<String,Object>>>(); List<Map<String, Object>> orderShipmentReadMapList = UtilGenerics.checkList(partyOrderShipment.getValue()); for (int i = 0; i < orderShipmentReadMapList.size(); i++) { Map<String, Object> orderShipmentReadMap = UtilGenerics.checkMap(orderShipmentReadMapList.get(i)); @@ -570,7 +569,7 @@ public class BOMServices { // this is a multi package shipment item for (int j = 0; j < productsInPackages.size(); j++) { BOMNode component = productsInPackages.get(j); - Map<String, Object> boxTypeContentMap = FastMap.newInstance(); + Map<String, Object> boxTypeContentMap = new HashMap<String, Object>(); boxTypeContentMap.put("content", orderShipmentReadMap); boxTypeContentMap.put("componentIndex", Integer.valueOf(j)); GenericValue product = component.getProduct(); @@ -584,7 +583,7 @@ public class BOMServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingPackageConfiguratorError", locale)); } boxTypes.put(boxTypeId, boxType); - List<Map<String, Object>> box = FastList.newInstance(); + List<Map<String, Object>> box = new LinkedList<Map<String,Object>>(); boxTypeContent.put(boxTypeId, box); } List<Map<String, Object>> boxTypeContentList = UtilGenerics.checkList(boxTypeContent.get(boxTypeId)); @@ -594,7 +593,7 @@ public class BOMServices { } else { // no subcomponents, the product has its own package: // this is a single package shipment item - Map<String, Object> boxTypeContentMap = FastMap.newInstance(); + Map<String, Object> boxTypeContentMap = new HashMap<String, Object>(); boxTypeContentMap.put("content", orderShipmentReadMap); GenericValue orderItem = orderReadHelper.getOrderItem(orderShipment.getString("orderItemSeqId")); GenericValue product = null; @@ -614,7 +613,7 @@ public class BOMServices { } boxTypes.put(boxTypeId, boxType); - List<Map<String, Object>> box = FastList.newInstance(); + List<Map<String, Object>> box = new LinkedList<Map<String,Object>>(); boxTypeContent.put(boxTypeId, box); } List<Map<String, Object>> boxTypeContentList = UtilGenerics.checkList(boxTypeContent.get(boxTypeId)); @@ -733,7 +732,7 @@ public class BOMServices { * @return returns the list of products in packages */ public static Map<String, Object> getProductsInPackages(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"); @@ -760,7 +759,7 @@ public class BOMServices { // Components // BOMTree tree = null; - List<BOMNode> components = FastList.newInstance(); + List<BOMNode> components = new LinkedList<BOMNode>(); try { tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_MANUFACTURING, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |