svn commit: r1635816 - in /ofbiz/trunk/framework/common/
Locked
 
|
Author: adrianc
Date: Fri Oct 31 17:13:45 2014 New Revision: 1635816 URL: http://svn.apache.org/r1635816 Log: Remove Javolution from the common component. Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/FtpServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java ofbiz/trunk/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Fri Oct 31 17:13:45 2014 @@ -30,6 +30,7 @@ import java.io.UnsupportedEncodingExcept import java.io.Writer; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -40,7 +41,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; import net.sf.json.JSON; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -170,7 +170,7 @@ public class CommonEvents { String followerSessionId = request.getParameter("followerSid"); String followSessionId = request.getParameter("followSid"); Map<String, String> follow = appletSessions.get(followSessionId); - if (follow == null) follow = FastMap.newInstance(); + if (follow == null) follow = new LinkedHashMap<String, String>(); String followerListStr = follow.get("followers"); if (followerListStr == null) { followerListStr = followerSessionId; @@ -192,7 +192,7 @@ public class CommonEvents { String followerSessionId = request.getParameter("followerSid"); String pageUrl = request.getParameter("pageUrl"); Map<String, String> follow = appletSessions.get(followerSessionId); - if (follow == null) follow = FastMap.newInstance(); + if (follow == null) follow = new LinkedHashMap<String, String>(); follow.put("followPage", pageUrl); appletSessions.put(followerSessionId, follow); } Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Fri Oct 31 17:13:45 2014 @@ -33,6 +33,8 @@ import java.io.Writer; import java.nio.ByteBuffer; import java.sql.Timestamp; import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -41,9 +43,6 @@ import java.util.TreeSet; import javax.mail.internet.MimeMessage; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.metrics.Metrics; import org.ofbiz.base.metrics.MetricsFactory; import org.ofbiz.base.util.Debug; @@ -112,7 +111,7 @@ public class CommonServices { Delegator delegator = dctx.getDelegator(); Map<String, Object> response = ServiceUtil.returnSuccess(); - List<GenericValue> testingNodes = FastList.newInstance(); + List<GenericValue> testingNodes = new LinkedList<GenericValue>(); for (int i = 0; i < 3; i ++) { GenericValue testingNode = delegator.makeValue("TestingNode"); testingNode.put("testingNodeId", "TESTING_NODE" + i); @@ -227,7 +226,7 @@ public class CommonServices { * This service does not have required parameters and does not validate */ public static Map<String, Object> echoService(DispatchContext dctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); result.putAll(context); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS); return result; @@ -387,7 +386,7 @@ public class CommonServices { String fileName = (String) context.get("_uploadFile_fileName"); String contentType = (String) context.get("_uploadFile_contentType"); - Map<String, Object> createCtx = FastMap.newInstance(); + Map<String, Object> createCtx = new LinkedHashMap<String, Object>(); createCtx.put("binData", array); createCtx.put("dataResourceTypeId", "OFBIZ_FILE"); createCtx.put("dataResourceName", fileName); @@ -409,7 +408,7 @@ public class CommonServices { GenericValue dataResource = (GenericValue) createResp.get("dataResource"); if (dataResource != null) { - Map<String, Object> contentCtx = FastMap.newInstance(); + Map<String, Object> contentCtx = new LinkedHashMap<String, Object>(); contentCtx.put("dataResourceId", dataResource.getString("dataResourceId")); contentCtx.put("localeString", ((Locale) context.get("locale")).toString()); contentCtx.put("contentTypeId", "DOCUMENT"); @@ -523,10 +522,10 @@ public class CommonServices { } public static Map<String, Object> getAllMetrics(DispatchContext dctx, Map<String, ?> context) { - List<Map<String, Object>> metricsMapList = FastList.newInstance(); + List<Map<String, Object>> metricsMapList = new LinkedList<Map<String, Object>>(); Collection<Metrics> metricsList = MetricsFactory.getMetrics(); for (Metrics metrics : metricsList) { - Map<String, Object> metricsMap = FastMap.newInstance(); + Map<String, Object> metricsMap = new LinkedHashMap<String, Object>(); metricsMap.put("name", metrics.getName()); metricsMap.put("serviceRate", metrics.getServiceRate()); metricsMap.put("threshold", metrics.getThreshold()); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java Fri Oct 31 17:13:45 2014 @@ -18,9 +18,9 @@ *******************************************************************************/ package org.ofbiz.common; +import java.util.LinkedList; import java.util.List; - -import javolution.util.FastList; +import java.util.Map; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; @@ -45,7 +45,7 @@ public class CommonWorkers { public final static String module = CommonWorkers.class.getName(); public static List<GenericValue> getCountryList(Delegator delegator) { - List<GenericValue> geoList = FastList.newInstance(); + List<GenericValue> geoList = new LinkedList<GenericValue>(); String defaultCountry = EntityUtilProperties.getPropertyValue("general.properties", "country.geo.id.default", delegator); GenericValue defaultGeo = null; if (UtilValidate.isNotEmpty(defaultCountry)) { @@ -63,7 +63,7 @@ public class CommonWorkers { exprs.add(EntityCondition.makeCondition("geoId", EntityOperator.IN, countriesAvailable)); } - List<GenericValue> countriesList = FastList.newInstance(); + List<GenericValue> countriesList = new LinkedList<GenericValue>(); try { countriesList = delegator.findList("Geo", EntityCondition.makeCondition(exprs), null, UtilMisc.toList("geoName"), null, true); } catch (GenericEntityException e) { @@ -90,7 +90,7 @@ public class CommonWorkers { } public static List<GenericValue> getStateList(Delegator delegator) { - List<GenericValue> geoList = FastList.newInstance(); + List<GenericValue> geoList = new LinkedList<GenericValue>(); EntityCondition condition = EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), EntityCondition.makeCondition("geoTypeId", "TERRITORY"), EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY")); List<String> sortList = UtilMisc.toList("geoName"); @@ -120,7 +120,7 @@ public class CommonWorkers { } List<String> sortList = UtilMisc.toList(listOrderBy); - List<GenericValue> geoList = FastList.newInstance(); + List<GenericValue> geoList = new LinkedList<GenericValue>(); try { // Check if the country is a country group and get recursively the // states Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Fri Oct 31 17:13:45 2014 @@ -23,15 +23,14 @@ import static org.ofbiz.base.util.UtilGe import java.sql.Timestamp; import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.StringUtil; @@ -70,7 +69,7 @@ public class FindServices { public static Map<String, EntityComparisonOperator<?, ?>> entityOperators; static { - entityOperators = FastMap.newInstance(); + entityOperators = new LinkedHashMap<String, EntityComparisonOperator<?, ?>>(); entityOperators.put("between", EntityOperator.BETWEEN); entityOperators.put("equals", EntityOperator.EQUALS); entityOperators.put("greaterThan", EntityOperator.GREATER_THAN); @@ -110,7 +109,7 @@ public class FindServices { // Note that "normalizedFields" will contain values other than those // Contained in the associated entity. // Those extra fields will be ignored in the second half of this method. - Map<String, Map<String, Map<String, Object>>> normalizedFields = FastMap.newInstance(); + Map<String, Map<String, Map<String, Object>>> normalizedFields = new LinkedHashMap<String, Map<String, Map<String, Object>>>(); //StringBuffer queryStringBuf = new StringBuffer(); for (String fieldNameRaw: inputFields.keySet()) { // The name as it appeas in the HTML form String fieldNameRoot = null; // The entity field name. Everything to the left of the first "_" if @@ -182,19 +181,19 @@ public class FindServices { } subMap = normalizedFields.get(fieldNameRoot); if (subMap == null) { - subMap = FastMap.newInstance(); + subMap = new LinkedHashMap<String, Map<String, Object>>(); normalizedFields.put(fieldNameRoot, subMap); } subMap2 = subMap.get(fieldPair); if (subMap2 == null) { - subMap2 = FastMap.newInstance(); + subMap2 = new LinkedHashMap<String, Object>(); subMap.put(fieldPair, subMap2); } subMap2.put(fieldMode, fieldValue); List<Object[]> origList = origValueMap.get(fieldNameRoot); if (origList == null) { - origList = FastList.newInstance(); + origList = new LinkedList<Object[]>(); origValueMap.put(fieldNameRoot, origList); } Object [] origValues = {fieldNameRaw, fieldValue}; @@ -214,13 +213,13 @@ public class FindServices { * @return returns an EntityCondition list */ public static List<EntityCondition> createConditionList(Map<String, ? extends Object> parameters, List<ModelField> fieldList, Map<String, Object> queryStringMap, Delegator delegator, Map<String, ?> context) { - Set<String> processed = FastSet.newInstance(); - Set<String> keys = FastSet.newInstance(); - Map<String, ModelField> fieldMap = FastMap.newInstance(); + Set<String> processed = new LinkedHashSet<String>(); + Set<String> keys = new LinkedHashSet<String>(); + Map<String, ModelField> fieldMap = new LinkedHashMap<String, ModelField>(); for (ModelField modelField : fieldList) { fieldMap.put(modelField.getName(), modelField); } - List<EntityCondition> result = FastList.newInstance(); + List<EntityCondition> result = new LinkedList<EntityCondition>(); for (Map.Entry<String, ? extends Object> entry : parameters.entrySet()) { String parameterName = entry.getKey(); if (processed.contains(parameterName)) { @@ -365,7 +364,7 @@ public class FindServices { Object fieldValue = null; // If it is a "value" field, it will be the value to be used in the query. // If it is an "op" field, it will be "equals", "greaterThan", etc. EntityCondition cond = null; - List<EntityCondition> tmpList = FastList.newInstance(); + List<EntityCondition> tmpList = new LinkedList<EntityCondition>(); String opString = null; boolean ignoreCase = false; List<ModelField> fields = modelEntity.getFieldsUnmodifiable(); @@ -548,7 +547,7 @@ public class FindServices { } Timestamp filterByDateValue = (Timestamp) context.get("filterByDateValue"); - Map<String, Object> queryStringMap = FastMap.newInstance(); + Map<String, Object> queryStringMap = new LinkedHashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); ModelEntity modelEntity = delegator.getModelEntity(entityName); List<EntityCondition> tmpList = createConditionList(inputFields, modelEntity.getFieldsUnmodifiable(), queryStringMap, delegator, context); @@ -665,7 +664,7 @@ public class FindServices { // Contained in the associated entity. // Those extra fields will be ignored in the second half of this method. ModelEntity modelEntity = delegator.getModelEntity(entityName); - Map<String, Object> normalizedFields = FastMap.newInstance(); + Map<String, Object> normalizedFields = new LinkedHashMap<String, Object>(); //StringBuffer queryStringBuf = new StringBuffer(); for (String fieldNameRaw: inputFields.keySet()) { // The name as it appeas in the HTML form String fieldNameRoot = null; // The entity field name. Everything to the left of the first "_" if Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/FtpServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/FtpServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/FtpServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/FtpServices.java Fri Oct 31 17:13:45 2014 @@ -25,12 +25,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; - import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPReply; @@ -60,7 +59,7 @@ public class FtpServices { Debug.logError(ioe, "[putFile] Problem opening local file", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonFtpFileCannotBeOpen", locale)); } - List<String> errorList = FastList.newInstance(); + List<String> errorList = new LinkedList<String>(); FTPClient ftp = new FTPClient(); try { Integer defaultTimeout = (Integer) context.get("defaultTimeout"); @@ -145,7 +144,7 @@ public class FtpServices { Debug.logError(ioe, "[getFile] Problem opening local file", module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonFtpFileCannotBeOpen", locale)); } - List<String> errorList = FastList.newInstance(); + List<String> errorList = new LinkedList<String>(); FTPClient ftp = new FTPClient(); try { Integer defaultTimeout = (Integer) context.get("defaultTimeout"); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Fri Oct 31 17:13:45 2014 @@ -23,12 +23,11 @@ import java.io.File; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.apache.commons.io.FileUtils; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; @@ -48,10 +47,10 @@ public class JsLanguageFileMappingCreato String encoding = (String) context.get("encoding"); // default value: UTF-8 List<Locale> localeList = UtilMisc.availableLocales(); - Map<String, Object> jQueryLocaleFile = FastMap.newInstance(); - Map<String, String> dateJsLocaleFile = FastMap.newInstance(); - Map<String, String> validationLocaleFile = FastMap.newInstance(); - Map<String, String> dateTimePickerLocaleFile = FastMap.newInstance(); + Map<String, Object> jQueryLocaleFile = new LinkedHashMap<String, Object>(); + Map<String, String> dateJsLocaleFile = new LinkedHashMap<String, String>(); + Map<String, String> validationLocaleFile = new LinkedHashMap<String, String>(); + Map<String, String> dateTimePickerLocaleFile = new LinkedHashMap<String, String>(); // setup some variables to locate the js files String componentRoot = "component://images/webapp"; Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Fri Oct 31 17:13:45 2014 @@ -20,10 +20,9 @@ package org.ofbiz.common; +import java.util.LinkedHashMap; import java.util.Map; -import javolution.util.FastMap; - public final class JsLanguageFilesMapping { @@ -32,7 +31,7 @@ public final class JsLanguageFilesMappin public static class datejs { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultDateJs = "/images/jquery/plugins/datejs/date-en-US.js"; static { @@ -200,7 +199,7 @@ public final class JsLanguageFilesMappin } public static class jquery { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultDateJs = "/images/jquery/ui/i18n/jquery.ui.datepicker-en.js"; static { @@ -368,7 +367,7 @@ public final class JsLanguageFilesMappin } public static class validation { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; static { @@ -535,7 +534,7 @@ public final class JsLanguageFilesMappin } public static class dateTime { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new LinkedHashMap<String, String>(); private static String defaultDateTime = "/images/webapp/images/jquery/ui/i18n/jquery.ui.datepicker-en.js"; static { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/KeywordSearchUtil.java Fri Oct 31 17:13:45 2014 @@ -19,14 +19,13 @@ package org.ofbiz.common; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; @@ -209,7 +208,7 @@ public class KeywordSearchUtil { } public static Set<String> fixKeywordsForSearch(Set<String> keywordSet, boolean anyPrefix, boolean anySuffix, boolean removeStems, boolean isAnd) { - Map<String, Long> keywords = FastMap.newInstance(); + Map<String, Long> keywords = new LinkedHashMap<String, Long>(); fixupKeywordSet(keywordSet, keywords, getStopWordBagAnd(), getStopWordBagOr(), removeStems, getStemSet(), true, anyPrefix, anySuffix, isAnd); return keywords.keySet(); } Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/email/EmailServices.java Fri Oct 31 17:13:45 2014 @@ -31,6 +31,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.security.Security; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -50,9 +52,6 @@ import javax.mail.internet.MimeMultipart import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.stream.StreamSource; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.apache.fop.apps.Fop; import org.apache.fop.apps.MimeConstants; import org.ofbiz.base.util.Debug; @@ -334,7 +333,7 @@ public class EmailServices { } catch (SendFailedException e) { // message code prefix may be used by calling services to determine the cause of the failure Debug.logError(e, "[ADDRERR] Address error when sending message to [" + sendTo + "] from [" + sendFrom + "] cc [" + sendCc + "] bcc [" + sendBcc + "] subject [" + subject + "]", module); - List<SMTPAddressFailedException> failedAddresses = FastList.newInstance(); + List<SMTPAddressFailedException> failedAddresses = new LinkedList<SMTPAddressFailedException>(); Exception nestedException = null; while ((nestedException = e.getNextException()) != null && nestedException instanceof MessagingException) { if (nestedException instanceof SMTPAddressFailedException) { @@ -430,8 +429,8 @@ public class EmailServices { List<String> xslfoAttachScreenLocationListParam = UtilGenerics.checkList(serviceContext.remove("xslfoAttachScreenLocationList")); List<String> attachmentNameListParam = UtilGenerics.checkList(serviceContext.remove("attachmentNameList")); - List<String> xslfoAttachScreenLocationList = FastList.newInstance(); - List<String> attachmentNameList = FastList.newInstance(); + List<String> xslfoAttachScreenLocationList = new LinkedList<String>(); + List<String> attachmentNameList = new LinkedList<String>(); if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationParam)) xslfoAttachScreenLocationList.add(xslfoAttachScreenLocationParam); if (UtilValidate.isNotEmpty(attachmentNameParam)) attachmentNameList.add(attachmentNameParam); if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationListParam)) xslfoAttachScreenLocationList.addAll(xslfoAttachScreenLocationListParam); @@ -488,7 +487,7 @@ public class EmailServices { // check if attachment screen location passed in if (UtilValidate.isNotEmpty(xslfoAttachScreenLocationList)) { - List<Map<String, ? extends Object>> bodyParts = FastList.newInstance(); + List<Map<String, ? extends Object>> bodyParts = new LinkedList<Map<String, ? extends Object>>(); if (bodyText != null) { bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale); bodyParts.add(UtilMisc.<String, Object>toMap("content", bodyText, "type", "text/html")); @@ -636,7 +635,7 @@ public class EmailServices { public static void sendFailureNotification(DispatchContext dctx, Map<String, ? extends Object> context, MimeMessage message, List<SMTPAddressFailedException> failures) { Locale locale = (Locale) context.get("locale"); - Map<String, Object> newContext = FastMap.newInstance(); + Map<String, Object> newContext = new LinkedHashMap<String, Object>(); newContext.put("userLogin", context.get("userLogin")); newContext.put("sendFailureNotification", false); newContext.put("sendFrom", context.get("sendFrom")); @@ -653,9 +652,9 @@ public class EmailServices { } sb.append(UtilProperties.getMessage(resource, "CommonEmailDeliveryOriginalMessage", locale)); sb.append("/n/n"); - List<Map<String, Object>> bodyParts = FastList.newInstance(); + List<Map<String, Object>> bodyParts = new LinkedList<Map<String, Object>>(); bodyParts.add(UtilMisc.<String, Object>toMap("content", sb.toString(), "type", "text/plain")); - Map<String, Object> bodyPart = FastMap.newInstance(); + Map<String, Object> bodyPart = new LinkedHashMap<String, Object>(); bodyPart.put("content", sb.toString()); bodyPart.put("type", "text/plain"); try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java Fri Oct 31 17:13:45 2014 @@ -22,11 +22,10 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.net.URL; +import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.component.ComponentConfig.WebappInfo; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; @@ -143,7 +142,7 @@ public class NotificationServices { // make sure we have a valid body before sending if (body != null) { // retain only the required attributes for the sendMail service - Map<String, Object> emailContext = FastMap.newInstance(); + Map<String, Object> emailContext = new LinkedHashMap<String, Object>(); emailContext.put("sendTo", context.get("sendTo")); emailContext.put("body", body); emailContext.put("sendCc", context.get("sendCc")); @@ -191,7 +190,7 @@ public class NotificationServices { Locale locale = (Locale) context.get("locale"); Map<String, Object> result = null; if (templateData == null) { - templateData = FastMap.newInstance(); + templateData = new LinkedHashMap<String, Object>(); } try { Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Fri Oct 31 17:13:45 2014 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.common.geo; +import java.util.LinkedHashMap; +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.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -52,7 +51,7 @@ public class GeoWorker { public static List<GenericValue> expandGeoGroup(GenericValue geo) { if (geo == null) { - return FastList.newInstance(); + return new LinkedList<GenericValue>(); } if (!"GROUP".equals(geo.getString("geoTypeId"))) { return UtilMisc.toList(geo); @@ -60,7 +59,7 @@ public class GeoWorker { //Debug.logInfo("Expanding geo : " + geo, module); - List<GenericValue> geoList = FastList.newInstance(); + List<GenericValue> geoList = new LinkedList<GenericValue>(); List<GenericValue> thisGeoAssoc = null; try { thisGeoAssoc = geo.getRelated("AssocGeoAssoc", UtilMisc.toMap("geoAssocTypeId", "GROUP_MEMBER"), null, false); @@ -90,7 +89,7 @@ public class GeoWorker { if (UtilValidate.isEmpty(geoIdByTypeMapOrig)) { return geoIdByTypeMapOrig; } - Map<String, String> geoIdByTypeMapTemp = FastMap.newInstance(); + Map<String, String> geoIdByTypeMapTemp = new LinkedHashMap<String, String>(); for (Map.Entry<String, String> geoIdByTypeEntry: geoIdByTypeMapOrig.entrySet()) { List<GenericValue> geoAssocList = delegator.findByAnd("GeoAssoc", UtilMisc.toMap("geoIdTo", geoIdByTypeEntry.getValue(), "geoAssocTypeId", "REGIONS"), null, true); for (GenericValue geoAssoc: geoAssocList) { @@ -99,7 +98,7 @@ public class GeoWorker { } } geoIdByTypeMapTemp = expandGeoRegionDeep(geoIdByTypeMapTemp, delegator); - Map<String, String> geoIdByTypeMapNew = FastMap.newInstance(); + Map<String, String> geoIdByTypeMapNew = new LinkedHashMap<String, String>(); // add the temp Map first, then the original over top of it, ie give the original priority over the sub/expanded values geoIdByTypeMapNew.putAll(geoIdByTypeMapTemp); geoIdByTypeMapNew.putAll(geoIdByTypeMapOrig); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/image/ImageTransform.java Fri Oct 31 17:13:45 2014 @@ -24,6 +24,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -32,14 +33,10 @@ import javax.imageio.ImageIO; import javax.swing.ImageIcon; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilXml; - import org.xml.sax.SAXException; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -73,7 +70,7 @@ public class ImageTransform { /* VARIABLES */ BufferedImage bufImg; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); /* BUFFERED IMAGE */ try { @@ -113,7 +110,7 @@ public class ImageTransform { /* VARIABLES */ BufferedImage bufNewImg; double defaultHeight, defaultWidth, scaleFactor; - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); /* DIMENSIONS from ImageProperties */ // A missed dimension is authorized @@ -220,8 +217,8 @@ public class ImageTransform { /* VARIABLES */ Document document; Element rootElt; - Map<String, Map<String, String>> valueMap = FastMap.newInstance(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Map<String, String>> valueMap = new LinkedHashMap<String, Map<String, String>>(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); /* PARSING */ try { @@ -255,10 +252,10 @@ public class ImageTransform { /* get NAME and VALUE */ List<? extends Element> children = UtilXml.childElementList(rootElt); // FIXME : despite upgrading to jdom 1.1, it seems that getChildren is pre 1.5 java code (ie getChildren does not retun List<Element> but only List) for (Element currentElt : children) { - Map<String, String> eltMap = FastMap.newInstance(); + Map<String, String> eltMap = new LinkedHashMap<String, String>(); List<? extends Element> children2 = UtilXml.childElementList(currentElt); if (children2.size() > 0) { - Map<String, String> childMap = FastMap.newInstance(); + Map<String, String> childMap = new LinkedHashMap<String, String>(); // loop over Children 1st level for (Element currentChild : children2) { childMap.put(currentChild.getAttribute("name"), currentChild.getAttribute("value")); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Fri Oct 31 17:13:45 2014 @@ -20,6 +20,8 @@ package org.ofbiz.common.login; import java.sql.Timestamp; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -28,9 +30,6 @@ import java.util.regex.Pattern; import javax.transaction.Transaction; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.crypto.HashCrypt; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -91,7 +90,7 @@ public class LoginServices { } } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); @@ -469,11 +468,11 @@ public class LoginServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> createUserLogin(DispatchContext ctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); Locale locale = (Locale) context.get("locale"); boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); @@ -653,7 +652,7 @@ public class LoginServices { newPasswordVerify = newPasswordVerify.toLowerCase(); } - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); if (newPassword != null) { checkNewPassword(userLoginToUpdate, currentPassword, newPassword, newPasswordVerify, passwordHint, errorMessageList, adminUser, locale); @@ -701,10 +700,10 @@ public class LoginServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updateUserLoginId(DispatchContext ctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); - List<String> errorMessageList = FastList.newInstance(); + List<String> errorMessageList = new LinkedList<String>(); Locale locale = (Locale) context.get("locale"); //boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt")); @@ -813,7 +812,7 @@ public class LoginServices { *@return Map with the result of the service, the output parameters */ public static Map<String, Object> updateUserLoginSecurity(DispatchContext ctx, Map<String, ?> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new LinkedHashMap<String, Object>(); Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue loggedInUserLogin = (GenericValue) context.get("userLogin"); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/preferences/PreferenceWorker.java Fri Oct 31 17:13:45 2014 @@ -18,11 +18,10 @@ *******************************************************************************/ package org.ofbiz.common.preferences; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilMisc; @@ -132,7 +131,7 @@ public class PreferenceWorker { * @return user preference map */ public static Map<String, Object> createUserPrefMap(GenericValue rec) throws GeneralException { - return addPrefToMap(rec, FastMap.<String, Object>newInstance()); + return addPrefToMap(rec, new LinkedHashMap<String, Object>()); } /** @@ -142,7 +141,7 @@ public class PreferenceWorker { * @return user preference map */ public static Map<String, Object> createUserPrefMap(List<GenericValue> recList) throws GeneralException { - Map<String, Object> userPrefMap = FastMap.newInstance(); + Map<String, Object> userPrefMap = new LinkedHashMap<String, Object>(); if (recList != null) { for (GenericValue value: recList) { addPrefToMap(value, userPrefMap); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java Fri Oct 31 17:13:45 2014 @@ -19,6 +19,8 @@ package org.ofbiz.common.scripting; import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.Locale; import java.util.List; import java.util.Map; @@ -29,9 +31,6 @@ import javax.script.ScriptEngine; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.ScriptUtil; import org.ofbiz.base.util.UtilGenerics; @@ -115,13 +114,13 @@ public final class ContextHelper { if (isService()) { errorMessages = UtilGenerics.checkList(getResults().get(ModelService.ERROR_MESSAGE_LIST)); if (errorMessages == null) { - errorMessages = FastList.newInstance(); + errorMessages = new LinkedList<String>(); getResults().put(ModelService.ERROR_MESSAGE_LIST, errorMessages); } } else { errorMessages = UtilGenerics.checkList(getResults().get("_error_message_list_")); if (errorMessages == null) { - errorMessages = FastList.newInstance(); + errorMessages = new LinkedList<String>(); getResults().put("_error_message_list_", errorMessages); } } @@ -143,7 +142,7 @@ public final class ContextHelper { public Map<String, Object> getParameters() { Map<String, Object> parameters = UtilGenerics.checkMap(this.context.getAttribute(ScriptUtil.PARAMETERS_KEY)); if (parameters == null) { - parameters = FastMap.newInstance(); + parameters = new LinkedHashMap<String, Object>(); this.context.setAttribute(ScriptUtil.PARAMETERS_KEY, parameters, ScriptContext.ENGINE_SCOPE); } return parameters; @@ -164,7 +163,7 @@ public final class ContextHelper { public Map<String, Object> getResults() { Map<String, Object> results = UtilGenerics.checkMap(this.context.getAttribute(ScriptUtil.RESULT_KEY)); if (results == null) { - results = FastMap.newInstance(); + results = new LinkedHashMap<String, Object>(); this.context.setAttribute(ScriptUtil.RESULT_KEY, results, ScriptContext.ENGINE_SCOPE); } return results; Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusServices.java Fri Oct 31 17:13:45 2014 @@ -18,18 +18,18 @@ *******************************************************************************/ package org.ofbiz.common.status; +import java.util.LinkedHashMap; +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.UtilProperties; import org.ofbiz.base.util.UtilValidate; import static org.ofbiz.base.util.UtilGenerics.checkList; + import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; @@ -53,7 +53,7 @@ public class StatusServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "CommonStatusMandatory", locale)); } - List<GenericValue> statusItems = FastList.newInstance(); + List<GenericValue> statusItems = new LinkedList<GenericValue>(); for (String statusTypeId: statusTypes) { try { List<GenericValue> myStatusItems = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", statusTypeId), UtilMisc.toList("sequenceId"), true); @@ -62,7 +62,7 @@ public class StatusServices { Debug.logError(e, module); } } - Map<String, Object> ret = FastMap.newInstance(); + Map<String, Object> ret = new LinkedHashMap<String, Object>(); ret.put("statusItems",statusItems); return ret; } Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/status/StatusWorker.java Fri Oct 31 17:13:45 2014 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.common.status; +import java.util.LinkedList; import java.util.List; import javax.servlet.jsp.PageContext; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.Delegator; @@ -52,7 +51,7 @@ public class StatusWorker { public static void getStatusItems(PageContext pageContext, String attributeName, String statusTypeIdOne, String statusTypeIdTwo) { Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); - List<GenericValue> statusItems = FastList.newInstance(); + List<GenericValue> statusItems = new LinkedList<GenericValue>(); try { List<GenericValue> calItems = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", statusTypeIdOne), UtilMisc.toList("sequenceId"), true); Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java?rev=1635816&r1=1635815&r2=1635816&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/uom/UomWorker.java Fri Oct 31 17:13:45 2014 @@ -21,10 +21,9 @@ package org.ofbiz.common.uom; import java.math.BigDecimal; import java.sql.Timestamp; +import java.util.LinkedHashMap; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -100,12 +99,12 @@ public class UomWorker { if (originalValue == null || uomId == null || uomIdTo == null) return null; if (uomId.equals(uomIdTo)) return originalValue; - Map<String, Object> svcInMap = FastMap.newInstance(); + Map<String, Object> svcInMap = new LinkedHashMap<String, Object>(); svcInMap.put("originalValue", originalValue); svcInMap.put("uomId", uomId); svcInMap.put("uomIdTo", uomIdTo); - Map<String, Object> svcOutMap = FastMap.newInstance(); + Map<String, Object> svcOutMap = new LinkedHashMap<String, Object>(); try { svcOutMap = dispatcher.runSync("convertUom", svcInMap); } catch (GenericServiceException ex) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |