You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2003/03/10 02:03:02 UTC

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

craigmcc    2003/03/09 17:03:02

  Modified:    src/share/org/apache/struts/taglib/html ErrorsTag.java
  Log:
  Render a platform-independent line ending instead of hard coded "\r\n".
  This should have no visual effect, but it allows the "TestErrorsTag1" test
  suite to pass on a Linux server.  Feel free to revert if this causes problems
  with the test under Windows.
  
  Revision  Changes    Path
  1.20      +13 -7     jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java
  
  Index: ErrorsTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ErrorsTag.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ErrorsTag.java	8 Dec 2002 06:54:51 -0000	1.19
  +++ ErrorsTag.java	10 Mar 2003 01:03:02 -0000	1.20
  @@ -128,6 +128,12 @@
   
   
       /**
  +     * The line ending string.
  +     */
  +    protected static String lineEnd = System.getProperty("line.separator");
  +
  +
  +    /**
        * The session attribute key for our locale.
        */
       protected String locale = Globals.LOCALE_KEY;
  @@ -227,7 +233,7 @@
                       message = RequestUtils.message(pageContext, bundle,
                                                      locale, "errors.header");
                       results.append(message);
  -                    results.append("\r\n");
  +                    results.append(lineEnd);
                   }
                   headerDone = true;
               }
  @@ -241,7 +247,7 @@
                                              report.getValues());
               if (message != null) {
                   results.append(message);
  -                results.append("\r\n");
  +                results.append(lineEnd);
               }
               if (suffixPresent) {
                   message = RequestUtils.message(pageContext, bundle,
  @@ -253,7 +259,7 @@
               message = RequestUtils.message(pageContext, bundle,
                                              locale, "errors.footer");
               results.append(message);
  -            results.append("\r\n");
  +            results.append(lineEnd);
           }
   
       // Print the results to our output writer
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org