svn commit: r662590 [2/2] - in /ofbiz/trunk/framework: minilang/src/org/ofbiz/minilang/method/ widget/src/org/ofbiz/widget/ widget/src/org/ofbiz/widget/cache/ widget/src/org/ofbiz/widget/fo/ widget/src/org/ofbiz/widget/form/ widget/src/org/ofbiz/widget...

[adrianc]

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Mon Jun  2 15:23:55 2008
@@ -31,6 +31,7 @@
 import org.ofbiz.base.util.*;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entityext.permission.EntityPermissionChecker;
 import org.ofbiz.minilang.operation.BaseCompare;
@@ -48,6 +49,7 @@
 /**
  * Widget Library - Screen model condition class
  */
+@SuppressWarnings("serial")
 public class ModelScreenCondition implements Serializable {
     public static final String module = ModelScreenCondition.class.getName();
 
@@ -77,8 +79,8 @@
         public abstract boolean eval(Map<String, Object> context);
     }
     
-    public static List readSubConditions(ModelScreen modelScreen, Element conditionElement) {
-        List condList = FastList.newInstance();
+    public static List<ScreenCondition> readSubConditions(ModelScreen modelScreen, Element conditionElement) {
+        List<ScreenCondition> condList = FastList.newInstance();
         List subElementList = UtilXml.childElementList(conditionElement);
         Iterator subElementIter = subElementList.iterator();
         while (subElementIter.hasNext()) {
@@ -235,11 +237,8 @@
                     return false;
                 }
 
-                Map serviceContext;
-                Object internalSvcMap = context.get(contextMap);
-                if (internalSvcMap != null && (internalSvcMap instanceof Map)) {
-                    serviceContext = (Map) internalSvcMap;
-
+                Map<String, Object> serviceContext = UtilGenerics.toMap(context.get(contextMap));
+                if (serviceContext != null) {
                     // copy the required internal fields
                     serviceContext.put("userLogin", context.get("userLogin"));
                     serviceContext.put("locale", context.get("locale"));
@@ -262,14 +261,14 @@
 
                 if (permService != null) {
                     // build the context
-                    Map svcCtx = permService.makeValid(serviceContext, ModelService.IN_PARAM);
+                    Map<String, Object> svcCtx = permService.makeValid(serviceContext, ModelService.IN_PARAM);
                     svcCtx.put("resourceDescription", resource);
                     if (UtilValidate.isNotEmpty(mainAction)) {
                         svcCtx.put("mainAction", mainAction);
                     }
 
                     // invoke the service
-                    Map resp;
+                    Map<String, Object> resp;
                     try {
                         resp = dispatcher.runSync(permService.name,  svcCtx, 300, true);
                     } catch (GenericServiceException e) {
@@ -413,7 +412,7 @@
                 fieldVal = "";
             }
 
-            List messages = FastList.newInstance();
+            List<String> messages = FastList.newInstance();
             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 + "]: ");
@@ -462,7 +461,7 @@
                 fieldVal = "";
             }
 
-            List messages = FastList.newInstance();
+            List<String> messages = FastList.newInstance();
             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/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Mon Jun  2 15:23:55 2008
@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -36,6 +35,7 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
@@ -168,6 +168,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Section extends ModelScreenWidget {
         protected ModelScreenCondition condition;
         protected List<ModelScreenAction> actions;
@@ -261,6 +262,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Container extends ModelScreenWidget {
         protected FlexibleStringExpander idExdr;
         protected FlexibleStringExpander styleExdr;
@@ -448,6 +450,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class IncludeScreen extends ModelScreenWidget {
         protected FlexibleStringExpander nameExdr;
         protected FlexibleStringExpander locationExdr;
@@ -471,9 +474,9 @@
                 ((MapStack) context).push();
                 
                 // build the widgetpath
-                List widgetTrail = (List) context.get("_WIDGETTRAIL_");
+                List<String> widgetTrail = UtilGenerics.toList(context.get("_WIDGETTRAIL_"));
                 if (widgetTrail == null) {
-                    widgetTrail = new ArrayList();
+                    widgetTrail = new ArrayList<String>();
                 }
                 
                 String thisName = nameExdr.expandString(context);
@@ -546,10 +549,11 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class DecoratorScreen extends ModelScreenWidget {
         protected FlexibleStringExpander nameExdr;
         protected FlexibleStringExpander locationExdr;
-        protected Map<String, DecoratorSection> sectionMap = new HashMap();
+        protected Map<String, DecoratorSection> sectionMap = new HashMap<String, DecoratorSection>();
         
         public DecoratorScreen(ModelScreen modelScreen, Element decoratorScreenElement) {
             super(modelScreen, decoratorScreenElement);
@@ -565,6 +569,7 @@
             }
         }
 
+        @SuppressWarnings("unchecked")
         public void renderWidgetString(Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException {
             // isolate the scope
             if (!(context instanceof MapStack)) {
@@ -633,6 +638,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class DecoratorSection extends ModelScreenWidget {
         protected List<ModelScreenWidget> subWidgets;
         
@@ -653,6 +659,7 @@
         }
     }
     
+    @SuppressWarnings("serial")
     public static class DecoratorSectionInclude extends ModelScreenWidget {
         
         public DecoratorSectionInclude(ModelScreen modelScreen, Element decoratorSectionElement) {
@@ -685,6 +692,7 @@
         }
     }
     
+    @SuppressWarnings("serial")
     public static class Label extends ModelScreenWidget {
         protected FlexibleStringExpander textExdr;
         
@@ -730,6 +738,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Form extends ModelScreenWidget {
         protected FlexibleStringExpander nameExdr;
         protected FlexibleStringExpander locationExdr;
@@ -816,6 +825,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Tree extends ModelScreenWidget {
         protected FlexibleStringExpander nameExdr;
         protected FlexibleStringExpander locationExdr;
@@ -909,12 +919,13 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class PlatformSpecific extends ModelScreenWidget {
         protected Map<String, ModelScreenWidget> subWidgets;
         
         public PlatformSpecific(ModelScreen modelScreen, Element platformSpecificElement) {
             super(modelScreen, platformSpecificElement);
-            subWidgets = new HashMap();
+            subWidgets = new HashMap<String, ModelScreenWidget>();
             List childElements = UtilXml.childElementList(platformSpecificElement);
             if (childElements != null) {
                 Iterator childElementsIt = childElements.iterator();
@@ -965,6 +976,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Content extends ModelScreenWidget {
         
         protected FlexibleStringExpander contentId;
@@ -1105,6 +1117,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class SubContent extends ModelScreenWidget {
         protected FlexibleStringExpander contentId;
         protected FlexibleStringExpander mapKey;
@@ -1170,6 +1183,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Menu extends ModelScreenWidget {
         protected FlexibleStringExpander nameExdr;
         protected FlexibleStringExpander locationExdr;
@@ -1236,6 +1250,7 @@
         }
     }
     
+    @SuppressWarnings("serial")
     public static class Link extends ModelScreenWidget {
         protected FlexibleStringExpander textExdr;
         protected FlexibleStringExpander idExdr;
@@ -1389,6 +1404,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class Image extends ModelScreenWidget {
         protected FlexibleStringExpander srcExdr;
         protected FlexibleStringExpander idExdr;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java Mon Jun  2 15:23:55 2008
@@ -46,8 +46,8 @@
     
     public static final String module = ScreenFactory.class.getName();
 
-    public static final UtilCache screenLocationCache = new UtilCache("widget.screen.locationResource", 0, 0, false);
-    public static final UtilCache screenWebappCache = new UtilCache("widget.screen.webappResource", 0, 0, false);
+    public static final UtilCache<String, Map<String, ModelScreen>> screenLocationCache = new UtilCache<String, Map<String, ModelScreen>>("widget.screen.locationResource", 0, 0, false);
+    public static final UtilCache<String, Map<String, ModelScreen>> screenWebappCache = new UtilCache<String, Map<String, ModelScreen>>("widget.screen.webappResource", 0, 0, false);
 
     public static boolean isCombinedName(String combinedName) {
         int numSignIndex = combinedName.lastIndexOf("#");
@@ -105,10 +105,10 @@
 
     public static Map getScreensFromLocation(String resourceName)
             throws IOException, SAXException, ParserConfigurationException {
-        Map modelScreenMap = (Map) screenLocationCache.get(resourceName);
+        Map<String, ModelScreen> modelScreenMap = screenLocationCache.get(resourceName);
         if (modelScreenMap == null) {
             synchronized (ScreenFactory.class) {
-                modelScreenMap = (Map) screenLocationCache.get(resourceName);
+                modelScreenMap = screenLocationCache.get(resourceName);
                 if (modelScreenMap == null) {
                     long startTime = System.currentTimeMillis();
                     ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -142,10 +142,10 @@
         String cacheKey = webappName + "::" + resourceName;
         
         
-        Map modelScreenMap = (Map) screenWebappCache.get(cacheKey);
+        Map<String, ModelScreen> modelScreenMap = screenWebappCache.get(cacheKey);
         if (modelScreenMap == null) {
             synchronized (ScreenFactory.class) {
-                modelScreenMap = (Map) screenWebappCache.get(cacheKey);
+                modelScreenMap = screenWebappCache.get(cacheKey);
                 if (modelScreenMap == null) {
                     ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
                     
@@ -164,8 +164,8 @@
         return modelScreen;
     }
     
-    public static Map readScreenDocument(Document screenFileDoc, String sourceLocation) {
-        Map modelScreenMap = new HashMap();
+    public static Map<String, ModelScreen> readScreenDocument(Document screenFileDoc, String sourceLocation) {
+        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/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderException.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderException.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderException.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderException.java Mon Jun  2 15:23:55 2008
@@ -27,6 +27,7 @@
  * rendering process so that we avoid having to log redundant
  * exceptions.
  */
+@SuppressWarnings("serial")
 public class ScreenRenderException extends GeneralException {
 
     public ScreenRenderException() {

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Mon Jun  2 15:23:55 2008
@@ -39,6 +39,7 @@
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilHttp;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
@@ -68,10 +69,10 @@
     public static final String module = ScreenRenderer.class.getName();
     
     protected Appendable writer;
-    protected MapStack context;
+    protected MapStack<String> context;
     protected ScreenStringRenderer screenStringRenderer;
     
-    public ScreenRenderer(Appendable writer, MapStack context, ScreenStringRenderer screenStringRenderer) {
+    public ScreenRenderer(Appendable writer, MapStack<String> context, ScreenStringRenderer screenStringRenderer) {
         this.writer = writer;
         this.context = context;
         if (this.context == null) this.context = MapStack.create();
@@ -139,7 +140,7 @@
         populateBasicContext(context, this, parameters, delegator, dispatcher, security, locale, userLogin);
     }
 
-    public static void populateBasicContext(MapStack context, ScreenRenderer screens, Map parameters, GenericDelegator delegator, LocalDispatcher dispatcher, Security security, Locale locale, GenericValue userLogin) {
+    public static void populateBasicContext(MapStack<String> context, ScreenRenderer screens, Map parameters, GenericDelegator delegator, LocalDispatcher dispatcher, Security security, Locale locale, GenericValue userLogin) {
         // ========== setup values that should always be in a screen context
         // include an object to more easily render screens
         context.put("screens", screens);
@@ -174,11 +175,11 @@
         populateContextForRequest(context, this, request, response, servletContext);
     }
 
-    public static void populateContextForRequest(MapStack context, ScreenRenderer screens, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
+    public static void populateContextForRequest(MapStack<String> context, ScreenRenderer screens, HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
         HttpSession session = request.getSession();
 
         // attribute names to skip for session and application attributes; these are all handled as special cases, duplicating results and causing undesired messages
-        Set attrNamesToSkip = FastSet.newInstance();
+        Set<String> attrNamesToSkip = FastSet.newInstance();
         attrNamesToSkip.add("delegator");
         attrNamesToSkip.add("dispatcher");
         attrNamesToSkip.add("security");
@@ -248,17 +249,18 @@
         context.put("externalKeyParam", externalKeyParam);
 
         // setup message lists
-        List eventMessageList = (List) request.getAttribute("eventMessageList");
-        if (eventMessageList == null) eventMessageList = new LinkedList();
-        List errorMessageList = (List) request.getAttribute("errorMessageList");
-        if (errorMessageList == null) errorMessageList = new LinkedList();
+        List<String> eventMessageList = UtilGenerics.toList(request.getAttribute("eventMessageList"));
+        if (eventMessageList == null) eventMessageList = new LinkedList<String>();
+        List<String> errorMessageList = UtilGenerics.toList(request.getAttribute("errorMessageList"));
+        if (errorMessageList == null) errorMessageList = new LinkedList<String>();
 
         if (request.getAttribute("_EVENT_MESSAGE_") != null) {
             eventMessageList.add(UtilFormatOut.replaceString((String) request.getAttribute("_EVENT_MESSAGE_"), "\n", "<br/>"));
             request.removeAttribute("_EVENT_MESSAGE_");
         }
-        if (request.getAttribute("_EVENT_MESSAGE_LIST_") != null) {
-            eventMessageList.addAll((List) request.getAttribute("_EVENT_MESSAGE_LIST_"));
+        List<String> msgList = UtilGenerics.toList(request.getAttribute("_EVENT_MESSAGE_LIST_"));
+        if (msgList != null) {
+            eventMessageList.addAll(msgList);
             request.removeAttribute("_EVENT_MESSAGE_LIST_");
         }
         if (request.getAttribute("_ERROR_MESSAGE_") != null) {
@@ -269,8 +271,9 @@
             errorMessageList.add(UtilFormatOut.replaceString((String) session.getAttribute("_ERROR_MESSAGE_"), "\n", "<br/>"));
             session.removeAttribute("_ERROR_MESSAGE_");
         }
-        if (request.getAttribute("_ERROR_MESSAGE_LIST_") != null) {
-            errorMessageList.addAll((List) request.getAttribute("_ERROR_MESSAGE_LIST_"));
+        msgList = UtilGenerics.toList(request.getAttribute("_ERROR_MESSAGE_LIST_"));
+        if (msgList != null) {
+            errorMessageList.addAll(msgList);
             request.removeAttribute("_ERROR_MESSAGE_LIST_");
         }
         context.put("eventMessageList", eventMessageList);
@@ -297,7 +300,7 @@
         context.push();
     }
 
-    public Map getContext() {
+    public Map<String, Object> getContext() {
      return context;
     }
 

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java Mon Jun  2 15:23:55 2008
@@ -19,7 +19,6 @@
 package org.ofbiz.widget.screen;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.util.Map;
 
 import org.ofbiz.base.util.GeneralException;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenTextViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenTextViewHandler.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenTextViewHandler.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenTextViewHandler.java Mon Jun  2 15:23:55 2008
@@ -34,7 +34,6 @@
 import org.ofbiz.webapp.view.ViewHandlerException;
 import org.xml.sax.SAXException;
 
-import org.ofbiz.widget.screen.ScreenWidgetViewHandler;
 import org.ofbiz.widget.text.TextFormRenderer;
 import org.ofbiz.widget.text.TextScreenRenderer;
 

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java Mon Jun  2 15:23:55 2008
@@ -19,7 +19,6 @@
 package org.ofbiz.widget.text;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java Mon Jun  2 15:23:55 2008
@@ -19,30 +19,12 @@
 package org.ofbiz.widget.text;
 
 import java.io.IOException;
-import java.io.Writer;
-import java.util.Locale;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.base.util.UtilFormatOut;
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericValue;
-import org.ofbiz.webapp.control.RequestHandler;
-import org.ofbiz.webapp.taglib.ContentUrlTag;
-import org.ofbiz.widget.WidgetContentWorker;
 import org.ofbiz.widget.screen.ModelScreenWidget;
 import org.ofbiz.widget.screen.ScreenStringRenderer;
-import org.ofbiz.service.LocalDispatcher;
-import javolution.util.FastMap;
 
 /**
  * Widget Library - Text Screen Renderer implementation

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Mon Jun  2 15:23:55 2008
@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -60,6 +59,7 @@
 /**
  * Widget Library - Tree model class
  */
+@SuppressWarnings("serial")
 public class ModelTree extends ModelWidget {
 
     public static final String module = ModelTree.class.getName();
@@ -68,14 +68,14 @@
     protected String rootNodeName;
     protected String defaultRenderStyle;
     protected FlexibleStringExpander defaultWrapStyleExdr;
-    protected List nodeList = new ArrayList();
-    protected Map nodeMap = new HashMap();
+    protected List<ModelNode> nodeList = new ArrayList<ModelNode>();
+    protected Map<String, ModelNode> nodeMap = new HashMap<String, ModelNode>();
     protected GenericDelegator delegator;
     protected LocalDispatcher dispatcher;
     protected FlexibleStringExpander expandCollapseRequestExdr;
     protected FlexibleStringExpander trailNameExdr;
     protected List trail = new ArrayList();
-    protected List currentNodeTrail;
+    protected List<String> currentNodeTrail;
     protected int openDepth;
     protected int postTrailOpenDepth;
     protected int [] nodeIndices = new int[20];

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java?rev=662590&r1=662589&r2=662590&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java Mon Jun  2 15:23:55 2008
@@ -19,7 +19,6 @@
 package org.ofbiz.widget.xml;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.util.List;
 import java.util.Map;