[cp-patches] FYI: [cp-tools] Output Unicode characters using \u syntax.

[Andrew John Hughes]

Properties files are assumed to be encoded using ISO-8859-1,
so we should output Unicode characters using the \uXXXX syntax.

ChangeLog:

2008-07-06  Andrew John Hughes  <[EMAIL PROTECTED]>

        * src/gnu/ldml/Analyzer.java:
        (fetchResource(AliasElement)):
        Add element name to error message.
        * src/gnu/localegen/PropertiesGenerator.java,
        (convertToJavaString(String)): Output Unicode characters
        using \u syntax.
        (ManualListContent.generateContent(PrintWriter)): Likewise.
        (OrderedListContent.generateContent(PrintWriter)): Likewise.
        (TimeZoneContent.generateContent(PrintWriter)): Likewise.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

Index: src/gnu/ldml/Analyzer.java
===================================================================
RCS file: /sources/classpath/cp-tools/src/gnu/ldml/Analyzer.java,v
retrieving revision 1.6
diff -u -u -r1.6 Analyzer.java
--- src/gnu/ldml/Analyzer.java  6 Mar 2005 21:58:58 -0000       1.6
+++ src/gnu/ldml/Analyzer.java  6 Jul 2008 18:01:55 -0000
@@ -243,7 +243,7 @@
         /* We have found a candidate. Check if it is a list */
         if (!(e instanceof ListDataElement))
           {
-            System.err.println("Incorrect aliasing element in "
+            System.err.println("Incorrect aliasing element " + e.getFullName() 
+ " in "
                                + alias.parentParser.getName()
                                + " while looking in " + p.getName());
             return null;
Index: src/gnu/localegen/PropertiesGenerator.java
===================================================================
RCS file: 
/sources/classpath/cp-tools/src/gnu/localegen/PropertiesGenerator.java,v
retrieving revision 1.6
diff -u -u -r1.6 PropertiesGenerator.java
--- src/gnu/localegen/PropertiesGenerator.java  3 Jul 2008 21:31:47 -0000       
1.6
+++ src/gnu/localegen/PropertiesGenerator.java  6 Jul 2008 18:01:55 -0000
@@ -231,7 +231,7 @@
       for (int i = 0; i < data.length; i++)
         {
          // FIXME: Don't print "\u00ae" after last entry.
-          o.print(convertToJavaString(data[i].toString()) + "\u00ae");
+          o.print(convertToJavaString(data[i].toString()) + "\\u00ae");
         }
       o.println();
     }
@@ -286,16 +286,16 @@
       // FIXME: Don't print "\u00ae" after last entry.
       o.print(name + "=");
       for (int i = 0; i < prependNull; i++)
-       o.print("\u00ae");
+       o.print("\\u00ae");
       for (int i = 0; i < order.length; i++)
        {
           Object contentElement = data.get(order[i]);
           if (contentElement != null)
             o.print(convertToJavaString(contentElement.toString()));
-         o.print("\u00ae");
+         o.print("\\u00ae");
        }
       for (int i = 0; i < appendNull; i++)
-        o.print("\u00ae");
+        o.print("\\u00ae");
       o.println();
     }
 
@@ -350,7 +350,7 @@
          boolean zoneDataFound = false;
 
          buffer2.append(zoneName);
-         buffer2.append("\u00ae");
+         buffer2.append("\\u00ae");
 
          zoneTable = listElt.flattenLeaf(zoneName);
          for (int j = 0; j < classpathZoneOrder.length; j++)
@@ -363,12 +363,12 @@
                buffer2.append(convertToJavaString(zoneData.data));
                zoneDataFound = true;
              }
-           buffer2.append("\u00ae");
+           buffer2.append("\\u00ae");
          }
          if (zoneDataFound)
            {
              buffer.append(buffer2);
-             buffer.append("\u00a9");
+             buffer.append("\\u00a9");
              usable = true;
            }
          index++;