svn commit: r932173 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: form/MacroFormRenderer.java screen/MacroScreenRenderer.java

[lektran]

Author: lektran
Date: Thu Apr  8 23:23:25 2010
New Revision: 932173

URL: http://svn.apache.org/viewvc?rev=932173&view=rev
Log:
Deprecated the form and screen macro renderer constructors and added new ones that don't take an Appendable as an argument

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.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=932173&r1=932172&r2=932173&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 Thu Apr  8 23:23:25 2010
@@ -98,7 +98,7 @@ public class MacroFormRenderer implement
     protected boolean javaScriptEnabled = false;
     protected boolean renderPagination = true;
 
-    public MacroFormRenderer(String macroLibraryPath, Appendable writer, HttpServletRequest request, HttpServletResponse response) throws TemplateException, IOException {
+    public MacroFormRenderer(String macroLibraryPath, HttpServletRequest request, HttpServletResponse response) throws TemplateException, IOException {
         macroLibrary = FreeMarkerWorker.getTemplate(macroLibraryPath);
         this.request = request;
         this.response = response;
@@ -108,6 +108,11 @@ public class MacroFormRenderer implement
         internalEncoder = StringUtil.getEncoder("string");
     }
 
+    @Deprecated
+    public MacroFormRenderer(String macroLibraryPath, Appendable writer, HttpServletRequest request, HttpServletResponse response) throws TemplateException, IOException {
+        this(macroLibraryPath, request, response);
+    }
+
     public boolean getRenderPagination() {
         return this.renderPagination;
     }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=932173&r1=932172&r2=932173&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Thu Apr  8 23:23:25 2010
@@ -70,11 +70,16 @@ public class MacroScreenRenderer impleme
     private String rendererName;
     private int elementId = 999;
 
-    public MacroScreenRenderer(String name, String macroLibraryPath, Appendable writer) throws TemplateException, IOException {
+    public MacroScreenRenderer(String name, String macroLibraryPath) throws TemplateException, IOException {
         macroLibrary = FreeMarkerWorker.getTemplate(macroLibraryPath);
         rendererName = name;
     }
 
+    @Deprecated
+    public MacroScreenRenderer(String name, String macroLibraryPath, Appendable writer) throws TemplateException, IOException {
+        this(name, macroLibraryPath);
+    }
+
     private String getNextElementId() {
         elementId++;
         return "hsr" + elementId;