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/01/28 06:18:03 UTC

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

dgraham     2003/01/27 21:18:03

  Modified:    src/share/org/apache/struts/taglib/html FormTag.java
  Log:
  Output hidden token field in XHTML if necessary.
  
  Revision  Changes    Path
  1.43      +13 -7     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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- FormTag.java	5 Jan 2003 00:40:04 -0000	1.42
  +++ FormTag.java	28 Jan 2003 05:18:03 -0000	1.43
  @@ -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
  @@ -62,6 +62,7 @@
   package org.apache.struts.taglib.html;
   
   import java.io.IOException;
  +
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpSession;
  @@ -69,6 +70,8 @@
   import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.TagSupport;
  +
  +import org.apache.struts.Globals;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.action.ActionServlet;
  @@ -77,7 +80,6 @@
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.RequestUtils;
   import org.apache.struts.util.ResponseUtils;
  -import org.apache.struts.Globals;
   
   /**
    * Custom tag that represents an input form, associated with a bean whose
  @@ -555,7 +557,11 @@
                   results.append(Constants.TOKEN_KEY);
                   results.append("\" value=\"");
                   results.append(token);
  -                results.append("\">");
  +                if (this.isXhtml()) {
  +                    results.append("\" />");
  +                } else {
  +                    results.append("\">");
  +                }
               }
           }
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>