svn commit: r918476 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: form/ModelFormAction.java screen/ModelScreenAction.java

Author: jleroux
Date: Wed Mar  3 14:03:19 2010
New Revision: 918476

URL: http://svn.apache.org/viewvc?rev=918476&view=rev
Log:
Re-apply r912645
<<Make use of FSE.expand(), instead of expandString, to provide support
for direct setting of values in widgets.  This closes OFBIZ-3486.>>

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=918476&r1=918475&r2=918476&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Wed Mar  3 14:03:19 2010
@@ -136,12 +136,12 @@
                 newValue = this.fromField.get(context);
                 if (Debug.verboseOn()) Debug.logVerbose("In screen getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue, module);
             } else if (!this.valueExdr.isEmpty()) {
-                newValue = this.valueExdr.expandString(context);
+                newValue = this.valueExdr.expand(context);
             }
 
             // If newValue is still empty, use the default value
             if (ObjectType.isEmpty(newValue) && !this.defaultExdr.isEmpty()) {
-                newValue = this.defaultExdr.expandString(context);
+                newValue = this.defaultExdr.expand(context);
             }
 
             if (UtilValidate.isNotEmpty(this.type)) {

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=918476&r1=918475&r2=918476&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Wed Mar  3 14:03:19 2010
@@ -157,7 +157,7 @@
                     newValue = getInMemoryPersistedFromField(session, context);
                     if (Debug.verboseOn()) Debug.logVerbose("In user getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue, module);
                 } else if (!this.valueExdr.isEmpty()) {
-                    newValue = this.valueExdr.expandString(context);
+                    newValue = this.valueExdr.expand(context);
                 }
             } else if (this.fromScope != null && this.fromScope.equals("application")) {
                 if (!this.fromField.isEmpty()) {
@@ -172,13 +172,13 @@
                     newValue = this.fromField.get(context);
                     if (Debug.verboseOn()) Debug.logVerbose("In screen getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue, module);
                 } else if (!this.valueExdr.isEmpty()) {
-                    newValue = this.valueExdr.expandString(context);
+                    newValue = this.valueExdr.expand(context);
                 }
             }
 
             // If newValue is still empty, use the default value
             if (ObjectType.isEmpty(newValue) && !this.defaultExdr.isEmpty()) {
-                newValue = this.defaultExdr.expandString(context);
+                newValue = this.defaultExdr.expand(context);
             }
 
             if (UtilValidate.isNotEmpty(this.type)) {