svn commit: r1737806 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer: fo/FoFormRenderer.java fo/FoScreenRenderer.java macro/MacroScreenRenderer.java

Author: jleroux
Date: Tue Apr  5 09:13:20 2016
New Revision: 1737806

URL: http://svn.apache.org/viewvc?rev=1737806&view=rev
Log:
Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273

Replaces the deprecated FoScreenRenderer.getFoStyle() by new MacroScreenRenderer.getFoStyle() in Fo form and screen renderers

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java?rev=1737806&r1=1737805&r2=1737806&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoFormRenderer.java Tue Apr  5 09:13:20 2016
@@ -56,6 +56,7 @@ import org.ofbiz.widget.model.ModelFormF
 import org.ofbiz.widget.model.ModelWidget;
 import org.ofbiz.widget.renderer.FormStringRenderer;
 import org.ofbiz.widget.renderer.html.HtmlWidgetRenderer;
+import org.ofbiz.widget.renderer.macro.MacroScreenRenderer;
 
 
 /**
@@ -80,7 +81,7 @@ public class FoFormRenderer extends Html
         writer.append("<fo:block");
         if (UtilValidate.isNotEmpty(widgetStyle)) {
             writer.append(" ");
-            writer.append(FoScreenRenderer.getFoStyle(widgetStyle));
+            writer.append(MacroScreenRenderer.getFoStyle(widgetStyle));
         }
         writer.append(">");
         writer.append(UtilFormatOut.encodeXmlValue(text));
@@ -210,7 +211,7 @@ public class FoFormRenderer extends Html
             String areaStyle = childField.getTitleAreaStyle();
             if (UtilValidate.isNotEmpty(areaStyle)) {
                 writer.append(" ");
-                writer.append(FoScreenRenderer.getFoStyle(areaStyle));
+                writer.append(MacroScreenRenderer.getFoStyle(areaStyle));
             }
             writer.append("/>");
             appendWhitespace(writer);
@@ -300,7 +301,7 @@ public class FoFormRenderer extends Html
         if (UtilValidate.isEmpty(areaStyle)) {
             areaStyle = "tabletext";
         }
-        writer.append(FoScreenRenderer.getFoStyle(areaStyle));
+        writer.append(MacroScreenRenderer.getFoStyle(areaStyle));
         writer.append(">");
         appendWhitespace(writer);
     }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java?rev=1737806&r1=1737805&r2=1737806&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/fo/FoScreenRenderer.java Tue Apr  5 09:13:20 2016
@@ -30,6 +30,7 @@ import org.ofbiz.widget.model.ModelScree
 import org.ofbiz.widget.model.ModelWidget;
 import org.ofbiz.widget.renderer.ScreenStringRenderer;
 import org.ofbiz.widget.renderer.html.HtmlWidgetRenderer;
+import org.ofbiz.widget.renderer.macro.MacroScreenRenderer;
 
 /**
  * Widget Library - HTML Form Renderer implementation
@@ -77,7 +78,7 @@ public class FoScreenRenderer extends Ht
         String style = container.getStyle(context);
         if (UtilValidate.isNotEmpty(style)) {
             writer.append(" ");
-            writer.append(FoScreenRenderer.getFoStyle(style));
+            writer.append(MacroScreenRenderer.getFoStyle(style));
         }
         writer.append(">");
         appendWhitespace(writer);
@@ -97,7 +98,7 @@ public class FoScreenRenderer extends Ht
         String style = label.getStyle(context);
         if (UtilValidate.isNotEmpty(style)) {
             writer.append("<fo:inline ");
-            writer.append(FoScreenRenderer.getFoStyle(style));
+            writer.append(MacroScreenRenderer.getFoStyle(style));
             writer.append(">");
             // the text
             writer.append(labelText);

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java?rev=1737806&r1=1737805&r2=1737806&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroScreenRenderer.java Tue Apr  5 09:13:20 2016
@@ -1055,4 +1055,13 @@ public class MacroScreenRenderer impleme
         }
         executeMacro(writer, "<@renderColumnContainerEnd />");
     }
+    
+    // This is a util method to get the style from a property file
+    public static String getFoStyle(String styleName) {
+        String value = UtilProperties.getPropertyValue("fo-styles", styleName);
+        if (value.equals(styleName)) {
+            return "";
+        }
+        return value;
+    }
 }