dgraham 2003/07/30 17:25:39 Modified: src/share/org/apache/struts/taglib/html TextareaTag.java RewriteTag.java ErrorsTag.java FrameTag.java BaseFieldTag.java HiddenTag.java FormTag.java OptionsCollectionTag.java src/share/org/apache/struts/taglib/bean MessageTag.java WriteTag.java src/share/org/apache/struts/taglib/nested NestedWriteNestingTag.java Log: Updated tags to use new TagUtils methods. Revision Changes Path 1.15 +6 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java Index: TextareaTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/TextareaTag.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TextareaTag.java 18 May 2003 18:57:13 -0000 1.14 +++ TextareaTag.java 31 Jul 2003 00:25:39 -0000 1.15 @@ -63,6 +63,7 @@ import javax.servlet.jsp.JspException; +import org.apache.struts.taglib.TagUtils; import org.apache.struts.util.ResponseUtils; /** @@ -103,7 +104,7 @@ */ public int doStartTag() throws JspException { - ResponseUtils.write(pageContext, this.renderTextareaElement()); + TagUtils.getInstance().write(pageContext, this.renderTextareaElement()); return (EVAL_BODY_TAG); } 1.14 +7 -7 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- RewriteTag.java 27 Jul 2003 07:13:04 -0000 1.13 +++ RewriteTag.java 31 Jul 2003 00:25:39 -0000 1.14 @@ -63,10 +63,10 @@ import java.net.MalformedURLException; import java.util.Map; + import javax.servlet.jsp.JspException; -import org.apache.struts.util.ResponseUtils; -import org.apache.struts.taglib.TagUtils; +import org.apache.struts.taglib.TagUtils; /** * Generate a URL-encoded URI as a string. @@ -114,7 +114,7 @@ (messages.getMessage("rewrite.url", e.toString())); } - ResponseUtils.write(pageContext, url); + TagUtils.getInstance().write(pageContext, url); return (SKIP_BODY); 1.27 +5 -6 jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java Index: ErrorsTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ErrorsTag.java 27 Jul 2003 07:13:04 -0000 1.26 +++ ErrorsTag.java 31 Jul 2003 00:25:39 -0000 1.27 @@ -72,7 +72,6 @@ import org.apache.struts.action.ActionErrors; import org.apache.struts.taglib.TagUtils; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.ResponseUtils; /** * Custom tag that renders error messages if an appropriate request attribute @@ -267,7 +266,7 @@ results.append(message); } - ResponseUtils.write(pageContext, results.toString()); + TagUtils.getInstance().write(pageContext, results.toString()); return (EVAL_BODY_INCLUDE); 1.9 +8 -12 jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java Index: FrameTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FrameTag.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- FrameTag.java 16 Nov 2002 06:05:21 -0000 1.8 +++ FrameTag.java 31 Jul 2003 00:25:39 -0000 1.9 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,13 +59,11 @@ * */ - package org.apache.struts.taglib.html; - import javax.servlet.jsp.JspException; -import org.apache.struts.util.ResponseUtils; +import org.apache.struts.taglib.TagUtils; /** * Generate an HTML <code><frame></code> tag with similar capabilities @@ -89,7 +87,6 @@ * @version $Revision$ $Date$ * @since Struts 1.1 */ - public class FrameTag extends LinkTag { @@ -244,10 +241,9 @@ } results.append(prepareStyles()); results.append(getElementClose()); - ResponseUtils.write(pageContext,results.toString()); + TagUtils.getInstance().write(pageContext,results.toString()); - // Skip the body of this tag - return (SKIP_BODY); + return (SKIP_BODY); } 1.20 +8 -8 jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java Index: BaseFieldTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseFieldTag.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- BaseFieldTag.java 26 Jul 2003 17:22:27 -0000 1.19 +++ BaseFieldTag.java 31 Jul 2003 00:25:39 -0000 1.20 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999-2001 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,9 +62,9 @@ package org.apache.struts.taglib.html; import javax.servlet.jsp.JspException; -import org.apache.struts.util.RequestUtils; -import org.apache.struts.util.ResponseUtils; + import org.apache.struts.taglib.TagUtils; +import org.apache.struts.util.ResponseUtils; /** * Convenience base class for the various input tags for text fields. @@ -136,7 +136,7 @@ */ public int doStartTag() throws JspException { - ResponseUtils.write(this.pageContext, this.renderInputElement()); + TagUtils.getInstance().write(this.pageContext, this.renderInputElement()); return (EVAL_BODY_TAG); 1.6 +8 -13 jakarta-struts/src/share/org/apache/struts/taglib/html/HiddenTag.java Index: HiddenTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HiddenTag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- HiddenTag.java 26 Jul 2003 17:22:27 -0000 1.5 +++ HiddenTag.java 31 Jul 2003 00:25:39 -0000 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,15 +59,12 @@ * */ - package org.apache.struts.taglib.html; - import javax.servlet.jsp.JspException; -import org.apache.struts.util.RequestUtils; -import org.apache.struts.util.ResponseUtils; -import org.apache.struts.taglib.TagUtils; +import org.apache.struts.taglib.TagUtils; +import org.apache.struts.util.ResponseUtils; /** * Custom tag for input fields of type "hidden". @@ -75,7 +72,6 @@ * @author Craig R. McClanahan * @version $Revision$ $Date$ */ - public class HiddenTag extends BaseFieldTag { @@ -144,8 +140,7 @@ } } - // Render the result to the output writer - ResponseUtils.write(pageContext, results); + TagUtils.getInstance().write(pageContext, results); return (EVAL_BODY_TAG); } 1.54 +5 -6 jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java Index: FormTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- FormTag.java 26 Jul 2003 18:51:36 -0000 1.53 +++ FormTag.java 31 Jul 2003 00:25:39 -0000 1.54 @@ -80,7 +80,6 @@ import org.apache.struts.taglib.TagUtils; import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; -import org.apache.struts.util.ResponseUtils; /** * Custom tag that represents an input form, associated with a bean whose @@ -520,7 +519,7 @@ results.append(this.renderToken()); - ResponseUtils.write(pageContext, results.toString()); + TagUtils.getInstance().write(pageContext, results.toString()); // Store this tag itself as a page attribute pageContext.setAttribute(Constants.FORM_KEY, this, PageContext.REQUEST_SCOPE); 1.12 +5 -7 jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java Index: OptionsCollectionTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- OptionsCollectionTag.java 27 Jul 2003 07:13:04 -0000 1.11 +++ OptionsCollectionTag.java 31 Jul 2003 00:25:39 -0000 1.12 @@ -93,7 +93,6 @@ * @version $Revision$ $Date$ * @since Struts 1.1 */ - public class OptionsCollectionTag extends TagSupport { // ----------------------------------------------------- Instance Variables @@ -292,8 +291,7 @@ addOption(sb, stringLabel, stringValue, selectTag.isMatched(stringValue)); } - // Render this element to our writer - ResponseUtils.write(pageContext, sb.toString()); + TagUtils.getInstance().write(pageContext, sb.toString()); return SKIP_BODY; } 1.16 +5 -8 jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java Index: MessageTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/MessageTag.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- MessageTag.java 27 Jul 2003 06:54:28 -0000 1.15 +++ MessageTag.java 31 Jul 2003 00:25:39 -0000 1.16 @@ -69,7 +69,6 @@ import org.apache.struts.Globals; import org.apache.struts.taglib.TagUtils; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.ResponseUtils; /** * Custom tag that retrieves an internationalized messages string (with @@ -282,10 +281,8 @@ throw e; } - // Print the retrieved message to our output writer - ResponseUtils.write(pageContext, message); + TagUtils.getInstance().write(pageContext, message); - // Continue processing this page return (SKIP_BODY); } 1.28 +6 -6 jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java Index: WriteTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/bean/WriteTag.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- WriteTag.java 27 Jul 2003 06:54:28 -0000 1.27 +++ WriteTag.java 31 Jul 2003 00:25:39 -0000 1.28 @@ -278,9 +278,9 @@ // Print this property value to our output writer, suitably filtered if (filter) { - ResponseUtils.write(pageContext, ResponseUtils.filter(output)); + TagUtils.getInstance().write(pageContext, ResponseUtils.filter(output)); } else { - ResponseUtils.write(pageContext, output); + TagUtils.getInstance().write(pageContext, output); } // Continue processing this page 1.5 +7 -6 jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java Index: NestedWriteNestingTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/nested/NestedWriteNestingTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- NestedWriteNestingTag.java 28 Feb 2003 05:14:01 -0000 1.4 +++ NestedWriteNestingTag.java 31 Jul 2003 00:25:39 -0000 1.5 @@ -63,6 +63,7 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; +import org.apache.struts.taglib.TagUtils; import org.apache.struts.util.ResponseUtils; /** @@ -122,9 +123,9 @@ /* write output, filtering if required */ if (this.filter) { - ResponseUtils.write(pageContext, ResponseUtils.filter(nesting)); + TagUtils.getInstance().write(pageContext, ResponseUtils.filter(nesting)); } else { - ResponseUtils.write(pageContext, nesting); + TagUtils.getInstance().write(pageContext, nesting); } /* continue with page processing */
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]