svn commit: r1737803 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java

Author: jleroux
Date: Tue Apr  5 08:57:35 2016
New Revision: 1737803

URL: http://svn.apache.org/viewvc?rev=1737803&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 new HtmlScreenRenderer() in HtmlTreeRenderer.java.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java?rev=1737803&r1=1737802&r2=1737803&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/html/HtmlTreeRenderer.java Tue Apr  5 08:57:35 2016
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRes
 
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.webapp.control.RequestHandler;
 import org.ofbiz.webapp.taglib.ContentUrlTag;
@@ -37,6 +38,9 @@ import org.ofbiz.widget.model.ModelWidge
 import org.ofbiz.widget.renderer.ScreenRenderer;
 import org.ofbiz.widget.renderer.ScreenStringRenderer;
 import org.ofbiz.widget.renderer.TreeStringRenderer;
+import org.ofbiz.widget.renderer.macro.MacroScreenRenderer;
+
+import freemarker.template.TemplateException;
 
 
 /**
@@ -334,7 +338,12 @@ public class HtmlTreeRenderer extends Ht
             screenStringRenderer = screenRenderer.getScreenStringRenderer();
         } else {
             if (screenStringRenderer == null) {
-                screenStringRenderer = new HtmlScreenRenderer();
+                try {
+                    screenStringRenderer = new MacroScreenRenderer(UtilProperties.getPropertyValue("widget", "screen.name"),
+                            UtilProperties.getPropertyValue("widget", "screen.screenrenderer"));
+                } catch (TemplateException | IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
         return screenStringRenderer;