svn commit: r768814 - in /ofbiz/branches/release09.04: ./ framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Author: jleroux
Date: Sun Apr 26 22:20:02 2009
New Revision: 768814

URL: http://svn.apache.org/viewvc?rev=768814&view=rev
Log:
Applied fix from trunk for revision: 768811

Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
    ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 26 22:20:02 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java?rev=768814&r1=768813&r2=768814&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java Sun Apr 26 22:20:02 2009
@@ -31,6 +31,7 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.webapp.control.RequestHandler;
 import org.ofbiz.webapp.taglib.ContentUrlTag;
+import org.ofbiz.widget.WidgetWorker;
 import org.ofbiz.widget.screen.ScreenRenderer;
 import org.ofbiz.widget.screen.ScreenStringRenderer;
 import org.ofbiz.widget.tree.ModelTree;
@@ -224,10 +225,8 @@
             HttpServletRequest req = (HttpServletRequest) context.get("request");
             if (urlMode != null && urlMode.equalsIgnoreCase("intra-app")) {
                 if (req != null && res != null) {
-                    ServletContext ctx = (ServletContext) req.getAttribute("servletContext");
-                    RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
-                    String urlString = rh.makeLink(req, res, target, fullPath, secure, encode);
-                    writer.append(urlString);
+                    WidgetWorker.buildHyperlinkUrl(writer, target, link.getUrlMode(), link.getParameterList(), link.getPrefix(context),
+                        link.getFullPath(), link.getSecure(), link.getEncode(), req, res, context);
                 } else if (prefix != null) {
                     writer.append(prefix + target);
                 } else {

Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=768814&r1=768813&r2=768814&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Sun Apr 26 22:20:02 2009
@@ -41,6 +41,7 @@
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.MapStack;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
+import org.ofbiz.widget.WidgetWorker;
 import org.ofbiz.widget.screen.ModelScreen;
 import org.ofbiz.widget.screen.ScreenFactory;
 import org.ofbiz.widget.screen.ScreenStringRenderer;
@@ -796,6 +797,8 @@
             protected boolean fullPath = false;
             protected boolean secure = false;
             protected boolean encode = false;
+            protected String linkType;
+            protected List<WidgetWorker.Parameter> parameterList = FastList.newInstance();
 
             public Link() {
                 setText(null);
@@ -830,7 +833,11 @@
                 if (imageElement != null) {
                     this.image = new Image(imageElement);
                 }
-
+                this.linkType = linkElement.getAttribute("link-type");
+                List<? extends Element> parameterElementList = UtilXml.childElementList(linkElement, "parameter");
+                for (Element parameterElement: parameterElementList) {
+                    this.parameterList.add(new WidgetWorker.Parameter(parameterElement));
+                }
             }
 
             public void renderLinkString(Appendable writer, Map<String, Object> context, TreeStringRenderer treeStringRenderer) {
@@ -909,6 +916,14 @@
                 return this.image;
             }
 
+            public String getLinkType() {
+                return this.linkType;
+            }
+
+            public List<WidgetWorker.Parameter> getParameterList() {
+                return this.parameterList;
+            }
+
             public void setText(String val) {
                 String textAttr = UtilFormatOut.checkNull(val);
                 this.textExdr = FlexibleStringExpander.getInstance(textAttr);