Always use unix-style line endings in Generators. This makes for consistent output across operating systems. In particular, it makes Windows output unix-style. http://gwt-code-reviews.appspot.com/776803/show Review by: bobv,rjrjr git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8605 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java b/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java index aa07aed..6235d71 100644 --- a/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java +++ b/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
@@ -494,7 +494,17 @@ // it is pending so another attempt to create the same type will fail. Generated gcup; StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw, true); + PrintWriter pw = new PrintWriter(sw, true) { + /** + * Overridden to force unix-style line endings for consistent behavior + * across platforms. + */ + @Override + public void println() { + super.print('\n'); + super.flush(); + } + }; if (this.genDir == null) { gcup = new GeneratedUnitImpl(sw, typeName); } else {
diff --git a/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java b/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java index 08ce64f..7a4ced2 100644 --- a/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java +++ b/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
@@ -42,7 +42,8 @@ * Outputs a new line. */ public void newline() { - pw.println(); + // Unix-style line endings for consistent behavior across platforms. + pw.print('\n'); } /** @@ -60,7 +61,8 @@ */ public void write(String format) { printIndent(); - pw.println(format); + pw.print(format); + newline(); } /** @@ -69,7 +71,7 @@ public void write(String format, Object... args) { printIndent(); pw.printf(format, args); - pw.println(); + newline(); } private void printIndent() {
diff --git a/user/src/com/google/gwt/user/rebind/StringSourceWriter.java b/user/src/com/google/gwt/user/rebind/StringSourceWriter.java index 78a2cd5..b7f336a 100644 --- a/user/src/com/google/gwt/user/rebind/StringSourceWriter.java +++ b/user/src/com/google/gwt/user/rebind/StringSourceWriter.java
@@ -33,7 +33,7 @@ private final PrintWriter out = new PrintWriter(buffer); public void beginJavaDocComment() { - out.println("/**"); + println("/**"); indent(); indentPrefix = " * "; } @@ -72,7 +72,8 @@ public void println() { maybeIndent(); - out.println(); + // Unix-style line endings for consistent behavior across platforms. + out.print('\n'); needsIndent = true; }