Preserve leading/trailing spaces in comment lines

yumaoka · web-flow · commit f242ad4c6bac · 2017-02-17T18:55:18.000-05:00
diff --git a/gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/IOSStringsResource.java b/gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/IOSStringsResource.java
@@ -62,14 +62,14 @@ public Bundle parse(InputStream in) throws IOException {
                 String comment = line.substring(line.indexOf(COMMENT_BEGIN)+2);
                 Boolean commentEndProcessed = false;
                 while (!commentEndProcessed && line != null) {
-                    if (comment.endsWith(COMMENT_END)) {
-                        comment = comment.substring(0, comment.length()-2);
+                    if (comment.trim().endsWith(COMMENT_END)) {
+                        comment = comment.substring(0, comment.lastIndexOf(COMMENT_END));
                         commentEndProcessed = true;
                     }
                     notes.add(comment);
                     if (!commentEndProcessed) {
                         line = reader.readLine();
-                        comment = line.trim();
+                        comment = line;
                     }
                 }
             } else if (commentIsGlobal && line.isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -62,14 +62,14 @@ public Bundle parse(InputStream in) throws IOException {`
`62`	`62`	`String comment = line.substring(line.indexOf(COMMENT_BEGIN)+2);`
`63`	`63`	`Boolean commentEndProcessed = false;`
`64`	`64`	`while (!commentEndProcessed && line != null) {`
`65`		`- if (comment.endsWith(COMMENT_END)) {`
`66`		`- comment = comment.substring(0, comment.length()-2);`
	`65`	`+ if (comment.trim().endsWith(COMMENT_END)) {`
	`66`	`+ comment = comment.substring(0, comment.lastIndexOf(COMMENT_END));`
`67`	`67`	`commentEndProcessed = true;`
`68`	`68`	`}`
`69`	`69`	`notes.add(comment);`
`70`	`70`	`if (!commentEndProcessed) {`
`71`	`71`	`line = reader.readLine();`
`72`		`- comment = line.trim();`
	`72`	`+ comment = line;`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`} else if (commentIsGlobal && line.isEmpty()) {`