From 844e8b2e708c8235eb49b6be9623cae4572c427b Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 9 Jan 2007 10:21:49 +0000 Subject: [PATCH] Merged 1.4 to HEAD svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4734 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4751 . Ignored 4672, 4676 in accordance with Roy's checkin notices 4735 appeared to be already in HEAD git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../common/renderer/ActionLinkRenderer.java | 73 +++++++++++-------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java index 432222a9a3..c8b39c81a4 100644 --- a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java +++ b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java @@ -151,33 +151,8 @@ public class ActionLinkRenderer extends BaseRenderer } linkBuf.append(href); - // append arguments if specified - Map actionParams = getParameterComponents(link); - if (actionParams != null) - { - boolean first = (href.indexOf('?') == -1); - for (String name : actionParams.keySet()) - { - String paramValue = actionParams.get(name); - if (first) - { - linkBuf.append('?'); - first = false; - } - else - { - linkBuf.append('&'); - } - try - { - linkBuf.append(name).append("=").append(URLEncoder.encode(paramValue, "UTF-8")); - } - catch (UnsupportedEncodingException err) - { - // if this happens we have bigger problems than a missing URL parameter...! - } - } - } + // append the href params if any are present + renderHrefParams(link, linkBuf, href); linkBuf.append('"'); @@ -287,6 +262,42 @@ public class ActionLinkRenderer extends BaseRenderer return linkHtml; } + + /** + * @param link + * @param linkBuf + * @param href + */ + private void renderHrefParams(UIActionLink link, StringBuilder linkBuf, String href) + { + // append arguments if specified + Map actionParams = getParameterComponents(link); + if (actionParams != null) + { + boolean first = (href.indexOf('?') == -1); + for (String name : actionParams.keySet()) + { + String paramValue = actionParams.get(name); + if (first) + { + linkBuf.append('?'); + first = false; + } + else + { + linkBuf.append('&'); + } + try + { + linkBuf.append(name).append("=").append(URLEncoder.encode(paramValue, "UTF-8")); + } + catch (UnsupportedEncodingException err) + { + // if this happens we have bigger problems than a missing URL parameter...! + } + } + } + } /** * Render ActionLink as menu image and item link @@ -339,8 +350,12 @@ public class ActionLinkRenderer extends BaseRenderer href = context.getExternalContext().getRequestContextPath() + href; } buf.append("