archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6867671: javap whitespace formatting issues

Browse source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2009-08-04 17:26:41 -07:00
parent 2437247a8d
commit 22c0a5cddf
7 changed files with 297 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

54
langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java
View file

@ -71,6 +71,18 @@ public class BasicWriter {
lineWriter.println();
}
protected void indent(int delta) {
lineWriter.indent(delta);
}
protected void tab() {
lineWriter.tab();
}
protected void setPendingNewline(boolean b) {
lineWriter.pendingNewline = b;
}
protected String report(AttributeException e) {
out.println("Error: " + e.getMessage()); // i18n?
return "???";
@ -122,19 +134,30 @@ public class BasicWriter {
protected LineWriter(Context context) {
context.put(LineWriter.class, this);
Options options = Options.instance(context);
indentWidth = options.indentWidth;
tabColumn = options.tabColumn;
out = context.get(PrintWriter.class);
buffer = new StringBuilder();
}
protected void print(String s) {
if (pendingNewline) {
println();
pendingNewline = false;
}
if (s == null)
s = "null";
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if (c == '\n') {
println();
} else {
buffer.append(c);
switch (c) {
case '\n':
println();
break;
default:
if (buffer.length() == 0)
indent();
buffer.append(c);
}
}
@ -145,8 +168,31 @@ public class BasicWriter {
buffer.setLength(0);
}
protected void indent(int delta) {
indentCount += delta;
}
protected void tab() {
if (buffer.length() == 0)
indent();
space(indentCount * indentWidth + tabColumn - buffer.length());
}
private void indent() {
space(indentCount * indentWidth);
}
private void space(int n) {
for (int i = 0; i < n; i++)
buffer.append(' ');
}
private PrintWriter out;
private StringBuilder buffer;
private int indentCount;
private int indentWidth;
private int tabColumn;
private boolean pendingNewline;
}
}