svn commit: r1517434 - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/menu/MacroMenuRenderer.java src/org/ofbiz/widget/screen/MacroScreenViewHandler.java templates/htmlMenuMacroLibrary.ftl

[hansbak]

Author: hansbak
Date: Mon Aug 26 06:28:00 2013
New Revision: 1517434

URL: http://svn.apache.org/r1517434
Log:
revert r1517353: it makes the tomahawk theme unusable

Removed:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MacroMenuRenderer.java
    ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl
Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=1517434&r1=1517433&r2=1517434&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
 (original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java
 Mon Aug 26 06:28:00 2013
@@ -38,10 +38,8 @@ import org.ofbiz.webapp.view.AbstractVie
 import org.ofbiz.webapp.view.ViewHandlerException;
 import org.ofbiz.widget.form.FormStringRenderer;
 import org.ofbiz.widget.form.MacroFormRenderer;
-import org.ofbiz.widget.menu.MacroMenuRenderer;
-import org.ofbiz.widget.menu.MenuStringRenderer;
-import org.ofbiz.widget.tree.MacroTreeRenderer;
 import org.ofbiz.widget.tree.TreeStringRenderer;
+import org.ofbiz.widget.tree.MacroTreeRenderer;
 import org.xml.sax.SAXException;
 
 import freemarker.template.TemplateException;
@@ -92,13 +90,15 @@ public class MacroScreenViewHandler exte
             ScreenStringRenderer screenStringRenderer = new 
MacroScreenRenderer(UtilProperties.getPropertyValue("widget", getName() + 
".name"), UtilProperties.getPropertyValue("widget", getName() + 
".screenrenderer"));
             FormStringRenderer formStringRenderer = new 
MacroFormRenderer(UtilProperties.getPropertyValue("widget", getName() + 
".formrenderer"), request, response);
             TreeStringRenderer treeStringRenderer = new 
MacroTreeRenderer(UtilProperties.getPropertyValue("widget", getName() + 
".treerenderer"), writer);
-            MenuStringRenderer menuStringRenderer = new 
MacroMenuRenderer(UtilProperties.getPropertyValue("widget", getName() + 
".menurenderer"), request, response);
+            // TODO: uncomment these lines when the renderers are implemented
+            //MenuStringRenderer menuStringRenderer = new 
MacroMenuRenderer(UtilProperties.getPropertyValue("widget", getName() + 
".menurenderer"), writer);
 
             ScreenRenderer screens = new ScreenRenderer(writer, null, 
screenStringRenderer);
             screens.populateContextForRequest(request, response, 
servletContext);
+            // this is the object used to render forms from their definitions
             screens.getContext().put("formStringRenderer", formStringRenderer);
             screens.getContext().put("treeStringRenderer", treeStringRenderer);
-            screens.getContext().put("menuStringRenderer", menuStringRenderer);
+            //screens.getContext().put("menuStringRenderer", 
menuStringRenderer);
             screens.getContext().put("simpleEncoder", 
StringUtil.getEncoder(UtilProperties.getPropertyValue("widget", getName() + 
".encoder")));
             screenStringRenderer.renderScreenBegin(writer, 
screens.getContext());
             screens.render(page);