dgraham 2003/07/26 11:51:37 Modified: src/share/org/apache/struts/taglib/html BaseHandlerTag.java JavascriptValidatorTag.java FormTag.java src/share/org/apache/struts/util RequestUtils.java src/share/org/apache/struts/taglib TagUtils.java Log: Moved isXhtml to TagUtils. Revision Changes Path 1.30 +6 -6 jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java Index: BaseHandlerTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseHandlerTag.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- BaseHandlerTag.java 26 Jul 2003 17:22:27 -0000 1.29 +++ BaseHandlerTag.java 26 Jul 2003 18:51:34 -0000 1.30 @@ -72,8 +72,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.Globals; -import org.apache.struts.taglib.logic.IterateTag; import org.apache.struts.taglib.TagUtils; +import org.apache.struts.taglib.logic.IterateTag; import org.apache.struts.util.MessageResources; import org.apache.struts.util.RequestUtils; @@ -879,7 +879,7 @@ * @since Struts 1.1 */ protected boolean isXhtml() { - return RequestUtils.isXhtml(this.pageContext); + return TagUtils.getInstance().isXhtml(this.pageContext); } /** 1.35 +5 -6 jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java Index: JavascriptValidatorTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- JavascriptValidatorTag.java 26 Jul 2003 01:22:30 -0000 1.34 +++ JavascriptValidatorTag.java 26 Jul 2003 18:51:35 -0000 1.35 @@ -84,7 +84,6 @@ import org.apache.struts.config.ModuleConfig; import org.apache.struts.taglib.TagUtils; import org.apache.struts.util.MessageResources; -import org.apache.struts.util.RequestUtils; import org.apache.struts.validator.Resources; import org.apache.struts.validator.ValidatorPlugIn; @@ -770,7 +769,7 @@ * Returns true if this is an xhtml page. */ private boolean isXhtml() { - return RequestUtils.isXhtml(this.pageContext); + return TagUtils.getInstance().isXhtml(this.pageContext); } /** 1.53 +5 -5 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.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- FormTag.java 26 Jul 2003 18:44:53 -0000 1.52 +++ FormTag.java 26 Jul 2003 18:51:36 -0000 1.53 @@ -854,7 +854,7 @@ * Returns true if this tag should render as xhtml. */ private boolean isXhtml() { - return RequestUtils.isXhtml(this.pageContext); + return TagUtils.getInstance().isXhtml(this.pageContext); } /** 1.124 +6 -4 jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java Index: RequestUtils.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- RequestUtils.java 26 Jul 2003 18:45:24 -0000 1.123 +++ RequestUtils.java 26 Jul 2003 18:51:37 -0000 1.124 @@ -1752,6 +1752,8 @@ /** * Returns true if the custom tags are in XHTML mode. * @since Struts 1.1 + * @deprecated Use TagUtils.isXhtml() instead. This will be removed after + * Struts 1.2. */ public static boolean isXhtml(PageContext pageContext) { String xhtml = 1.10 +16 -4 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java Index: TagUtils.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- TagUtils.java 26 Jul 2003 18:44:54 -0000 1.9 +++ TagUtils.java 26 Jul 2003 18:51:37 -0000 1.10 @@ -458,6 +458,18 @@ (HttpServletRequest) pageContext.getRequest(), locale); } + + /** + * Returns true if the custom tags are in XHTML mode. + */ + public boolean isXhtml(PageContext pageContext) { + String xhtml = + (String) pageContext.getAttribute( + Globals.XHTML_KEY, + PageContext.PAGE_SCOPE); + + return "true".equalsIgnoreCase(xhtml); + } /** * Locate and return the specified bean, from an optionally specified
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]