You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/05/02 14:51:28 UTC

svn commit: r1333020 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/

Author: lofwyr
Date: Wed May  2 12:51:28 2012
New Revision: 1333020

URL: http://svn.apache.org/viewvc?rev=1333020&view=rev
Log:
TOBAGO-1116: tc:textarea adds an extra linefeed for \r\n

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java?rev=1333020&r1=1333019&r2=1333020&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java Wed May  2 12:51:28 2012
@@ -36,8 +36,8 @@ public final class HtmlWriterUtils {
     CHARS_TO_ESCAPE['&'] = "&".toCharArray();
     CHARS_TO_ESCAPE['<'] = "&lt;".toCharArray();
     CHARS_TO_ESCAPE['>'] = "&gt;".toCharArray();
-    CHARS_TO_ESCAPE['\n'] = "&#13;".toCharArray();
-    CHARS_TO_ESCAPE['\r'] = "&#10;".toCharArray();
+    CHARS_TO_ESCAPE['\n'] = "&#10;".toCharArray();
+    CHARS_TO_ESCAPE['\r'] = "&#13;".toCharArray();
     CHARS_TO_ESCAPE['\t'] = "&#09;".toCharArray();
   }
 

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java?rev=1333020&r1=1333019&r2=1333020&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java Wed May  2 12:51:28 2012
@@ -59,7 +59,7 @@ public class OutRenderer extends LayoutC
       HtmlRendererUtils.renderTip(out, writer);
     }
     if (escape) {
-      StringTokenizer tokenizer = new StringTokenizer(text, "\n\r");
+      StringTokenizer tokenizer = new StringTokenizer(text, "\r\n");
       while (tokenizer.hasMoreTokens()) {
         String token = tokenizer.nextToken();
         writer.writeText(token);