svn commit: r1649239 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: screen/ModelScreenWidget.java tree/ModelTree.java

[adrianc]

Author: adrianc
Date: Sat Jan  3 19:52:21 2015
New Revision: 1649239

URL: http://svn.apache.org/r1649239
Log:
Fixed a bug in tree rendering - https://issues.apache.org/jira/browse/OFBIZ-5313

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1649239&r1=1649238&r2=1649239&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java 
Sat Jan  3 19:52:21 2015
@@ -33,7 +33,6 @@ import javax.xml.parsers.ParserConfigura
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilCodec;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilXml;
@@ -1042,16 +1041,7 @@ public abstract class ModelScreenWidget
                 Debug.logError(e, errMsg, module);
                 throw new RuntimeException(errMsg);
             }
-            StringBuffer renderBuffer = new StringBuffer();
-            modelTree.renderTreeString(renderBuffer, context, 
treeStringRenderer);
-            try {
-                writer.append(renderBuffer.toString());
-            } catch (IOException e) {
-                String errMsg = "Error rendering included tree named [" + name 
+ "] at location [" + location + "]: " + e.toString();
-                Debug.logError(e, errMsg, module);
-                throw new RuntimeException(errMsg);
-            }
-
+            modelTree.renderTreeString(writer, context, treeStringRenderer);
             if (protectScope) {
                 UtilGenerics.<MapStack<String>>cast(context).pop();
             }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1649239&r1=1649238&r2=1649239&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java 
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Sat 
Jan  3 19:52:21 2015
@@ -19,7 +19,6 @@
 package org.ofbiz.widget.tree;
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -229,7 +228,7 @@ public class ModelTree extends ModelWidg
      *   use the same tree definitions for many types of tree UIs
      */
     @SuppressWarnings("rawtypes")
-    public void renderTreeString(StringBuffer buf, Map<String, Object> 
context, TreeStringRenderer treeStringRenderer)
+    public void renderTreeString(Appendable writer, Map<String, Object> 
context, TreeStringRenderer treeStringRenderer)
             throws GeneralException {
         Map<String, Object> parameters = 
UtilGenerics.checkMap(context.get("parameters"));
         ModelNode node = nodeMap.get(rootNodeName);
@@ -250,10 +249,8 @@ public class ModelTree extends ModelWidg
         }
         context.put("targetNodeTrail", trail);
         context.put("currentNodeTrail", new LinkedList());
-        StringWriter writer = new StringWriter();
         try {
             node.renderNodeString(writer, context, treeStringRenderer, 0);
-            buf.append(writer.toString());
         } catch (IOException e2) {
             String errMsg = "Error rendering included label with name [" + 
getName() + "] : " + e2.toString();
             Debug.logError(e2, errMsg, module);