svn commit: r619570 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

[adrianc]

Author: adrianc
Date: Thu Feb  7 11:01:51 2008
New Revision: 619570

URL: http://svn.apache.org/viewvc?rev=619570&view=rev
Log:
Small fixup for last commit.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

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=619570&r1=619569&r2=619570&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 Thu Feb  7 11:01:51 2008
@@ -639,7 +639,7 @@
                 String name = this.getName(context);
                 String location = this.getLocation(context);
                 try {
-                    this.modelForm = FormFactory.getFormFromLocation(this.getLocation(context), this.getName(context), this.modelScreen.getDelegator(context), this.modelScreen.getDispatcher(context));
+                    this.modelForm = FormFactory.getFormFromLocation(location, name, this.modelScreen.getDelegator(context), this.modelScreen.getDispatcher(context));
                 } catch (Exception e) {
                     String errMsg = "Error rendering included form named [" + name + "] at location [" + location + "]: ";
                     Debug.logError(e, errMsg, module);
@@ -1033,7 +1033,7 @@
                 String name = this.getName(context);
                 String location = this.getLocation(context);
                 try {
-                    this.modelMenu = MenuFactory.getMenuFromLocation(this.getLocation(context), this.getName(context), this.modelScreen.getDelegator(context), this.modelScreen.getDispatcher(context));
+                    this.modelMenu = MenuFactory.getMenuFromLocation(location, name, this.modelScreen.getDelegator(context), this.modelScreen.getDispatcher(context));
                 } catch (Exception e) {
                     String errMsg = "Error rendering included menu named [" + name + "] at location [" + location + "]: ";
                     Debug.logError(e, errMsg, module);