You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by dg...@apache.org on 2003/07/02 04:50:15 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java
dgraham 2003/07/01 19:50:15
Modified: src/share/org/apache/struts/taglib/html BaseHandlerTag.java
Log:
Use RequestUtils.isXhtml() instead of duplicating logic.
Revision Changes Path
1.26 +6 -18 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- BaseHandlerTag.java 18 May 2003 18:57:13 -0000 1.25
+++ BaseHandlerTag.java 2 Jul 2003 02:50:15 -0000 1.26
@@ -66,7 +66,6 @@
import java.util.Locale;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.commons.beanutils.BeanUtils;
@@ -856,14 +855,7 @@
* @since Struts 1.1
*/
protected boolean isXhtml() {
- String xhtml =
- (String) this.pageContext.getAttribute(Globals.XHTML_KEY, PageContext.PAGE_SCOPE);
-
- if ("true".equalsIgnoreCase(xhtml)) {
- return true;
- } else {
- return false;
- }
+ return RequestUtils.isXhtml(this.pageContext);
}
/**
@@ -873,11 +865,7 @@
* @since Struts 1.1
*/
protected String getElementClose() {
- if (this.isXhtml()) {
- return " />";
- } else {
- return ">";
- }
+ return this.isXhtml() ? " />" : ">";
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org