[gwt-contrib] [google-web-toolkit] r7345 committed - Trunk revision 7342 was merged into this branch:...

[codesite-noreply]

Revision: 7345
Author: kpro...@google.com
Date: Mon Dec 21 12:00:36 2009
Log: Trunk revision 7342 was merged into this branch:

svn merge --ignore-ancestry -c 7342  
https://google-web-toolkit.googlecode.com/svn/trunk .

Review by: spoon


http://code.google.com/p/google-web-toolkit/source/detail?r=7345

Modified:
   
/releases/2.0/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java
  /releases/2.0/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java

=======================================
---  
/releases/2.0/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java
        
Thu Aug 20 13:57:35 2009
+++  
/releases/2.0/dev/core/src/com/google/gwt/core/ext/soyc/impl/SizeMapRecorder.java
        
Mon Dec 21 12:00:36 2009
@@ -54,6 +54,22 @@
        this.description = description;
      }
    }
+
+  /**
+   * Returns the hexadecimal representation of a character
+   */
+  public static StringBuilder charToHex(char c) {
+    char hexDigit[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+      'A', 'B', 'C', 'D', 'E', 'F' };
+    StringBuilder toReturn = new StringBuilder();
+    byte charByte = (byte) (c >>> 8);
+    toReturn.append(hexDigit[(charByte >> 4) & 0x0F]);
+    toReturn.append(hexDigit[charByte & 0x0F]);
+    charByte = (byte) (c & 0xFF);
+    toReturn.append(hexDigit[(charByte >> 4) & 0x0F]);
+    toReturn.append(hexDigit[charByte & 0x0F]);
+    return toReturn;
+  }

    /**
     * Escapes '&', '<', '>', '"', and '\'' to their XML entity equivalents.
@@ -78,37 +94,41 @@
     * @param builder a StringBuilder to be appended with the output.
     */
    public static void escapeXml(String code, int start, int end,
-      boolean quoteApostrophe, StringBuilder builder) {
+    boolean quoteApostrophe, StringBuilder builder) {
+    // See http://www.w3.org/TR/2006/REC-xml11-20060816/#charsets.
      int lastIndex = 0;
      int len = end - start;
      char[] c = new char[len];

      code.getChars(start, end, c, 0);
      for (int i = 0; i < len; i++) {
-      if ((c[i] >= '\uD800') && (c[i] <= '\uDBFF')) {
+      if ((c[i] < '\u0020')) {
          builder.append(c, lastIndex, i - lastIndex);
-        builder.append("(non-valid utf-8 character)");
+        if (c[i] == '\u0000') {
+         builder.append("\\0");
+        }
+        else if (c[i] == '\u0009') {
+         builder.append("\\t");
+        }
+        else if (c[i] == '\n') {
+         builder.append("\\n");
+        }
+        else if (c[i] == '\r') {
+         builder.append("\\r");
+        }
+        else {
+            builder.append("(invalid xml character: \\u" + charToHex(c[i])  
+ ")");
+        }
          lastIndex = i + 1;
-        break;
-      } else if ((c[i] >= '\uDC00') && (c[i] <= '\uDFFF')) {
+      } else if (((c[i] >= '\u007F') && (c[i] <= '\u0084')) ||
+            ((c[i] >= '\u0086') && (c[i] <= '\u009F')) ||
+            ((c[i] >= '\uD800') && (c[i] <= '\uDBFF')) ||
+            ((c[i] >= '\uDC00') && (c[i] <= '\uDFFF')) ||
+            ((c[i] >= '\uFDD0') && (c[i] <= '\uFDDF')) ||
+            (c[i] == '\u00A0') || (c[i] == '\uFFFF') || (c[i]  
== '\uFFFE')) {
          builder.append(c, lastIndex, i - lastIndex);
-        builder.append("(non-valid utf-8 character)");
+        builder.append("(invalid xml character: \\u" + charToHex(c[i])  
+ ")");
          lastIndex = i + 1;
-        break;
-      } else if (c[i] == '\0') {
-        builder.append(c, lastIndex, i - lastIndex);
-        builder.append("(null)");
-        lastIndex = i + 1;
-        break;
-      } else if (c[i] == '\uffff') {
-        builder.append(c, lastIndex, i - lastIndex);
-        builder.append("(uffff)");
-        lastIndex = i + 1;
-        break;
-      } else if (c[i] == '\ufffe') {
-        builder.append(c, lastIndex, i - lastIndex);
-        builder.append("(ufffe)");
-        lastIndex = i + 1;
        } else if (c[i] == '&') {
          builder.append(c, lastIndex, i - lastIndex);
          builder.append("&amp;");
@@ -131,6 +151,10 @@
            builder.append("&apos;");
            lastIndex = i + 1;
          }
+      } else if (c[i] > '\u007F') {
+        builder.append(c, lastIndex, i - lastIndex);
+        builder.append("&#x" + charToHex(c[i]) + ";");
+        lastIndex = i + 1;
        }
      }
      builder.append(c, lastIndex, len - lastIndex);
=======================================
---  
/releases/2.0/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java     
 
Wed Nov 25 09:21:15 2009
+++  
/releases/2.0/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java     
 
Mon Dec 21 12:00:36 2009
@@ -16,6 +16,7 @@

  package com.google.gwt.soyc;

+import com.google.gwt.core.ext.soyc.impl.SizeMapRecorder;
  import com.google.gwt.dev.util.Util;
  import com.google.gwt.soyc.io.OutputDirectory;

@@ -106,12 +107,7 @@
    private static final Pattern PATTERN_SP_INT =  
Pattern.compile("sp([0-9]+)");

    private static String escapeXml(String unescaped) {
-    String escaped = unescaped.replaceAll("\\&", "&amp;");
-    escaped = escaped.replaceAll("\\<", "&lt;");
-    escaped = escaped.replaceAll("\\>", "&gt;");
-    escaped = escaped.replaceAll("\\\"", "&quot;");
-    escaped = escaped.replaceAll("\\'", "&apos;");
-    return escaped;
+      return SizeMapRecorder.escapeXml(unescaped);
    }

    public static void makeTopLevelHtmlForAllPerms(

-- 
http://groups.google.com/group/Google-Web-Toolkit-Contributors