svn commit: r1641087 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form: FieldInfo.java ModelFormField.java

[adrianc]

Author: adrianc
Date: Sat Nov 22 15:56:41 2014
New Revision: 1641087

URL: http://svn.apache.org/r1641087
Log:
Fixed a bug in the form widgets that was caused by recent refactoring - https://issues.apache.org/jira/browse/OFBIZ-5882.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java?rev=1641087&r1=1641086&r2=1641087&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java Sat Nov 22 15:56:41 2014
@@ -116,6 +116,11 @@ public abstract class FieldInfo {
 
     public abstract void accept(ModelFieldVisitor visitor);
 
+    /**
+     * Returns a new instance of this object.
+     *
+     * @param modelFormField
+     */
     public abstract FieldInfo copy(ModelFormField modelFormField);
 
     public int getFieldSource() {

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1641087&r1=1641086&r2=1641087&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sat Nov 22 15:56:41 2014
@@ -1362,6 +1362,13 @@ public class ModelFormField {
             super(fieldSource, fieldType, modelFormField);
         }
 
+        // Copy constructor.
+        protected FieldInfoWithOptions(FieldInfoWithOptions original, ModelFormField modelFormField) {
+            super(original.getFieldSource(), original.getFieldType(), modelFormField);
+            this.noCurrentSelectedKey = original.noCurrentSelectedKey;
+            this.optionSources.addAll(original.optionSources);
+        }
+
         public FieldInfoWithOptions(Element element, ModelFormField modelFormField) {
             super(element, modelFormField);
 
@@ -3301,7 +3308,7 @@ public class ModelFormField {
         }
 
         private DropDownField(DropDownField original, ModelFormField modelFormField) {
-            super(original.getFieldSource(), original.getFieldType(), modelFormField);
+            super(original, modelFormField);
             this.current = original.current;
             this.size = original.size;
             this.textSize = original.textSize;
@@ -3430,7 +3437,7 @@ public class ModelFormField {
         }
 
         private RadioField(RadioField original, ModelFormField modelFormField) {
-            super(original.getFieldSource(), original.getFieldType(), modelFormField);
+            super(original, modelFormField);
         }
 
         @Override
@@ -3468,7 +3475,7 @@ public class ModelFormField {
         }
 
         private CheckField(CheckField original, ModelFormField modelFormField) {
-            super(original.getFieldSource(), original.getFieldType(), modelFormField);
+            super(original, modelFormField);
         }
 
         @Override