svn commit: r1465427 - in /ofbiz/trunk: ./ framework/entity/config/ framework/minilang/src/org/ofb
Locked
svn commit: r1465427 - in /ofbiz/trunk: ./ framework/entity/config/ framework/minilang/src/org/ofb
 
|
Author: adrianc
Date: Sun Apr 7 17:15:10 2013 New Revision: 1465427 URL: http://svn.apache.org/r1465427 Log: Merged rev 1462755 from the 2013_RemoveJavolution branch. Removed Javolution from Mini-language. Modified: ofbiz/trunk/ (props changed) ofbiz/trunk/framework/entity/config/entityengine.xml ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java Propchange: ofbiz/trunk/ ------------------------------------------------------------------------------ Merged /ofbiz/branches/2013_RemoveJavolution:r1462755 Modified: ofbiz/trunk/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/config/entityengine.xml (original) +++ ofbiz/trunk/framework/entity/config/entityengine.xml Sun Apr 7 17:15:10 2013 @@ -184,6 +184,7 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true" + max-worker-pool-size="2" offset-style="fetch"> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> @@ -236,6 +237,7 @@ access. For a detailed description see t use-pk-constraint-names="false" use-indices-unique="false" alias-view-columns="false" + max-worker-pool-size="2" use-order-by-nulls="true"> <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index --> <read-data reader-name="tenant"/> @@ -265,6 +267,7 @@ access. For a detailed description see t use-pk-constraint-names="false" use-indices-unique="false" alias-view-columns="false" + max-worker-pool-size="2" use-order-by-nulls="true"> <read-data reader-name="tenant"/> <read-data reader-name="seed"/> Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMapProcessor.java Sun Apr 7 17:15:10 2013 @@ -20,12 +20,11 @@ package org.ofbiz.minilang; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.cache.UtilCache; @@ -42,7 +41,7 @@ public class SimpleMapProcessor { private static final UtilCache<URL, Map<String, MapProcessor>> simpleMapProcessorsURLCache = UtilCache.createUtilCache("minilang.SimpleMapProcessorsURL", 0, 0); protected static Map<String, MapProcessor> getAllProcessors(URL xmlURL) throws MiniLangException { - Map<String, MapProcessor> mapProcessors = FastMap.newInstance(); + Map<String, MapProcessor> mapProcessors = new HashMap<String, MapProcessor>(); // read in the file Document document = null; try { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java Sun Apr 7 17:15:10 2013 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -33,9 +34,6 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; @@ -124,7 +122,7 @@ public final class SimpleMethod extends if (UtilValidate.isEmpty(fromLocation)) { fromLocation = "<location not known>"; } - Map<String, SimpleMethod> simpleMethods = FastMap.newInstance(); + Map<String, SimpleMethod> simpleMethods = new HashMap<String, SimpleMethod>(); Document document = null; try { document = UtilXml.readXmlDocument(content, true, true); @@ -136,7 +134,7 @@ public final class SimpleMethod extends } private static Map<String, SimpleMethod> getAllSimpleMethods(URL xmlURL) throws MiniLangException { - Map<String, SimpleMethod> simpleMethods = FastMap.newInstance(); + Map<String, SimpleMethod> simpleMethods = new HashMap<String, SimpleMethod>(); Document document = null; try { document = UtilXml.readXmlDocument(xmlURL, true, true); @@ -199,7 +197,7 @@ public final class SimpleMethod extends public static List<SimpleMethod> getSimpleMethodsList(String xmlResource, ClassLoader loader) throws MiniLangException { Assert.notNull("xmlResource", xmlResource); - List<SimpleMethod> simpleMethods = FastList.newInstance(); + List<SimpleMethod> simpleMethods = new ArrayList<SimpleMethod>(); // Let the standard Map returning method take care of caching and compilation Map<String, SimpleMethod> simpleMethodMap = getSimpleMethods(xmlResource, loader); // Load and traverse the document again to get a correctly ordered list of methods @@ -390,7 +388,7 @@ public final class SimpleMethod extends private void addMessage(MethodContext methodContext, String messageListName, String message) { List<String> messages = methodContext.getEnv(messageListName); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<String>(); methodContext.putEnv(messageListName, messages); } messages.add(message); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java Sun Apr 7 17:15:10 2013 @@ -19,11 +19,10 @@ package org.ofbiz.minilang; import java.util.Map; +import java.util.HashMap; import java.util.Set; import java.util.Vector; -import javolution.util.FastMap; - import org.apache.bsf.BSFDeclaredBean; import org.apache.bsf.BSFException; import org.apache.bsf.BSFManager; @@ -43,7 +42,7 @@ public class SimpleMethodBsfEngine exten public static final String module = SimpleMethodBsfEngine.class.getName(); - protected Map<String, Object> context = FastMap.newInstance(); + protected Map<String, Object> context = new HashMap<String, Object>(); /** * This is an implementation of the apply() method. It executes the funcBody text in an "anonymous" method call with arguments. Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/artifact/ArtifactInfoContext.java Sun Apr 7 17:15:10 2013 @@ -18,9 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.artifact; +import java.util.HashSet; import java.util.Set; -import javolution.util.FastSet; import org.ofbiz.minilang.SimpleMethod; /** @@ -28,9 +28,9 @@ import org.ofbiz.minilang.SimpleMethod; */ public final class ArtifactInfoContext { - private final Set<String> entityNameSet = FastSet.newInstance(); - private final Set<String> serviceNameSet = FastSet.newInstance(); - private final Set<String> simpleMethodNameSet = FastSet.newInstance(); + private final Set<String> entityNameSet = new HashSet<String>(); + private final Set<String> serviceNameSet = new HashSet<String>(); + private final Set<String> simpleMethodNameSet = new HashSet<String>(); /** * Adds an entity name to this context. Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java Sun Apr 7 17:15:10 2013 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.minilang.method; +import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.TimeZone; @@ -25,8 +26,6 @@ import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; @@ -48,14 +47,14 @@ public final class MethodContext { private Delegator delegator; private LocalDispatcher dispatcher; - private Map<String, Object> env = FastMap.newInstance(); + private Map<String, Object> env = new HashMap<String, Object>(); private ClassLoader loader; private Locale locale; private int methodType; private Map<String, Object> parameters; private HttpServletRequest request = null; private HttpServletResponse response = null; - private Map<String, Object> results = FastMap.newInstance(); + private Map<String, Object> results = new HashMap<String, Object>(); private Security security; private TimeZone timeZone; private int traceCount = 0; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java Sun Apr 7 17:15:10 2013 @@ -20,12 +20,11 @@ package org.ofbiz.minilang.method.callop import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; @@ -180,7 +179,7 @@ public final class CallService extends M } Map<String, Object> inMap = inMapFma.get(methodContext.getEnvMap()); if (inMap == null) { - inMap = FastMap.newInstance(); + inMap = new HashMap<String, Object>(); } // before invoking the service, clear messages if (methodContext.getMethodType() == MethodContext.EVENT) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java Sun Apr 7 17:15:10 2013 @@ -18,11 +18,10 @@ *******************************************************************************/ package org.ofbiz.minilang.method.callops; +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.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -71,7 +70,7 @@ public final class CallServiceAsynch ext String serviceName = serviceNameFse.expandString(methodContext.getEnvMap()); Map<String, Object> inMap = inMapFma.get(methodContext.getEnvMap()); if (inMap == null) { - inMap = FastMap.newInstance(); + inMap = new HashMap<String, Object>(); } if (includeUserLogin) { GenericValue userLogin = methodContext.getUserLogin(); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java Sun Apr 7 17:15:10 2013 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.minilang.method.callops; +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.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.minilang.MiniLangException; @@ -75,16 +74,16 @@ public final class CallSimpleMapProcesso public boolean exec(MethodContext methodContext) throws MiniLangException { List<Object> messages = errorListFma.get(methodContext.getEnvMap()); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<Object>(); errorListFma.put(methodContext.getEnvMap(), messages); } Map<String, Object> inMap = inMapFma.get(methodContext.getEnvMap()); if (inMap == null) { - inMap = FastMap.newInstance(); + inMap = new HashMap<String, Object>(); } Map<String, Object> outMap = outMapFma.get(methodContext.getEnvMap()); if (outMap == null) { - outMap = FastMap.newInstance(); + outMap = new HashMap<String, Object>(); outMapFma.put(methodContext.getEnvMap(), outMap); } // run external map processor first Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java Sun Apr 7 17:15:10 2013 @@ -21,11 +21,10 @@ package org.ofbiz.minilang.method.callop import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; @@ -104,7 +103,7 @@ public final class CallSimpleMethod exte } MethodContext localContext = methodContext; if ("function".equals(this.scope)) { - Map<String, Object> localEnv = FastMap.newInstance(); + Map<String, Object> localEnv = new HashMap<String, Object>(); localEnv.putAll(methodContext.getEnvMap()); localEnv.remove(this.simpleMethod.getEventResponseCodeName()); localEnv.remove(this.simpleMethod.getServiceResponseMessageName()); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java Sun Apr 7 17:15:10 2013 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.minilang.method.callops; +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.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -98,10 +97,10 @@ public final class SetServiceFields exte } Map<String, Object> toMap = toMapFma.get(methodContext.getEnvMap()); if (toMap == null) { - toMap = FastMap.newInstance(); + toMap = new HashMap<String, Object>(); toMapFma.put(methodContext.getEnvMap(), toMap); } - List<Object> errorMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); Map<String, Object> validAttributes = modelService.makeValid(fromMap, "IN", true, errorMessages, methodContext.getTimeZone(), methodContext.getLocale()); if (errorMessages.size() > 0) { for (Object obj : errorMessages) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java Sun Apr 7 17:15:10 2013 @@ -20,10 +20,9 @@ package org.ofbiz.minilang.method.entity import java.net.MalformedURLException; import java.net.URL; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; @@ -86,7 +85,7 @@ public final class EntityData extends Me public boolean exec(MethodContext methodContext) throws MiniLangException { List<Object> messages = errorListFma.get(methodContext.getEnvMap()); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<Object>(); errorListFma.put(methodContext.getEnvMap(), messages); } String location = this.locationFse.expandString(methodContext.getEnvMap()); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/AddError.java Sun Apr 7 17:15:10 2013 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.method.envops; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; @@ -60,7 +59,7 @@ public final class AddError extends Meth if (message != null) { List<String> messages = errorListFma.get(methodContext.getEnvMap()); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<String>(); errorListFma.put(methodContext.getEnvMap(), messages); } messages.add(message); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Assert.java Sun Apr 7 17:15:10 2013 @@ -20,10 +20,9 @@ package org.ofbiz.minilang.method.envops import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -86,7 +85,7 @@ public final class Assert extends Method messageBuffer.append("failed: "); condition.prettyPrint(messageBuffer, methodContext); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<Object>(); errorListFma.put(methodContext.getEnvMap(), messages); } messages.add(messageBuffer.toString()); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/CheckId.java Sun Apr 7 17:15:10 2013 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.method.envops; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -108,7 +107,7 @@ public final class CheckId extends Metho if (message != null) { List<String> messages = errorListFma.get(methodContext.getEnvMap()); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<String>(); } errorListFma.put(methodContext.getEnvMap(), messages); messages.add(message.concat(": ").concat(errorMsg)); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java Sun Apr 7 17:15:10 2013 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.method.envops; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; @@ -59,7 +58,7 @@ public final class FieldToList extends M if (fieldVal != null) { List<Object> toList = listFma.get(methodContext.getEnvMap()); if (toList == null) { - toList = FastList.newInstance(); + toList = new LinkedList<Object>(); listFma.put(methodContext.getEnvMap(), toList); } toList.add(fieldVal); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java Sun Apr 7 17:15:10 2013 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.method.envops; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; @@ -58,7 +57,7 @@ public final class ListToList extends Me if (fromList != null) { List<Object> toList = toListFma.get(methodContext.getEnvMap()); if (toList == null) { - toList = FastList.newInstance(); + toList = new LinkedList<Object>(); toListFma.put(methodContext.getEnvMap(), toList); } toList.addAll(fromList); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java Sun Apr 7 17:15:10 2013 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.method.envops; +import java.util.HashMap; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; @@ -59,7 +58,7 @@ public final class MapToMap extends Meth if (!toMapFma.isEmpty()) { Map<String, Object> toMap = toMapFma.get(methodContext.getEnvMap()); if (toMap == null) { - toMap = FastMap.newInstance(); + toMap = new HashMap<String, Object>(); toMapFma.put(methodContext.getEnvMap(), toMap); toMap.putAll(fromMap); } Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java Sun Apr 7 17:15:10 2013 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.ofbiz.minilang.method.envops; -import javolution.util.FastList; -import javolution.util.FastMap; +import java.util.HashMap; +import java.util.LinkedList; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; @@ -163,9 +163,9 @@ public final class SetOperation extends } if (this.type.length() > 0) { if ("NewMap".equals(this.type)) { - newValue = FastMap.newInstance(); + newValue = new HashMap<String, Object>(); } else if ("NewList".equals(this.type)) { - newValue = FastList.newInstance(); + newValue = new LinkedList<Object>(); } else { try { String format = null; Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java Sun Apr 7 17:15:10 2013 @@ -19,10 +19,9 @@ package org.ofbiz.minilang.method.envops; import java.text.MessageFormat; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.MessageString; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.collections.FlexibleMapAccessor; @@ -81,7 +80,7 @@ public final class StringToList extends } List<Object> toList = listFma.get(methodContext.getEnvMap()); if (toList == null) { - toList = FastList.newInstance(); + toList = new LinkedList<Object>(); listFma.put(methodContext.getEnvMap(), toList); } toList.add(value); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java Sun Apr 7 17:15:10 2013 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.minilang.method.eventops; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; import org.ofbiz.minilang.MiniLangException; @@ -84,7 +83,7 @@ public final class RequestParametersToLi if (parameterValues != null) { List<String> valueList = listFma.get(methodContext.getEnvMap()); if (valueList == null) { - valueList = FastList.newInstance(); + valueList = new LinkedList<String>(); listFma.put(methodContext.getEnvMap(), valueList); } for (int i = 0; i < parameterValues.length; i++) { Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java Sun Apr 7 17:15:10 2013 @@ -20,10 +20,9 @@ package org.ofbiz.minilang.method.ifops; import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -91,7 +90,7 @@ public final class CheckPermission exten if (!hasPermission && messageElement != null) { List<String> messages = errorListFma.get(methodContext.getEnvMap()); if (messages == null) { - messages = FastList.newInstance(); + messages = new LinkedList<String>(); errorListFma.put(methodContext.getEnvMap(), messages); } messages.add(messageElement.getMessage(methodContext)); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MakeInString.java Sun Apr 7 17:15:10 2013 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.minilang.operation; +import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -37,7 +36,7 @@ public class MakeInString { public static final String module = MakeInString.class.getName(); String fieldName; - List<MakeInStringOperation> operations = FastList.newInstance(); + List<MakeInStringOperation> operations = new ArrayList<MakeInStringOperation>(); public MakeInString(Element makeInStringElement) { fieldName = makeInStringElement.getAttribute("field"); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/MapProcessor.java Sun Apr 7 17:15:10 2013 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.minilang.operation; +import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.w3c.dom.Element; @@ -33,9 +32,9 @@ import org.w3c.dom.Element; */ public class MapProcessor { - List<MakeInString> makeInStrings = FastList.newInstance(); + List<MakeInString> makeInStrings = new ArrayList<MakeInString>(); String name; - List<SimpleMapProcess> simpleMapProcesses = FastList.newInstance(); + List<SimpleMapProcess> simpleMapProcesses = new ArrayList<SimpleMapProcess>(); public MapProcessor(Element simpleMapProcessorElement) { name = simpleMapProcessorElement.getAttribute("name"); Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java?rev=1465427&r1=1465426&r2=1465427&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java (original) +++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/operation/SimpleMapProcess.java Sun Apr 7 17:15:10 2013 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.minilang.operation; +import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -37,7 +36,7 @@ public class SimpleMapProcess { public static final String module = SimpleMapProcess.class.getName(); String field = ""; - List<SimpleMapOperation> simpleMapOperations = FastList.newInstance(); + List<SimpleMapOperation> simpleMapOperations = new ArrayList<SimpleMapOperation>(); public SimpleMapProcess(Element simpleMapProcessElement) { this.field = simpleMapProcessElement.getAttribute("field"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |