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

[adrianc]

Author: adrianc
Date: Sun Jan 16 00:10:25 2011
New Revision: 1059425

URL: http://svn.apache.org/viewvc?rev=1059425&view=rev
Log:
Parameterize form widget odd-row-style, header-row-style, and 
default-table-style attributes.

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.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=1059425&r1=1059424&r2=1059425&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 
Sun Jan 16 00:10:25 2011
@@ -1394,7 +1394,7 @@ public class MacroFormRenderer implement
         sr.append(" formName=\"");
         sr.append(modelForm.getName());
         sr.append("\" style=\"");
-        sr.append(modelForm.getDefaultTableStyle());
+        
sr.append(FlexibleStringExpander.expandString(modelForm.getDefaultTableStyle(), 
context));
         sr.append("\" columnStyles=[");
         sr.append(columnStyleListString);
         sr.append("] />");
@@ -1416,7 +1416,7 @@ public class MacroFormRenderer implement
     }
 
     public void renderFormatHeaderRowOpen(Appendable writer, Map<String, 
Object> context, ModelForm modelForm) throws IOException {
-        String headerStyle = modelForm.getHeaderRowStyle();
+        String headerStyle = 
FlexibleStringExpander.expandString(modelForm.getHeaderRowStyle(), context);
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatHeaderRowOpen ");
         sr.append(" style=\"");
@@ -1487,7 +1487,7 @@ public class MacroFormRenderer implement
             if (itemIndex.intValue() % 2 == 0) {
                 evenRowStyle = modelForm.getEvenRowStyle();
             } else {
-                oddRowStyle = modelForm.getOddRowStyle();
+                oddRowStyle = 
FlexibleStringExpander.expandString(modelForm.getOddRowStyle(), context);
             }
         }
         StringWriter sr = new StringWriter();
@@ -1555,7 +1555,7 @@ public class MacroFormRenderer implement
     }
 
     public void renderFormatSingleWrapperOpen(Appendable writer, Map<String, 
Object> context, ModelForm modelForm) throws IOException {
-        String style = modelForm.getDefaultTableStyle();
+        String style = 
FlexibleStringExpander.expandString(modelForm.getDefaultTableStyle(), context);
         StringWriter sr = new StringWriter();
         sr.append("<@renderFormatSingleWrapperOpen ");
         sr.append(" formName=\"");

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=1059425&r1=1059424&r2=1059425&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 
Sun Jan 16 00:10:25 2011
@@ -1465,7 +1465,7 @@ public class HtmlFormRenderer extends Ht
         }
         writer.append(" <table cellspacing=\"0\" class=\"");
         if (UtilValidate.isNotEmpty(modelForm.getDefaultTableStyle())) {
-            writer.append(modelForm.getDefaultTableStyle());
+            
writer.append(FlexibleStringExpander.expandString(modelForm.getDefaultTableStyle(),
 context));
         } else {
             writer.append("basic-table form-widget-table dark-grid");
         }
@@ -1488,7 +1488,7 @@ public class HtmlFormRenderer extends Ht
      */
     public void renderFormatHeaderRowOpen(Appendable writer, Map<String, 
Object> context, ModelForm modelForm) throws IOException {
         writer.append("  <tr");
-        String headerStyle = modelForm.getHeaderRowStyle();
+        String headerStyle = 
FlexibleStringExpander.expandString(modelForm.getHeaderRowStyle(), context);
         writer.append(" class=\"");
         if (UtilValidate.isNotEmpty(headerStyle)) {
             writer.append(headerStyle);
@@ -1604,7 +1604,7 @@ public class HtmlFormRenderer extends Ht
                     }
                 }
             } else {
-                String oddRowStyle = modelForm.getOddRowStyle();
+                String oddRowStyle = 
FlexibleStringExpander.expandString(modelForm.getOddRowStyle(), context);
                 if (UtilValidate.isNotEmpty(oddRowStyle)) {
                     writer.append(" class=\"");
                     writer.append(oddRowStyle);
@@ -1688,7 +1688,7 @@ public class HtmlFormRenderer extends Ht
     public void renderFormatSingleWrapperOpen(Appendable writer, Map<String, 
Object> context, ModelForm modelForm) throws IOException {
         writer.append(" <table cellspacing=\"0\"");
         if (UtilValidate.isNotEmpty(modelForm.getDefaultTableStyle())) {
-            writer.append(" 
class=\"").append(modelForm.getDefaultTableStyle()).append("\"");
+            writer.append(" 
class=\"").append(FlexibleStringExpander.expandString(modelForm.getDefaultTableStyle(),
 context)).append("\"");
         }
         writer.append(">");
         appendWhitespace(writer);