dgraham     2003/07/07 16:46:35

  Modified:    src/share/org/apache/struts/taglib/html
                        JavascriptValidatorTag.java
  Log:
  Turned the htmlBeginComment and htmlEndComment into constants 
  because they should never change.
  
  Revision  Changes    Path
  1.30      +11 -11    
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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JavascriptValidatorTag.java       2 Jul 2003 03:47:23 -0000       1.29
  +++ JavascriptValidatorTag.java       7 Jul 2003 23:46:35 -0000       1.30
  @@ -98,6 +98,10 @@
    */
   public class JavascriptValidatorTag extends BodyTagSupport {
   
  +    private static final String HTML_BEGIN_COMMENT = "\n<!-- Begin \n";
  +
  +    private static final String HTML_END_COMMENT = "//End --> \n";
  +
       // ----------------------------------------------------------- Properties
   
       /**
  @@ -161,10 +165,6 @@
        * Hide JavaScript methods in a CDATA section for XHTML when "true".
        */
       protected String cdata = "true";
  -
  -    private String htmlBeginComment = "\n<!-- Begin \n";
  -
  -    private String htmlEndComment = "//End --> \n";
       
       /**
        * Gets the key (form name) that will be used
  @@ -511,7 +511,7 @@
               } else if ("true".equalsIgnoreCase(staticJavascript)) {
                   results.append(this.getStartElement());
                   if ("true".equalsIgnoreCase(htmlComment)) {
  -                    results.append(htmlBeginComment);
  +                    results.append(HTML_BEGIN_COMMENT);
                   }
               }
           }
  @@ -571,7 +571,7 @@
           }
           
           if (!this.isXhtml() && "true".equals(htmlComment)) {
  -            sb.append(htmlBeginComment);
  +            sb.append(HTML_BEGIN_COMMENT);
           }
           sb.append("\n     var bCancel = false; \n\n");
   
  @@ -629,7 +629,7 @@
   
           sb.append("\n");
           if (!this.isXhtml() && "true".equals(htmlComment)){
  -            sb.append(htmlEndComment);
  +            sb.append(HTML_END_COMMENT);
           }
           
           if (this.isXhtml() && "true".equalsIgnoreCase(this.cdata)) {
  
  
  

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

Reply via email to