rleland 2003/07/26 10:40:52 Modified: src/share/org/apache/struts/taglib/bean IncludeTag.java src/share/org/apache/struts/taglib/html LinkTag.java RewriteTag.java src/share/org/apache/struts/taglib/logic RedirectTag.java Log: Make tags use computeParameters() from TagUtils. Revision Changes Path 1.20 +4 -3 jakarta-struts/src/share/org/apache/struts/taglib/bean/IncludeTag.java Index: IncludeTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/IncludeTag.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- IncludeTag.java 29 Nov 2002 19:54:22 -0000 1.19 +++ IncludeTag.java 26 Jul 2003 17:40:52 -0000 1.20 @@ -72,6 +72,7 @@ import javax.servlet.jsp.tagext.TagSupport; import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; +import org.apache.struts.taglib.TagUtils; /** * Define the contents of a specified intra-application request as a @@ -204,7 +205,7 @@ // Set up a URLConnection to read the requested resource Map params = - RequestUtils.computeParameters( + TagUtils.getInstance().computeParameters( pageContext, null, null, 1.29 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java Index: LinkTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- LinkTag.java 29 Dec 2002 17:00:15 -0000 1.28 +++ LinkTag.java 26 Jul 2003 17:40:52 -0000 1.29 @@ -71,6 +71,7 @@ import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; import org.apache.struts.taglib.logic.IterateTag; +import org.apache.struts.taglib.TagUtils; /** * Generate a URL-encoded hyperlink to the specified URI. @@ -459,7 +460,7 @@ protected String calculateURL() throws JspException { // Identify the parameters we will add to the completed URL - Map params = RequestUtils.computeParameters + Map params = TagUtils.getInstance().computeParameters (pageContext, paramId, paramName, paramProperty, paramScope, name, property, scope, transaction); 1.11 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java Index: RewriteTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- RewriteTag.java 20 Jun 2003 04:09:57 -0000 1.10 +++ RewriteTag.java 26 Jul 2003 17:40:52 -0000 1.11 @@ -66,6 +66,7 @@ import javax.servlet.jsp.JspException; import org.apache.struts.util.RequestUtils; import org.apache.struts.util.ResponseUtils; +import org.apache.struts.taglib.TagUtils; /** @@ -88,7 +89,7 @@ public int doStartTag() throws JspException { // Generate the hyperlink URL - Map params = RequestUtils.computeParameters + Map params = TagUtils.getInstance().computeParameters (pageContext, paramId, paramName, paramProperty, paramScope, name, property, scope, transaction); 1.17 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java Index: RedirectTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- RedirectTag.java 13 Jul 2003 23:40:46 -0000 1.16 +++ RedirectTag.java 26 Jul 2003 17:40:52 -0000 1.17 @@ -71,6 +71,7 @@ import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; +import org.apache.struts.taglib.TagUtils; /** * Generate a URL-encoded redirect to the specified URI. @@ -279,7 +280,7 @@ */ protected String generateRedirectURL() throws JspException { Map params = - RequestUtils.computeParameters( + TagUtils.getInstance().computeParameters( pageContext, paramId, paramName,
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]