svn commit: r1803060 - in /myfaces/tobago/trunk/tobago-core/src: main/java/org/apache/myfaces/tobago/internal/util/ main/java/org/apache/myfaces/tobago/internal/webapp/ test/java/org/apache/myfaces/tobago/util/

[lo...@apache.org]

Author: lofwyr
Date: Wed Jul 26 15:04:22 2017
New Revision: 1803060

URL: http://svn.apache.org/viewvc?rev=1803060&view=rev
Log:
TOBAGO-1769: Ajax doesn't work for text containing non-printable control characters
* Code Style: renaming "Utils" to "Helper", because it will be instantiated. "Utils" should only be static

Added:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java
      - copied, changed from r1803033, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java
      - copied, changed from r1803033, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
    myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterHelperUnitTest.java
      - copied, changed from r1803033, myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java
Removed:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java
    myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java
Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java

Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java (from r1803033, 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/HtmlWriterHelper.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterHelper.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/HtmlWriterUtils.java&r1=1803033&r2=1803060&rev=1803060&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/HtmlWriterHelper.java Wed Jul 26 15:04:22 2017
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.intern
 import java.io.IOException;
 import java.io.Writer;
 
-public final class HtmlWriterUtils extends WriterUtils {
+public final class HtmlWriterHelper extends WriterHelper {
 
   private static final char[][] CHARS_TO_ESCAPE;
 
@@ -54,7 +54,7 @@ public final class HtmlWriterUtils exten
     // all "normal" character positions contains null
   }
 
-  public HtmlWriterUtils(final Writer out, final String characterEncoding) {
+  public HtmlWriterHelper(final Writer out, final String characterEncoding) {
     super(out, characterEncoding);
   }
 

Copied: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java (from r1803033, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java?p2=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java&r1=1803033&r2=1803060&rev=1803060&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/WriterHelper.java Wed Jul 26 15:04:22 2017
@@ -22,7 +22,7 @@ package org.apache.myfaces.tobago.intern
 import java.io.IOException;
 import java.io.Writer;
 
-public abstract class WriterUtils {
+public abstract class WriterHelper {
   protected static final char[] EMPTY = new char[0];
   //
   // Entities from HTML 4.0, section 24.2.1; character codes 0xA0 to 0xFF
@@ -129,7 +129,7 @@ public abstract class WriterUtils {
   private final ResponseWriterBuffer buffer;
   private final boolean utf8;
 
-  public WriterUtils(final Writer out, final String characterEncoding) {
+  public WriterHelper(final Writer out, final String characterEncoding) {
     this.out = out;
     buffer = new ResponseWriterBuffer(out);
     utf8 = "utf-8".equalsIgnoreCase(characterEncoding);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java?rev=1803060&r1=1803059&r2=1803060&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/HtmlResponseWriter.java Wed Jul 26 15:04:22 2017
@@ -20,9 +20,9 @@
 package org.apache.myfaces.tobago.internal.webapp;
 
 import org.apache.myfaces.tobago.internal.util.FastStringWriter;
-import org.apache.myfaces.tobago.internal.util.HtmlWriterUtils;
+import org.apache.myfaces.tobago.internal.util.HtmlWriterHelper;
 import org.apache.myfaces.tobago.internal.util.StringUtils;
-import org.apache.myfaces.tobago.internal.util.WriterUtils;
+import org.apache.myfaces.tobago.internal.util.WriterHelper;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 
@@ -35,14 +35,14 @@ public class HtmlResponseWriter extends
 
   private static final String HTML_DOCTYPE = "<!DOCTYPE html>";
 
-  private final WriterUtils helper;
+  private final WriterHelper helper;
   private FastStringWriter javascriptWriter;
   private boolean javascriptMode;
 
   public HtmlResponseWriter(
       final Writer writer, final String contentType, final String characterEncoding) {
     super(writer, contentType, characterEncoding);
-    this.helper = new HtmlWriterUtils(writer, characterEncoding);
+    this.helper = new HtmlWriterHelper(writer, characterEncoding);
     this.javascriptWriter = new FastStringWriter();
   }
 
@@ -86,7 +86,7 @@ public class HtmlResponseWriter extends
     return javascriptWriter.toString();
   }
 
-  public final WriterUtils getHelper() {
+  public final WriterHelper getHelper() {
     return helper;
   }
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java?rev=1803060&r1=1803059&r2=1803060&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/XmlResponseWriter.java Wed Jul 26 15:04:22 2017
@@ -19,8 +19,8 @@
 
 package org.apache.myfaces.tobago.internal.webapp;
 
-import org.apache.myfaces.tobago.internal.util.HtmlWriterUtils;
-import org.apache.myfaces.tobago.internal.util.WriterUtils;
+import org.apache.myfaces.tobago.internal.util.HtmlWriterHelper;
+import org.apache.myfaces.tobago.internal.util.WriterHelper;
 
 import javax.faces.context.ResponseWriter;
 import java.io.IOException;
@@ -29,12 +29,12 @@ import java.util.Arrays;
 
 public final class XmlResponseWriter extends TobagoResponseWriterBase {
 
-  private final WriterUtils helper;
+  private final WriterHelper helper;
 
   public XmlResponseWriter(
       final Writer writer, final String contentType, final String characterEncoding) {
     super(writer, contentType, characterEncoding);
-    this.helper = new HtmlWriterUtils(writer, characterEncoding);
+    this.helper = new HtmlWriterHelper(writer, characterEncoding);
   }
 
   @Override

Copied: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterHelperUnitTest.java (from r1803033, myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterHelperUnitTest.java?p2=myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterHelperUnitTest.java&p1=myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java&r1=1803033&r2=1803060&rev=1803060&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterUtilsUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/HtmlWriterHelperUnitTest.java Wed Jul 26 15:04:22 2017
@@ -19,21 +19,21 @@
 
 package org.apache.myfaces.tobago.util;
 
-import org.apache.myfaces.tobago.internal.util.HtmlWriterUtils;
+import org.apache.myfaces.tobago.internal.util.HtmlWriterHelper;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.CharArrayWriter;
 import java.io.IOException;
 
-public class HtmlWriterUtilsUnitTest {
+public class HtmlWriterHelperUnitTest {
 
   // some chars must escaped in attribute values other than in text
   // put them at beginning of raw texts and in both escaped texts
 
   // HTML 4.0, section B.7.1: ampersands followed by
   // an open brace don't get escaped
-  public static final String[] RAW_TEXTS = {
+  private static final String[] RAW_TEXTS = {
       "oeffnende spitze klammern werden in attributen doch escaped <tagname >",
       "& followed by an { -> &{ don't get escaped in attributes",
       "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
@@ -45,7 +45,7 @@ public class HtmlWriterUtilsUnitTest {
       "\u00f0\u00f1\u00f2\u00f3\u00f4\u00f5\u00f6\u00f7\u00f8\u00f9\u00fa\u00fb\u00fc\u00fd\u00fe\u00ff"
 
   };
-  public static final String[] ESCAPED_TEXTS = {
+  private static final String[] ESCAPED_TEXTS = {
       "oeffnende spitze klammern werden in attributen doch escaped &lt;tagname &gt;",
       "&amp; followed by an { -&gt; &amp;{ don&#x27;t get escaped in attributes",
       RAW_TEXTS[2], // no escape needed
@@ -62,7 +62,7 @@ public class HtmlWriterUtilsUnitTest {
           + "&thorn;&yuml;"
   };
 
-  public static final String[] ESCAPED_ATTRIBUTES = {
+  private static final String[] ESCAPED_ATTRIBUTES = {
       ESCAPED_TEXTS[0], // same as in texts
       "&amp; followed by an { -&gt; &{ don&#x27;t get escaped in attributes",
       ESCAPED_TEXTS[2], // same as in texts
@@ -77,7 +77,7 @@ public class HtmlWriterUtilsUnitTest {
   @Test
   public void testTexts() {
     final CharArrayWriter writer = new CharArrayWriter();
-    final HtmlWriterUtils helper = new HtmlWriterUtils(writer, "");
+    final HtmlWriterHelper helper = new HtmlWriterHelper(writer, "");
 
     for (int i = 0; i < ESCAPED_TEXTS.length; i++) {
       testText(helper, writer, RAW_TEXTS[i], ESCAPED_TEXTS[i]);
@@ -87,7 +87,7 @@ public class HtmlWriterUtilsUnitTest {
   @Test
   public void testAttributes() {
     final CharArrayWriter writer = new CharArrayWriter();
-    final HtmlWriterUtils helper = new HtmlWriterUtils(writer, "");
+    final HtmlWriterHelper helper = new HtmlWriterHelper(writer, "");
 
     for (int i = 0; i < ESCAPED_ATTRIBUTES.length; i++) {
       testAttributeValue(helper, writer, RAW_TEXTS[i], ESCAPED_ATTRIBUTES[i]);
@@ -95,7 +95,7 @@ public class HtmlWriterUtilsUnitTest {
   }
 
   private void testText(
-      final HtmlWriterUtils writerUtil, final CharArrayWriter writer, final String text, final String escaped) {
+      final HtmlWriterHelper writerUtil, final CharArrayWriter writer, final String text, final String escaped) {
     try {
       writer.reset();
       writerUtil.writeText(text);
@@ -108,7 +108,7 @@ public class HtmlWriterUtilsUnitTest {
   }
 
   private void testAttributeValue(
-      final HtmlWriterUtils writerUtil, final CharArrayWriter writer, final String text, final String escaped) {
+      final HtmlWriterHelper writerUtil, final CharArrayWriter writer, final String text, final String escaped) {
     try {
       writer.reset();
       writerUtil.writeAttributeValue(text);