Reviewers: bobv, rjrjr,
Description:
This makes for consistent output across operating systems. In
particular, it makes Windows output unix-style.
Please review this at http://gwt-code-reviews.appspot.com/776803/show
Affected files:
M dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
M user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
M user/src/com/google/gwt/user/rebind/StringSourceWriter.java
Index: dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
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
aa07aed08c8cc3f600af308fd86416e8efc400ef..547121ec8cfd83a65ad2d98a797a5c35d41eb656
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,13 @@ public class StandardGeneratorContext implements
GeneratorContext {
// 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) {
+ @Override
+ public void println() {
+ super.print('\n');
+ super.flush();
+ }
+ };
if (this.genDir == null) {
gcup = new GeneratedUnitImpl(sw, typeName);
} else {
Index: user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
diff --git a/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
b/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
index
08ce64f732bf94674420f48b54eb666fbbe876f4..ae5393639e1ffa906bc91b86bd8f00f5e50777f4
100644
--- a/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
+++ b/user/src/com/google/gwt/uibinder/rebind/IndentedWriter.java
@@ -42,7 +42,7 @@ public class IndentedWriter {
* Outputs a new line.
*/
public void newline() {
- pw.println();
+ pw.print('\n');
}
/**
@@ -60,7 +60,8 @@ public class IndentedWriter {
*/
public void write(String format) {
printIndent();
- pw.println(format);
+ pw.print(format);
+ newline();
}
/**
@@ -69,7 +70,7 @@ public class IndentedWriter {
public void write(String format, Object... args) {
printIndent();
pw.printf(format, args);
- pw.println();
+ newline();
}
private void printIndent() {
Index: user/src/com/google/gwt/user/rebind/StringSourceWriter.java
diff --git a/user/src/com/google/gwt/user/rebind/StringSourceWriter.java
b/user/src/com/google/gwt/user/rebind/StringSourceWriter.java
index
78a2cd5e4fd50bf3eae72ec4c9000ab97f203941..2f4d819a9f8a369c6795bc3d764665f306391d64
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 @@ public class StringSourceWriter implements SourceWriter {
private final PrintWriter out = new PrintWriter(buffer);
public void beginJavaDocComment() {
- out.println("/**");
+ println("/**");
indent();
indentPrefix = " * ";
}
@@ -72,7 +72,7 @@ public class StringSourceWriter implements SourceWriter {
public void println() {
maybeIndent();
- out.println();
+ out.print('\n');
needsIndent = true;
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors