svn commit: r1635897 [4/4] - in /ofbiz/branches/json-integration-refactoring: ./ applications/order/src/org/ofbiz/order/order/ framework/base/src/org/ofbiz/base/concurrent/ framework/base/src/org/ofbiz/base/config/ framework/base/src/org/ofbiz/base/uti...

[jacopoc]

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Sat Nov  1 07:15:09 2014
@@ -34,8 +34,6 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.ParserConfigurationException;
 
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilFormatOut;
@@ -59,7 +57,8 @@ import org.ofbiz.widget.form.MacroFormRe
 import org.ofbiz.widget.form.ModelForm;
 import org.ofbiz.widget.html.HtmlScreenRenderer.ScreenletMenuRenderer;
 import org.ofbiz.widget.menu.MenuStringRenderer;
-import org.ofbiz.widget.screen.ModelScreenWidget.*;
+import org.ofbiz.widget.screen.ModelScreenWidget.Column;
+import org.ofbiz.widget.screen.ModelScreenWidget.ColumnContainer;
 import org.xml.sax.SAXException;
 
 import freemarker.core.Environment;
@@ -156,7 +155,7 @@ public class MacroScreenRenderer impleme
             this.widgetCommentsEnabled = ModelWidget.widgetBoundaryCommentsEnabled(context);
         }
         if (this.widgetCommentsEnabled) {
-            Map<String, Object> parameters = FastMap.newInstance();
+            Map<String, Object> parameters = new HashMap<String, Object>();
             StringBuilder sb = new StringBuilder("Begin ");
             sb.append(section.isMainSection ? "Screen " : "Section Widget ");
             sb.append(section.getBoundaryCommentName());
@@ -166,7 +165,7 @@ public class MacroScreenRenderer impleme
     }
     public void renderSectionEnd(Appendable writer, Map<String, Object> context, ModelScreenWidget.Section section) throws IOException {
         if (this.widgetCommentsEnabled) {
-            Map<String, Object> parameters = FastMap.newInstance();
+            Map<String, Object> parameters = new HashMap<String, Object>();
             StringBuilder sb = new StringBuilder();
             sb.append("End ");
             sb.append(section.isMainSection ? "Screen " : "Section Widget ");
@@ -190,7 +189,7 @@ public class MacroScreenRenderer impleme
             RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
             autoUpdateLink = rh.makeLink(request, response, autoUpdateTarget);
         }
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("id", containerId);
         parameters.put("style", container.getStyle(context));
         parameters.put("autoUpdateLink", autoUpdateLink);
@@ -203,7 +202,7 @@ public class MacroScreenRenderer impleme
     }
 
     public void renderLabel(Appendable writer, Map<String, Object> context, ModelScreenWidget.Label label) throws IOException {
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("text", label.getText(context));
         parameters.put("id", label.getId(context));
         parameters.put("style", label.getStyle(context));
@@ -211,7 +210,7 @@ public class MacroScreenRenderer impleme
     }
 
     public void renderHorizontalSeparator(Appendable writer, Map<String, Object> context, ModelScreenWidget.HorizontalSeparator separator) throws IOException {
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("id", separator.getId(context));
         parameters.put("style", separator.getStyle(context));
         executeMacro(writer, "renderHorizontalSeparator", parameters);
@@ -341,7 +340,7 @@ public class MacroScreenRenderer impleme
         } else {
             urlString = src;
         }
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("src", src);
         parameters.put("id", image.getId(context));
         parameters.put("style", image.getStyle(context));
@@ -360,7 +359,7 @@ public class MacroScreenRenderer impleme
 
          if (Debug.verboseOn()) Debug.logVerbose("directEditRequest:" + editRequest, module);
 
-         Map<String, Object> parameters = FastMap.newInstance();
+         Map<String, Object> parameters = new HashMap<String, Object>();
          parameters.put("editRequest", editRequest);
          parameters.put("enableEditValue", enableEditValue == null ? "" : enableEditValue);
          parameters.put("editContainerStyle", content.getEditContainerStyle(context));
@@ -378,7 +377,7 @@ public class MacroScreenRenderer impleme
         Delegator delegator = (Delegator) context.get("delegator");
 
         // make a new map for content rendering; so our current map does not get clobbered
-        Map<String, Object> contentContext = FastMap.newInstance();
+        Map<String, Object> contentContext = new HashMap<String, Object>();
         contentContext.putAll(context);
         String dataResourceId = (String)contentContext.get("dataResourceId");
         if (Debug.verboseOn()) Debug.logVerbose("expandedContentId:" + expandedContentId, module);
@@ -454,7 +453,7 @@ public class MacroScreenRenderer impleme
                 urlString = rh.makeLink(request, response, editRequest, false, false, false);
             }
 
-            Map<String, Object> parameters = FastMap.newInstance();
+            Map<String, Object> parameters = new HashMap<String, Object>();
             parameters.put("urlString", urlString);
             parameters.put("editMode", editMode);
             parameters.put("editContainerStyle", content.getEditContainerStyle(context));
@@ -476,7 +475,7 @@ public class MacroScreenRenderer impleme
             fullUrlString = rh.makeLink(request, response, urlString, true, false, false);
         }
 
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("fullUrl", fullUrlString);
         parameters.put("width", content.getWidth());
         parameters.put("height", content.getHeight());
@@ -488,7 +487,7 @@ public class MacroScreenRenderer impleme
          String enableEditName = content.getEnableEditName(context);
          String enableEditValue = (String)context.get(enableEditName);
 
-         Map<String, Object> parameters = FastMap.newInstance();
+         Map<String, Object> parameters = new HashMap<String, Object>();
          parameters.put("editContainerStyle", content.getEditContainerStyle(context));
          parameters.put("editRequest", content.getEditRequest(context));
          parameters.put("enableEditValue", enableEditValue == null ? "" : enableEditValue);
@@ -505,7 +504,7 @@ public class MacroScreenRenderer impleme
          Delegator delegator = (Delegator) context.get("delegator");
 
          // create a new map for the content rendering; so our current context does not get overwritten!
-         Map<String, Object> contentContext = FastMap.newInstance();
+         Map<String, Object> contentContext = new HashMap<String, Object>();
          contentContext.putAll(context);
 
          try {
@@ -570,7 +569,7 @@ public class MacroScreenRenderer impleme
              }
          }
 
-         Map<String, Object> parameters = FastMap.newInstance();
+         Map<String, Object> parameters = new HashMap<String, Object>();
          parameters.put("urlString", urlString);
          parameters.put("editMode", editMode);
          parameters.put("editContainerStyle", content.getEditContainerStyle(context));
@@ -628,7 +627,7 @@ public class MacroScreenRenderer impleme
             menuString = sb.toString();
         }
 
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("title", title);
         parameters.put("collapsible", collapsible);
         parameters.put("saveCollapsed", screenlet.saveCollapsed());
@@ -781,7 +780,7 @@ public class MacroScreenRenderer impleme
             firstLinkUrl = rh.makeLink(request, response, linkText);
         }
 
-        Map<String, Object> parameters = FastMap.newInstance();
+        Map<String, Object> parameters = new HashMap<String, Object>();
         parameters.put("lowIndex", modelForm.getLowIndex(context));
         parameters.put("actualPageSize", actualPageSize);
         parameters.put("ofLabel", ofLabel);

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Sat Nov  1 07:15:09 2014
@@ -19,12 +19,11 @@
 package org.ofbiz.widget.screen;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javolution.util.FastSet;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilGenerics;
@@ -84,7 +83,7 @@ public class ModelScreen extends ModelWi
     }
 
     public Set<String> getAllServiceNamesUsed() {
-        Set<String> allServiceNamesUsed = FastSet.newInstance();
+        Set<String> allServiceNamesUsed = new HashSet<String>();
         findServiceNamesUsedInWidget(this.section, allServiceNamesUsed);
         return allServiceNamesUsed;
     }
@@ -144,7 +143,7 @@ public class ModelScreen extends ModelWi
         }
     }
     public Set<String> getAllEntityNamesUsed() {
-        Set<String> allEntityNamesUsed = FastSet.newInstance();
+        Set<String> allEntityNamesUsed = new HashSet<String>();
         findEntityNamesUsedInWidget(this.section, allEntityNamesUsed);
         return allEntityNamesUsed;
     }
@@ -215,7 +214,7 @@ public class ModelScreen extends ModelWi
         }
     }
     public Set<String> getAllFormNamesIncluded() {
-        Set<String> allFormNamesIncluded = FastSet.newInstance();
+        Set<String> allFormNamesIncluded = new HashSet<String>();
         findFormNamesIncludedInWidget(this.section, allFormNamesIncluded);
         return allFormNamesIncluded;
     }
@@ -268,7 +267,7 @@ public class ModelScreen extends ModelWi
     }
 
     public Set<String> getAllRequestsLocationAndUri() throws GeneralException {
-        Set<String> allRequestNamesIncluded = FastSet.newInstance();
+        Set<String> allRequestNamesIncluded = new HashSet<String>();
         findRequestNamesLinkedtoInWidget(this.section, allRequestNamesIncluded);
         return allRequestNamesIncluded;
     }

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Sat Nov  1 07:15:09 2014
@@ -21,6 +21,8 @@ package org.ofbiz.widget.screen;
 import java.io.Serializable;
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -30,9 +32,6 @@ import java.util.regex.PatternSyntaxExce
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.ObjectType;
@@ -82,9 +81,8 @@ public abstract class ModelScreenAction
 
     @Deprecated
     public static List<ModelScreenAction> readSubActions(ModelScreen modelScreen, Element parentElement) {
-        List<ModelScreenAction> actions = FastList.newInstance();
-
         List<? extends Element> actionElementList = UtilXml.childElementList(parentElement);
+        List<ModelScreenAction> actions = new ArrayList<ModelScreenAction>(actionElementList.size());
         for (Element actionElement: actionElementList) {
             if ("set".equals(actionElement.getNodeName())) {
                 actions.add(new SetField(modelScreen, actionElement));
@@ -150,6 +148,7 @@ public abstract class ModelScreenAction
             }
         }
 
+        @SuppressWarnings("rawtypes")
         @Override
         public void runAction(Map<String, Object> context) {
             String globalStr = this.globalExdr.expandString(context);
@@ -189,9 +188,9 @@ public abstract class ModelScreenAction
 
             if (UtilValidate.isNotEmpty(this.type)) {
                 if ("NewMap".equals(this.type)) {
-                    newValue = FastMap.newInstance();
+                    newValue = new HashMap();
                 } else if ("NewList".equals(this.type)) {
-                    newValue = FastList.newInstance();
+                    newValue = new LinkedList();
                 } else {
                     try {
                         newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
@@ -414,7 +413,7 @@ public abstract class ModelScreenAction
         @Override
         public void runAction(Map<String, Object> context) throws GeneralException {
             if (location.endsWith(".xml")) {
-                Map<String, Object> localContext = FastMap.newInstance();
+                Map<String, Object> localContext = new HashMap<String, Object>();
                 localContext.putAll(context);
                 DispatchContext ctx = this.modelScreen.getDispatcher(context).getDispatchContext();
                 MethodContext methodContext = new MethodContext(ctx, localContext, null);
@@ -460,7 +459,7 @@ public abstract class ModelScreenAction
                 if ("true".equals(autoFieldMapString)) {
                     DispatchContext dc = this.modelScreen.getDispatcher(context).getDispatchContext();
                     // try a map called "parameters", try it first so values from here are overriden by values in the main context
-                    Map<String, Object> combinedMap = FastMap.newInstance();
+                    Map<String, Object> combinedMap = new HashMap<String, Object>();
                     Map<String, Object> parametersObj = UtilGenerics.toMap(context.get("parameters"));
                     if (parametersObj != null) {
                         combinedMap.putAll(parametersObj);
@@ -475,7 +474,7 @@ public abstract class ModelScreenAction
                     }
                 }
                 if (serviceContext == null) {
-                    serviceContext = FastMap.newInstance();
+                    serviceContext = new HashMap<String, Object>();
                 }
 
                 if (this.fieldMap != null) {

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Sat Nov  1 07:15:09 2014
@@ -20,13 +20,13 @@ package org.ofbiz.widget.screen;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import javolution.util.FastList;
-
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternMatcher;
@@ -85,8 +85,8 @@ public class ModelScreenCondition implem
     }
 
     public static List<ScreenCondition> readSubConditions(ModelScreen modelScreen, Element conditionElement) {
-        List<ScreenCondition> condList = FastList.newInstance();
         List<? extends Element> subElementList = UtilXml.childElementList(conditionElement);
+        List<ScreenCondition> condList = new ArrayList<ScreenCondition>(subElementList.size());
         for (Element subElement: subElementList) {
             condList.add(readCondition(modelScreen, subElement));
         }
@@ -420,7 +420,7 @@ public class ModelScreenCondition implem
                 fieldVal = "";
             }
 
-            List<Object> messages = FastList.newInstance();
+            List<Object> messages = new LinkedList<Object>();
             Boolean resultBool = BaseCompare.doRealCompare(fieldVal, value, operator, type, format, messages, null, null, true);
             if (messages.size() > 0) {
                 messages.add(0, "Error with comparison in if-compare between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and value [" + value + "] with operator [" + operator + "] and type [" + type + "]: ");
@@ -471,7 +471,7 @@ public class ModelScreenCondition implem
                 fieldVal = "";
             }
 
-            List<Object> messages = FastList.newInstance();
+            List<Object> messages = new LinkedList<Object>();
             Boolean resultBool = BaseCompare.doRealCompare(fieldVal, toFieldVal, operator, type, format, messages, null, null, false);
             if (messages.size() > 0) {
                 messages.add(0, "Error with comparison in if-compare-field between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and to-field [" + toFieldAcsr.toString() + "] with value [" + toFieldVal + "] with operator [" + operator + "] and type [" + type + "]: ");

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Sat Nov  1 07:15:09 2014
@@ -23,15 +23,13 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-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;
@@ -85,7 +83,7 @@ public abstract class ModelScreenWidget
     public abstract String rawString();
 
     public static List<ModelScreenWidget> readSubWidgets(ModelScreen modelScreen, List<? extends Element> subElementList) {
-        List<ModelScreenWidget> subWidgets = FastList.newInstance();
+        List<ModelScreenWidget> subWidgets = new ArrayList<ModelScreenWidget>(subElementList.size());
         for (Element subElement: subElementList) {
             subWidgets.add(WidgetFactory.getModelScreenWidget(modelScreen, subElement));
         }
@@ -570,7 +568,7 @@ public abstract class ModelScreenWidget
                 // build the widgetpath
                 List<String> widgetTrail = UtilGenerics.toList(context.get("_WIDGETTRAIL_"));
                 if (widgetTrail == null) {
-                    widgetTrail = FastList.newInstance();
+                    widgetTrail = new LinkedList<String>();
                 }
 
                 String thisName = nameExdr.expandString(context);
@@ -1273,7 +1271,7 @@ public abstract class ModelScreenWidget
         protected String linkType;
         protected String width;
         protected String height;
-        protected List<WidgetWorker.Parameter> parameterList = FastList.newInstance();
+        protected List<WidgetWorker.Parameter> parameterList = new ArrayList<WidgetWorker.Parameter>();
         protected WidgetWorker.AutoServiceParameters autoServiceParameters;
         protected WidgetWorker.AutoEntityParameters autoEntityParameters;
 
@@ -1397,7 +1395,7 @@ public abstract class ModelScreenWidget
         }
 
         public Map<String, String> getParameterMap(Map<String, Object> context) {
-            Map<String, String> fullParameterMap = FastMap.newInstance();
+            Map<String, String> fullParameterMap = new HashMap<String, String>();
 
             /* leaving this here... may want to add it at some point like the hyperlink element:
             Map<String, String> addlParamMap = this.parametersMapAcsr.get(context);

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java Sat Nov  1 07:15:09 2014
@@ -20,6 +20,7 @@ package org.ofbiz.widget.screen;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -27,8 +28,6 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.ParserConfigurationException;
 
-import javolution.util.FastMap;
-
 import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
@@ -162,7 +161,7 @@ public class ScreenFactory {
     }
 
     public static Map<String, ModelScreen> readScreenDocument(Document screenFileDoc, String sourceLocation) {
-        Map<String, ModelScreen> modelScreenMap = FastMap.newInstance();
+        Map<String, ModelScreen> modelScreenMap = new HashMap<String, ModelScreen>();
         if (screenFileDoc != null) {
             // read document and construct ModelScreen for each screen element
             Element rootElement = screenFileDoc.getDocumentElement();

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Sat Nov  1 07:15:09 2014
@@ -21,6 +21,8 @@ package org.ofbiz.widget.screen;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -32,9 +34,6 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpSession;
 import javax.xml.parsers.ParserConfigurationException;
 
-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;
@@ -186,6 +185,7 @@ public class ScreenRenderer {
         populateContextForRequest(context, this, request, response, servletContext);
     }
 
+    @SuppressWarnings("rawtypes")
     public static void populateContextForRequest(MapStack<String> context, ScreenRenderer screens, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
         HttpSession session = request.getSession();
 
@@ -246,7 +246,7 @@ public class ScreenRenderer {
         context.put("requestParameters",  UtilHttp.getParameterMap(request));
         
         // this is a dummy object to stand-in for the JPublish page object for backward compatibility
-        context.put("page", FastMap.newInstance());
+        context.put("page", new HashMap());
 
         // some information from/about the ControlServlet environment
         context.put("controlPath", request.getAttribute("_CONTROL_PATH_"));
@@ -260,9 +260,9 @@ public class ScreenRenderer {
 
         // setup message lists
         List<String> eventMessageList = UtilGenerics.toList(request.getAttribute("eventMessageList"));
-        if (eventMessageList == null) eventMessageList = FastList.newInstance();
+        if (eventMessageList == null) eventMessageList = new LinkedList<String>();
         List<String> errorMessageList = UtilGenerics.toList(request.getAttribute("errorMessageList"));
-        if (errorMessageList == null) errorMessageList = FastList.newInstance();
+        if (errorMessageList == null) errorMessageList = new LinkedList<String>();
 
         if (request.getAttribute("_EVENT_MESSAGE_") != null) {
             eventMessageList.add(UtilFormatOut.replaceString((String) request.getAttribute("_EVENT_MESSAGE_"), "\n", "<br/>"));

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Sat Nov  1 07:15:09 2014
@@ -20,8 +20,10 @@ package org.ofbiz.widget.tree;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
@@ -29,9 +31,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.ParserConfigurationException;
 
-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;
@@ -43,11 +42,6 @@ import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.MapStack;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.widget.WidgetWorker;
-import org.ofbiz.widget.screen.ModelScreen;
-import org.ofbiz.widget.screen.ScreenFactory;
-import org.ofbiz.widget.screen.ScreenStringRenderer;
-import org.ofbiz.widget.screen.ScreenRenderException;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -56,6 +50,11 @@ import org.ofbiz.entity.model.ModelField
 import org.ofbiz.entity.util.EntityListIterator;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.widget.ModelWidget;
+import org.ofbiz.widget.WidgetWorker;
+import org.ofbiz.widget.screen.ModelScreen;
+import org.ofbiz.widget.screen.ScreenFactory;
+import org.ofbiz.widget.screen.ScreenRenderException;
+import org.ofbiz.widget.screen.ScreenStringRenderer;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
@@ -71,8 +70,8 @@ public class ModelTree extends ModelWidg
     protected String rootNodeName;
     protected String defaultRenderStyle;
     protected FlexibleStringExpander defaultWrapStyleExdr;
-    protected List<ModelNode> nodeList = FastList.newInstance();
-    protected Map<String, ModelNode> nodeMap = FastMap.newInstance();
+    protected List<ModelNode> nodeList = new ArrayList<ModelNode>();
+    protected Map<String, ModelNode> nodeMap = new HashMap<String, ModelNode>();
     protected Delegator delegator;
     protected LocalDispatcher dispatcher;
     protected FlexibleStringExpander expandCollapseRequestExdr;
@@ -227,6 +226,7 @@ public class ModelTree extends ModelWidg
      *   different tree elements; implementing your own makes it possible to
      *   use the same tree definitions for many types of tree UIs
      */
+    @SuppressWarnings("rawtypes")
     public void renderTreeString(StringBuffer buf, Map<String, Object> context, TreeStringRenderer treeStringRenderer) throws GeneralException {
         Map<String, Object> parameters = UtilGenerics.checkMap(context.get("parameters"));
 
@@ -246,10 +246,10 @@ public class ModelTree extends ModelWidg
             context.put("rootEntityId", trail.get(0));
             context.put(defaultPkName, trail.get(0));
         } else {
-            trail = FastList.newInstance();
+            trail = new LinkedList<String>();
         }
         context.put("targetNodeTrail", trail);
-        context.put("currentNodeTrail", FastList.newInstance());
+        context.put("currentNodeTrail", new LinkedList());
         StringWriter writer = new StringWriter();
         try {
             node.renderNodeString(writer, context, treeStringRenderer, 0);
@@ -282,8 +282,8 @@ public class ModelTree extends ModelWidg
         protected Label label;
         protected Link link;
         protected Image image;
-        protected List<ModelSubNode> subNodeList = FastList.newInstance();
-        protected List<ModelTreeAction> actions = FastList.newInstance();
+        protected List<ModelSubNode> subNodeList = new ArrayList<ModelSubNode>();
+        protected List<ModelTreeAction> actions = new ArrayList<ModelTreeAction>();
         protected String name;
         protected ModelTree modelTree;
         protected List<Object []> subNodeValues;
@@ -545,7 +545,7 @@ public class ModelTree extends ModelWidg
         }
 
         public void getChildren(Map<String, Object> context) {
-             this.subNodeValues = FastList.newInstance();
+             this.subNodeValues = new ArrayList<Object []>();
              for (ModelSubNode subNode: subNodeList) {
                  String nodeName = subNode.getNodeName(context);
                  ModelNode node = modelTree.nodeMap.get(nodeName);
@@ -699,7 +699,7 @@ public class ModelTree extends ModelWidg
 
             protected ModelNode rootNode;
             protected FlexibleStringExpander nodeNameExdr;
-            protected List<ModelTreeAction> actions = FastList.newInstance();
+            protected List<ModelTreeAction> actions = new ArrayList<ModelTreeAction>();
             protected ListIterator<? extends Map<String, ? extends Object>> listIterator;
 
             public ModelSubNode() {}
@@ -813,7 +813,7 @@ public class ModelTree extends ModelWidg
             protected boolean secure = false;
             protected boolean encode = false;
             protected String linkType;
-            protected List<WidgetWorker.Parameter> parameterList = FastList.newInstance();
+            protected List<WidgetWorker.Parameter> parameterList = new ArrayList<WidgetWorker.Parameter>();
 
             public Link() {
                 setText(null);
@@ -936,7 +936,7 @@ public class ModelTree extends ModelWidg
             }
 
             public Map<String, String> getParameterMap(Map<String, Object> context) {
-                Map<String, String> fullParameterMap = FastMap.newInstance();
+                Map<String, String> fullParameterMap = new HashMap<String, String>();
 
                 /* leaving this here... may want to add it at some point like the hyperlink element:
                 Map<String, String> addlParamMap = this.parametersMapAcsr.get(context);

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeAction.java Sat Nov  1 07:15:09 2014
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package org.ofbiz.widget.tree;
 
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Locale;
@@ -25,9 +27,6 @@ import java.util.Map;
 import java.util.TimeZone;
 import java.util.regex.PatternSyntaxException;
 
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
 import org.ofbiz.base.util.BshUtil;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
@@ -128,6 +127,7 @@ public abstract class ModelTreeAction {
             }
         }
 
+        @SuppressWarnings("rawtypes")
         @Override
         public void runAction(Map<String, Object> context) {
             String globalStr = this.globalExdr.expandString(context);
@@ -142,9 +142,9 @@ public abstract class ModelTreeAction {
             }
             if (UtilValidate.isNotEmpty(this.type)) {
                 if ("NewMap".equals(this.type)) {
-                    newValue = FastMap.newInstance();
+                    newValue = new HashMap();
                 } else if ("NewList".equals(this.type)) {
-                    newValue = FastList.newInstance();
+                    newValue = new LinkedList();
                 } else {
                     try {
                         newValue = ObjectType.simpleTypeConvert(newValue, this.type, null, (TimeZone) context.get("timeZone"), (Locale) context.get("locale"), true);
@@ -264,7 +264,7 @@ public abstract class ModelTreeAction {
                 if (autoFieldMapBool) {
                     serviceContext = this.modelTree.getDispatcher().getDispatchContext().makeValidContext(serviceNameExpanded, ModelService.IN_PARAM, context);
                 } else {
-                    serviceContext = FastMap.newInstance();
+                    serviceContext = new HashMap<String, Object>();
                 }
 
                 if (this.fieldMap != null) {

Modified: ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java (original)
+++ ofbiz/branches/json-integration-refactoring/framework/widget/src/org/ofbiz/widget/tree/ModelTreeCondition.java Sat Nov  1 07:15:09 2014
@@ -19,13 +19,13 @@
 package org.ofbiz.widget.tree;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
-import javolution.util.FastList;
-
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternMatcher;
@@ -77,7 +77,7 @@ public class ModelTreeCondition {
     }
 
     public static List<TreeCondition> readSubConditions(ModelTree modelTree, Element conditionElement) {
-        List<TreeCondition> condList = FastList.newInstance();
+        List<TreeCondition> condList = new ArrayList<TreeCondition>();
         for (Element subElement: UtilXml.childElementList(conditionElement)) {
             condList.add(readCondition(modelTree, subElement));
         }
@@ -323,7 +323,7 @@ public class ModelTreeCondition {
                 fieldVal = "";
             }
 
-            List<Object> messages = FastList.newInstance();
+            List<Object> messages = new LinkedList<Object>();
             Boolean resultBool = BaseCompare.doRealCompare(fieldVal, value, operator, type, format, messages, null, null, true);
             if (messages.size() > 0) {
                 messages.add(0, "Error with comparison in if-compare between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and value [" + value + "] with operator [" + operator + "] and type [" + type + "]: ");
@@ -374,7 +374,7 @@ public class ModelTreeCondition {
                 fieldVal = "";
             }
 
-            List<Object> messages = FastList.newInstance();
+            List<Object> messages = new LinkedList<Object>();
             Boolean resultBool = BaseCompare.doRealCompare(fieldVal, toFieldVal, operator, type, format, messages, null, null, false);
             if (messages.size() > 0) {
                 messages.add(0, "Error with comparison in if-compare-field between field [" + fieldAcsr.toString() + "] with value [" + fieldVal + "] and to-field [" + toFieldVal.toString() + "] with value [" + toFieldVal + "] with operator [" + operator + "] and type [" + type + "]: ");

Modified: ofbiz/branches/json-integration-refactoring/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/json-integration-refactoring/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml?rev=1635897&r1=1635896&r2=1635897&view=diff
==============================================================================
--- ofbiz/branches/json-integration-refactoring/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml (original)
+++ ofbiz/branches/json-integration-refactoring/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml Sat Nov  1 07:15:09 2014
@@ -75,13 +75,13 @@
                 <if-compare operator="equals" value="${parameters.custRequestId}"
                     field="custReq[i].custRequestId">
                     <if-compare operator="not-equals" value="0" field="i">
-                        <set field="temp" from-field="custReq[i].custSequenceNum" /><log level="always" message="$$$$$$$$$ temp : ${temp}"></log>
+                        <set field="temp" from-field="custReq[i].custSequenceNum" /><!--<log level="always" message="$$$$$$$$$ temp : ${temp}"></log>-->
                         <set field="custReq[i].custSequenceNum" from-field="custReq[i-1].custSequenceNum" />
                         <set field="custReq[i-1].custSequenceNum" from-field="temp" />
 
                         <entity-one value-field="firstup" entity-name="CustRequest">
                             <field-map field-name="custRequestId" from-field="custReq[i].custRequestId" />
-                        </entity-one><log level="always" message="666666666666666666666 firstup : ${firstup}"></log>
+                        </entity-one><!--<log level="always" message="666666666666666666666 firstup : ${firstup}"></log>-->
                         <set field="firstup.custSequenceNum" from-field="custReq[i].custSequenceNum" />
                         <if-empty field="firstup">
                             <add-error><fail-message message="Cannot find with ID [${custReq[i].custRequestId}] and custSequenceNum [${custReq[i].custSequenceNum}]"/></add-error>
@@ -322,7 +322,7 @@
             <set field="index" value="${getNum-1}" />
             <set field="bottomCustReq" from-field="custReq[index]" />
             <!-- loop search selected custReq -->
-            <loop count="${index}" field="i"><log level="always" message="////////// i : ${i}"></log>
+            <loop count="${index}" field="i"><!--<log level="always" message="////////// i : ${i}"></log>-->
                 <if-compare-field operator="equals"
                     field="parameters.custRequestId" to-field="custReq[i].custRequestId">
                     <set field="selectedCustReq" from-field="custReq[i]" />
@@ -330,7 +330,7 @@
                     <set field="selectedIndex" from-field="i" />
                 </if-compare-field>
             </loop>
-            <loop count="${diffIndex}" field="j"><log level="always" message="////////// j : ${j}"></log>
+            <loop count="${diffIndex}" field="j"><!--<log level="always" message="////////// j : ${j}"></log>-->
                 <set field="lowerSeqNum" from-field="custReq[j+selectedIndex].custSequenceNum" />
 
                 <entity-one value-field="update" entity-name="CustRequest">
@@ -2377,7 +2377,7 @@
         </if-not-empty>
     </simple-method>
     <simple-method method-name="autoSprintNotification" short-description="Auto Sprint Notification">
-     <log level="always" message="==========>>> Auto Sprint Notification : ${parameters.sprintStatusId} for sprintId # ${parameters.sprintId}"/>
+     <!--<log level="always" message="==========>>> Auto Sprint Notification : ${parameters.sprintStatusId} for sprintId # ${parameters.sprintId}"/>-->
         <if-compare operator="equals" value="SPRINT_ACTIVE" field="parameters.sprintStatusId">
             <call-simple-method method-name="checkProductOwnerOfSprint"/>
             <if-not-empty field="ownerPartyId">
@@ -2404,7 +2404,7 @@
         </if-compare>
     </simple-method>
     <simple-method method-name="autoBacklogNotification" short-description="Auto backlog Notification">
-        <log level="always" message="==========>>> Auto backlog Notification : ${parameters.custRequestStatusId} for custRequestId # ${parameters.custRequestId}"/>
+        <!--<log level="always" message="==========>>> Auto backlog Notification : ${parameters.custRequestStatusId} for custRequestId # ${parameters.custRequestId}"/>-->
         <if-compare operator="equals" value="CRQ_ACCEPTED" field="parameters.custRequestStatusId">
             <call-simple-method method-name="checkProductOwnerOfBacklog"/>
             <if-not-empty field="ownerPartyId">