Fixed \uXXXX unescaping issue in earlier commit

And updated the test cases to include unicode escapes and others in
comments, fix properties file encoding in eclipse workspace, etc.

Author: yoshito-umaoka

gp-res-filter/.settings/org.eclipse.core.resources.prefs

@@ -2,4 +2,9 @@ eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resource/resfilter/ios/write-output.strings=UTF-8
+encoding//src/test/resource/resfilter/utf8_properties/input.properties=UTF-8
+encoding//src/test/resource/resfilter/utf8_properties/merge-output.properties=UTF-8
+encoding//src/test/resource/resfilter/utf8_properties/parse-test-input.properties=UTF-8
+encoding//src/test/resource/resfilter/utf8_properties/parseline-test-input.properties=UTF-8
+encoding//src/test/resource/resfilter/utf8_properties/write-output.properties=UTF-8
 encoding/<project>=UTF-8

gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/impl/JavaPropertiesResource.java

@@ -355,10 +355,14 @@ public void print(PrintWriter pw, BreakIterator brkItr, boolean isUTF8) throws I
             // Write out any notes (comments) associated with this resource.
             if (notes != null) {
                 for (String note : notes) {
-                    pw.println("#" + note);
+                    if (isUTF8) {
+                        pw.println("#" + note);
+                    } else {
+                        pw.println("#" + escapeOnlyUnicode(note));
+                    }
                 }
             }
-            
+
             if (len <= COLMAX) {
                 // Print this property in a single line
                 if (separator.getCharacter() == PropSeparator.SPACE.getCharacter()) {
@@ -688,7 +692,7 @@ private static String unescapeOnlyUnicode(String str) {
         final StringBuilder buf = new StringBuilder();
         for (int i = 0; i < str.length(); i++) {
             final char c = str.charAt(i);
-            if (c == BACKSLASH && i + 5 >= str.length()) {
+            if (c == BACKSLASH && i + 5 <= str.length()) {
                 boolean isUniEsc = false;
                 i++;
                 final char c1 = str.charAt(i);

gp-res-filter/src/test/java/com/ibm/g11n/pipeline/resfilter/impl/JavaPropertiesResourceTest.java

@@ -100,7 +100,7 @@ public class JavaPropertiesResourceTest {
                 .sequenceNumber(11).notes(Arrays.asList(" Not a Java MessageFormat param")).build());
 
         lst.add(ResourceString.with("backslashes", "a\\b\\c")
-                .sequenceNumber(12).notes(Arrays.asList(" A comment with backslashes - a\\b\\c")).build());
+                .sequenceNumber(12).notes(Arrays.asList(" A comment with backslashes - a\\b\\c あい \\t\\n")).build());
 
         Collections.sort(lst, new ResourceStringComparator());
         EXPECTED_INPUT_RES_LIST = lst;
@@ -133,7 +133,7 @@ public class JavaPropertiesResourceTest {
         bundleBuilder.addResourceString("non-param", "This {} is not a parameter.", 11,
                 Arrays.asList(" Not a Java MessageFormat param"));
         bundleBuilder.addResourceString("backslashes", "a\\b\\c", 12,
-                Arrays.asList(" A comment with backslashes - a\\b\\c"));
+                Arrays.asList(" A comment with backslashes - a\\b\\c あい \\t\\n"));
         bundleBuilder.addNotes(Arrays.asList(
                 " You are reading the \".properties\" entry.",
                 " The exclamation mark can also mark text as comments.",

gp-res-filter/src/test/java/com/ibm/g11n/pipeline/resfilter/impl/JavaUTF8PropertiesResourceTest.java

@@ -78,7 +78,7 @@ public class JavaUTF8PropertiesResourceTest {
                 .sequenceNumber(4)
                 .notes(Arrays.asList(" Add spaces to the key")).build());
 
-        ResourceString rs5 = ResourceString.with("tab", "pick up the\u00A5 tab")
+        ResourceString rs5 = ResourceString.with("tab", "pick up the ¥ tab")
                 .sequenceNumber(5).addNote(" Unicode").build();
         lst.add(rs5);
 
@@ -97,6 +97,9 @@ public class JavaUTF8PropertiesResourceTest {
         lst.add(ResourceString.with("参数1", "Value of parameter one").sequenceNumber(10)
                 .notes(Arrays.asList(" Raw UTF8")).build());
 
+        lst.add(ResourceString.with("backslashes", "a\\b\\c").sequenceNumber(11)
+                .notes(Arrays.asList(" A comment with backslashes - a\\b\\c あい \\t\\n")).build());
+
         Collections.sort(lst, new ResourceStringComparator());
         EXPECTED_INPUT_RES_LIST = lst;
     }
@@ -113,7 +116,7 @@ public class JavaUTF8PropertiesResourceTest {
         bundleBuilder.addResourceString("message", "Translated - Welcome to Wikipedia!", 3,
                 Arrays.asList(" The backslash below tells the application to continue reading",
                         " the value onto the next line."));
-        bundleBuilder.addResourceString("tab", "Translated - pick up the\u00A5 tab", 5,
+        bundleBuilder.addResourceString("tab", "Translated - pick up the ¥ tab", 5,
                 Arrays.asList(" Unicode"));
         bundleBuilder.addResourceString("leadSPs", "localized leading SPs", 6,
                 Arrays.asList(" leading SPs"));
@@ -125,6 +128,9 @@ public class JavaUTF8PropertiesResourceTest {
                 Arrays.asList(" tabs"));
         bundleBuilder.addResourceString("参数1", "localized Value of parameter one", 10,
                 Arrays.asList(" Raw UTF8"));
+        bundleBuilder.addResourceString("backslashes", "a\\b\\c", 11,
+                Arrays.asList(" A comment with backslashes - a\\b\\c あい \\t\\n"));
+
         bundleBuilder.addNotes(Arrays.asList(
                 " You are reading the \".properties\" entry.",
                 " The exclamation mark can also mark text as comments.",
@@ -142,11 +148,13 @@ public class JavaUTF8PropertiesResourceTest {
         EXPECTED_PROP_DEF_LIST.add(new PropDef("message", "Welcome to Wikipedia!", PropSeparator.COLON));
         EXPECTED_PROP_DEF_LIST.add(new PropDef("key with spaces",
                 "This is the value that could be looked up with the key \"key with spaces\".", PropSeparator.EQUAL));
-        EXPECTED_PROP_DEF_LIST.add(new PropDef("tab", "pick up the\u00A5 tab", PropSeparator.COLON));
+        EXPECTED_PROP_DEF_LIST.add(new PropDef("tab", "pick up the ¥ tab", PropSeparator.COLON));
         EXPECTED_PROP_DEF_LIST.add(new PropDef("leadSPs", "leading SPs", PropSeparator.EQUAL));
         EXPECTED_PROP_DEF_LIST.add(new PropDef("leadTabs", "leading tabs", PropSeparator.EQUAL));
         EXPECTED_PROP_DEF_LIST.add(new PropDef("trailSPs", "trailing SPs  ", PropSeparator.EQUAL));
         EXPECTED_PROP_DEF_LIST.add(new PropDef("withTabs", "Tab1\tTab2\tTab3\t", PropSeparator.EQUAL));
+        EXPECTED_PROP_DEF_LIST.add(new PropDef("参数1", "Value of parameter one", PropSeparator.EQUAL));
+        EXPECTED_PROP_DEF_LIST.add(new PropDef("backslashes", "a\\b\\c", PropSeparator.EQUAL));
     }
 
     private static final JavaPropertiesResource res = new JavaPropertiesResource(Encoding.UTF_8, MessagePatternEscape.AUTO);

gp-res-filter/src/test/resource/resfilter/properties/input.properties

@@ -25,5 +25,5 @@ withTabs = Tab1\tTab2\tTab3\t
 withQuote = You''re about to delete '{0}' rows in Mike''s file {0}.
 # Not a Java MessageFormat param
 non-param = This {} is not a parameter.
-# A comment with backslashes - a\b\c
+# A comment with backslashes - a\b\c \u3042\u3044 \t\n
 backslashes = a\\b\\c

gp-res-filter/src/test/resource/resfilter/properties/merge-output.properties

@@ -25,5 +25,5 @@ withTabs = localized Tab1\tTab2\tTab3\t
 withQuote = You''re about to delete '{1}' rows in Mike''s file {0}.
 # Not a Java MessageFormat param
 non-param = This {} is not a parameter.
-# A comment with backslashes - a\b\c
+# A comment with backslashes - a\b\c \u3042\u3044 \t\n
 backslashes = a\\b\\c

gp-res-filter/src/test/resource/resfilter/properties/write-output.properties

@@ -26,5 +26,5 @@ withTabs = localized Tab1\tTab2\tTab3\t
 withQuote = You''re about to delete '{1}' rows in Mike''s file {0}.
 # Not a Java MessageFormat param
 non-param = This {} is not a parameter.
-# A comment with backslashes - a\b\c
+# A comment with backslashes - a\b\c \u3042\u3044 \t\n
 backslashes = a\\b\\c

gp-res-filter/src/test/resource/resfilter/utf8_properties/input.properties

@@ -12,7 +12,7 @@ message:Welcome to \
 # Add spaces to the key
 key\ with\ spaces = This is the value that could be looked up with the key "key with spaces".
 # Unicode
-tab : pick up the\u00A5 tab
+tab : pick up the ¥ tab
 # leading SPs
     leadSPs = leading SPs
 # leading tabs
@@ -23,3 +23,5 @@ trailSPs = trailing SPs
 withTabs = Tab1\tTab2\tTab3\t
 # Raw UTF8
 参数1 = Value of parameter one
+# A comment with backslashes - a\b\c あい \t\n
+backslashes = a\\b\\c

gp-res-filter/src/test/resource/resfilter/utf8_properties/merge-output.properties

@@ -12,7 +12,7 @@ message : Translated - Welcome to Wikipedia\!
 key\ with\ spaces = Translated - This is the value that could be looked up \
     with the key "key with spaces".
 # Unicode
-tab : Translated - pick up the¥ tab
+tab : Translated - pick up the ¥ tab
 # leading SPs
     leadSPs = localized leading SPs
 # leading tabs
@@ -23,3 +23,5 @@ trailSPs = localized trailing SPs
 withTabs = localized Tab1\tTab2\tTab3\t
 # Raw UTF8
 参数1 = localized Value of parameter one
+# A comment with backslashes - a\b\c あい \t\n
+backslashes = a\\b\\c

gp-res-filter/src/test/resource/resfilter/utf8_properties/parse-test-input.properties

@@ -2,8 +2,10 @@ website = http\://en.wikipedia.org/
 language                               English
 message:Welcome to Wikipedia!
 key\ with\ spaces=This is the value that could be looked up with the key "key with spaces".
-tab : pick up the\u00A5 tab
+tab : pick up the ¥ tab
     leadSPs = leading SPs
 		leadTabs = leading tabs
 trailSPs = trailing SPs  
 withTabs = Tab1\tTab2\tTab3\t
+参数1 = Value of parameter one
+backslashes = a\\b\\c