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

[adrianc]

Author: adrianc
Date: Sun Dec 28 02:22:06 2014
New Revision: 1648142

URL: http://svn.apache.org/r1648142
Log:
Some fixups for the Form widget refactor.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormFieldBuilder.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=1648142&r1=1648141&r2=1648142&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 Sun Dec 28 02:22:06 2014
@@ -31,7 +31,6 @@ import org.w3c.dom.Element;
  */
 public abstract class FieldInfo {
 
-    public static final String module = FieldInfo.class.getName();
     public static final int DISPLAY = 1;
     public static final int HYPERLINK = 2;
     public static final int TEXT = 3;

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=1648142&r1=1648141&r2=1648142&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 Sun Dec 28 02:22:06 2014
@@ -151,7 +151,6 @@ public class ModelFormField {
         this.mapAcsr = builder.getMapAcsr();
         this.modelForm = builder.getModelForm();
         this.name = builder.getName();
-        Debug.logInfo("name = " + name + ", fieldInfo = " + fieldInfo, module);
         if (builder.getOnChangeUpdateAreas().isEmpty()) {
             this.onChangeUpdateAreas = Collections.emptyList();
         } else {
@@ -1723,7 +1722,6 @@ public class ModelFormField {
         @Override
         public void renderFieldString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer)
                 throws IOException {
-            Debug.logInfo("Rendering drop-down " + this + " for " + getModelFormField().getName(), module);
             formStringRenderer.renderDropDownField(writer, context, this);
         }
     }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormFieldBuilder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormFieldBuilder.java?rev=1648142&r1=1648141&r2=1648142&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormFieldBuilder.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormFieldBuilder.java Sun Dec 28 02:22:06 2014
@@ -216,7 +216,6 @@ public class ModelFormFieldBuilder {
             this.fieldInfo = new ContainerField(childElement, null);
         else
             throw new IllegalArgumentException("The field sub-element with name " + this.fieldType + " is not supported");
-        Debug.logInfo("fieldType = " + fieldType + ", fieldInfo = " + fieldInfo, module);
     }
 
     public ModelFormFieldBuilder(ModelFormField modelFormField) {
@@ -568,14 +567,13 @@ public class ModelFormFieldBuilder {
                 if ("date-time".equals(modelField.getType())) {
                     type = "timestamp";
                 }
-                ModelFormField.DateFindField dateTimeField = new ModelFormField.DateFindField(FieldInfo.SOURCE_AUTO_ENTITY, type);
+                ModelFormField.DateTimeField dateTimeField = new ModelFormField.DateTimeField(FieldInfo.SOURCE_AUTO_ENTITY, type);
                 this.setFieldInfo(dateTimeField);
             } else {
                 ModelFormField.TextField textField = new ModelFormField.TextField(FieldInfo.SOURCE_AUTO_ENTITY, null);
                 this.setFieldInfo(textField);
             }
         }
-
         return true;
     }
 
@@ -775,11 +773,9 @@ public class ModelFormFieldBuilder {
     }
 
     public ModelFormFieldBuilder setFieldInfo(FieldInfo fieldInfo) {
-        Debug.logInfo("this.fieldInfo = " + this.fieldInfo + ", fieldInfo = " + fieldInfo, module);
         if (fieldInfo != null && (this.fieldInfo == null || (fieldInfo.getFieldSource() <= this.fieldInfo.getFieldSource()))) {
             this.fieldInfo = fieldInfo;
         }
-        Debug.logInfo("this.fieldInfo = " + this.fieldInfo + ", fieldInfo = " + fieldInfo, module);
         return this;
     }