svn commit: r1039769 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: form/MacroFormRenderer.java form/ModelFormField.java html/HtmlFormRenderer.java

[lektran]

Author: lektran
Date: Sat Nov 27 22:14:07 2010
New Revision: 1039769

URL: http://svn.apache.org/viewvc?rev=1039769&view=rev
Log:
Deprecated the ContainerField's id field and getter/setter, this sort of thing is already handled by ModelFormField

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1039769&r1=1039768&r2=1039769&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Sat Nov 27 22:14:07 2010
@@ -3104,7 +3104,7 @@ public class MacroFormRenderer implement
     public void renderContainerFindField(Appendable writer,
             Map<String, Object> context, ContainerField containerField)
             throws IOException {
-        String id = containerField.getId();
+        String id = containerField.getModelFormField().getIdName();
         String className = UtilFormatOut.checkNull(containerField.getModelFormField().getWidgetStyle());
 
         StringWriter sr = new StringWriter();

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=1039769&r1=1039768&r2=1039769&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 27 22:14:07 2010
@@ -3901,6 +3901,7 @@ public class ModelFormField {
     }
 
     public static class ContainerField extends FieldInfo {
+        @Deprecated
         protected String id;
 
         public ContainerField() {
@@ -3909,7 +3910,6 @@ public class ModelFormField {
 
         public ContainerField(Element element, ModelFormField modelFormField) {
             super(element, modelFormField);
-            this.setId(modelFormField.getIdName());
         }
 
         public ContainerField(int fieldSource, int fieldType,
@@ -3924,10 +3924,12 @@ public class ModelFormField {
             formStringRenderer.renderContainerFindField(writer, context, this);
         }
 
+        @Deprecated
         public String getId() {
             return id;
         }
 
+        @Deprecated
         public void setId(String id) {
             this.id = id;
         }

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=1039769&r1=1039768&r2=1039769&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 27 22:14:07 2010
@@ -2919,7 +2919,7 @@ public class HtmlFormRenderer extends Ht
     
     public void renderContainerFindField(Appendable writer, Map<String, Object> context, ContainerField containerField) throws IOException {
         writer.append("<div ");
-        String id = containerField.getId();
+        String id = containerField.getModelFormField().getIdName();
         if (UtilValidate.isNotEmpty(id)) {
             writer.append("id=\"");
             writer.append(id);