svn commit: r959291 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form: MacroFormRenderer.java ModelForm.java

[erwan]

Author: erwan
Date: Wed Jun 30 12:45:55 2010
New Revision: 959291

URL: http://svn.apache.org/viewvc?rev=959291&view=rev
Log:
Removing unnecessary calls to map. Thanks Adrian

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=959291&r1=959290&r2=959291&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Wed Jun 30 12:45:55 2010
@@ -2820,8 +2820,7 @@ public class MacroFormRenderer implement
             ajaxUrl += "," + ajaxParams;
         }
         Locale locale = UtilMisc.ensureLocale(context.get("locale"));
-        MapStack<String> localContext = MapStack.create(UtilGenerics.<Map<String,Object>>cast(context));
-        return FlexibleStringExpander.expandString(ajaxUrl, localContext, locale);
+        return FlexibleStringExpander.expandString(ajaxUrl, context, locale);
     }
     /** Extracts parameters from a target URL string, prepares them for an Ajax
      * JavaScript call. This method is currently set to return a parameter string

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=959291&r1=959290&r2=959291&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Wed Jun 30 12:45:55 2010
@@ -1987,9 +1987,8 @@ public class ModelForm extends ModelWidg
 
     public String getCurrentContainerId(Map<String, Object> context) {
         Locale locale = UtilMisc.ensureLocale(context.get("locale"));
-        MapStack<String> localContext = MapStack.create(context);
 
-        String retVal = FlexibleStringExpander.expandString(this.getContainerId(), localContext, locale);
+        String retVal = FlexibleStringExpander.expandString(this.getContainerId(), context, locale);
 
         Integer itemIndex = (Integer) context.get("itemIndex");
         if (itemIndex != null && "list".equals(this.getType())) {