svn commit: r1639927 [3/3] - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: artifact/ fo/ form/ html/ text/ xml/

[adrianc]

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1639927&r1=1639926&r2=1639927&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java 
Sat Nov 15 21:33:51 2014
@@ -57,6 +57,7 @@ import org.ofbiz.widget.form.ModelFormFi
 import org.ofbiz.widget.form.ModelFormField.DisplayEntityField;
 import org.ofbiz.widget.form.ModelFormField.DisplayField;
 import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
 import org.ofbiz.widget.form.ModelFormField.FileField;
 import org.ofbiz.widget.form.ModelFormField.HiddenField;
 import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -596,7 +597,7 @@ public class HtmlFormRenderer extends Ht
                     explicitDescription = 
dropDownField.getCurrentDescription(context);
                 }
                 if (UtilValidate.isEmpty(explicitDescription)) {
-                    explicitDescription = 
ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, 
allOptionValues);
+                    explicitDescription = 
FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues);
                 }
                 explicitDescription = encode(explicitDescription, 
modelFormField, context);
                 writer.append(explicitDescription);
@@ -691,7 +692,7 @@ public class HtmlFormRenderer extends Ht
                 if (UtilValidate.isNotEmpty(explicitDescription)) {
                     writer.append(encode(explicitDescription, modelFormField, 
context));
                 } else {
-                    String description = 
ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, 
allOptionValues);
+                    String description = 
FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues);
                     writer.append(encode(description, modelFormField, 
context));
                 }
                 writer.append("</option>");

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=1639927&r1=1639926&r2=1639927&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 
Sat Nov 15 21:33:51 2014
@@ -36,6 +36,7 @@ import org.ofbiz.widget.form.ModelFormFi
 import org.ofbiz.widget.form.ModelFormField.DateTimeField;
 import org.ofbiz.widget.form.ModelFormField.DisplayField;
 import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
 import org.ofbiz.widget.form.ModelFormField.FileField;
 import org.ofbiz.widget.form.ModelFormField.HiddenField;
 import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -116,7 +117,7 @@ public class TextFormRenderer implements
             if (UtilValidate.isNotEmpty(explicitDescription)) {
                 this.makeTextString(writer, modelFormField.getWidgetStyle(), 
explicitDescription);
             } else {
-                this.makeTextString(writer, modelFormField.getWidgetStyle(), 
ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, 
allOptionValues));
+                this.makeTextString(writer, modelFormField.getWidgetStyle(), 
FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
             }
         } else {
             for (ModelFormField.OptionValue optionValue: allOptionValues) {

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=1639927&r1=1639926&r2=1639927&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 
Sat Nov 15 21:33:51 2014
@@ -36,6 +36,7 @@ import org.ofbiz.widget.form.ModelFormFi
 import org.ofbiz.widget.form.ModelFormField.DateTimeField;
 import org.ofbiz.widget.form.ModelFormField.DisplayField;
 import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
 import org.ofbiz.widget.form.ModelFormField.FileField;
 import org.ofbiz.widget.form.ModelFormField.HiddenField;
 import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -121,7 +122,7 @@ public class XmlFormRenderer implements 
             if (UtilValidate.isNotEmpty(explicitDescription)) {
                 this.makeTextString(writer, modelFormField.getWidgetStyle(), 
explicitDescription);
             } else {
-                this.makeTextString(writer, modelFormField.getWidgetStyle(), 
ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, 
allOptionValues));
+                this.makeTextString(writer, modelFormField.getWidgetStyle(), 
FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
             }
         } else {
             for (ModelFormField.OptionValue optionValue : allOptionValues) {