diff --git a/jode/jode/flow/LoopBlock.java b/jode/jode/flow/LoopBlock.java index b23dfdb..a3c8f9c 100644 --- a/jode/jode/flow/LoopBlock.java +++ b/jode/jode/flow/LoopBlock.java @@ -253,15 +253,19 @@ public class LoopBlock extends StructuredBlock implements BreakableBlock { +incr.getInstruction().simplify().toString()+")"); break; } - writer.println( needBrace?" {": ""); + if (needBrace) + writer.openBrace(); + else + writer.println(); writer.tab(); bodyBlock.dumpSource(writer); writer.untab(); - if (type == DOWHILE) - writer.println((needBrace?"} ": "")+ - "while ("+cond.simplify().toString()+");"); - else if (needBrace) - writer.println("}"); + if (type == DOWHILE) { + if (needBrace) + writer.closeBraceContinue(); + writer.println("while ("+cond.simplify().toString()+");"); + } else if (needBrace) + writer.closeBrace(); } diff --git a/jode/jode/flow/SwitchBlock.java b/jode/jode/flow/SwitchBlock.java index 03611ef..eb8b90d 100644 --- a/jode/jode/flow/SwitchBlock.java +++ b/jode/jode/flow/SwitchBlock.java @@ -134,10 +134,11 @@ implements BreakableBlock { writer.println(label+":"); writer.tab(); } - writer.println("switch ("+instr.simplify()+") {"); + writer.print("switch ("+instr.simplify()+")"); + writer.openBrace(); for (int i=0; i < caseBlocks.length; i++) caseBlocks[i].dumpSource(writer); - writer.println("}"); + writer.closeBrace(); } /** diff --git a/jode/jode/flow/SynchronizedBlock.java b/jode/jode/flow/SynchronizedBlock.java index 1bc3b04..7a16951 100644 --- a/jode/jode/flow/SynchronizedBlock.java +++ b/jode/jode/flow/SynchronizedBlock.java @@ -82,14 +82,15 @@ public class SynchronizedBlock extends StructuredBlock { { if (!isEntered) writer.println("MISSING MONITORENTER"); - writer.println("synchronized (" - + (object != null - ? object.simplify().toString() - : local.getName()) + ") {"); + writer.print("synchronized (" + + (object != null + ? object.simplify().toString() + : local.getName()) + ")"); + writer.openBrace(); writer.tab(); bodyBlock.dumpSource(writer); writer.untab(); - writer.println("}"); + writer.closeBrace(); } public boolean doTransformations() { diff --git a/jode/jode/flow/TryBlock.java b/jode/jode/flow/TryBlock.java index c7ce4f9..565ffd6 100644 --- a/jode/jode/flow/TryBlock.java +++ b/jode/jode/flow/TryBlock.java @@ -92,13 +92,14 @@ public class TryBlock extends StructuredBlock { public void dumpInstruction(TabbedPrintWriter writer) throws java.io.IOException { - writer.println("try {"); + writer.print("try"); + writer.openBrace(); writer.tab(); subBlocks[0].dumpSource(writer); writer.untab(); for (int i=1; i