cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseHandlerTag.java

[dgraham]

dgraham     2002/11/15 22:04:16

  Modified:    src/share/org/apache/struts/taglib/html BaseHandlerTag.java
  Log:
  Changed isXhtml to look for page scoped constant instead of a parent 
  <html:html> tag.
  
  Revision  Changes    Path
  1.19      +22 -12    
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BaseHandlerTag.java       12 Nov 2002 03:47:42 -0000      1.18
  +++ BaseHandlerTag.java       16 Nov 2002 06:04:16 -0000      1.19
  @@ -66,6 +66,7 @@
   import javax.servlet.jsp.JspException;
   import javax.servlet.jsp.tagext.BodyTagSupport;
   import javax.servlet.jsp.tagext.Tag;
  +import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
   import org.apache.struts.taglib.logic.IterateTag;
  @@ -779,13 +780,22 @@
        * otherwise.
        * @since Struts 1.1
        */
  -    protected static boolean isXhtml(Tag tag) {
  -        HtmlTag htmlTag = (HtmlTag) findAncestorWithClass(tag, HtmlTag.class);
  -        if (htmlTag == null) {
  +    protected boolean isXhtml() {
  +        String xhtml =
  +            (String) this.pageContext.getAttribute(Globals.XHTML_KEY, 
this.pageContext.PAGE_SCOPE);
  +        
  +        if ("true".equalsIgnoreCase(xhtml)) {
  +            return true;
  +        } else {
               return false;
           }
  -
  -        return htmlTag.getXhtml();
  +        
  +//        HtmlTag htmlTag = (HtmlTag) findAncestorWithClass(tag, HtmlTag.class);
  +//        if (htmlTag == null) {
  +//            return false;
  +//        }
  +//
  +//        return htmlTag.getXhtml();
       }
   
       /**
  @@ -796,9 +806,9 @@
        * @return String - &gt; if xhtml is false, /&gt; if xhtml is true
        * @since Struts 1.1
        */
  -    protected String getElementClose(Tag tag) {
  -        if (this.isXhtml(tag)) {
  -            return "/>";
  +    protected String getElementClose() {
  +        if (this.isXhtml()) {
  +            return " />";
           } else {
               return ">";
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>