diff --git a/jode/jode/flow/CaseBlock.java b/jode/jode/flow/CaseBlock.java
index c2deeba..06c9470 100644
--- a/jode/jode/flow/CaseBlock.java
+++ b/jode/jode/flow/CaseBlock.java
@@ -131,22 +131,25 @@ public class CaseBlock extends StructuredBlock {
 		&& subBlock instanceof EmptyBlock
 		&& subBlock.jump == null)
 		return;
-	    writer.println("default:" + (wantBraces ? " {" : ""));
+	    writer.print("default:");
 	} else {
             ConstOperator constOp = new ConstOperator
                 (((SwitchBlock)outer).getInstruction().getType(), 
                  Integer.toString(value));
             constOp.makeInitializer();
-	    writer.println("case " + constOp.toString() + ":"
-                           + (wantBraces ? " {" : ""));
+	    writer.print("case " + constOp.toString() + ":");
         }
+	if (wantBraces)
+	    writer.openBrace();
+	else
+	    writer.println();
 	if (subBlock != null) {
 	    writer.tab();
 	    subBlock.dumpSource(writer);
 	    writer.untab();
 	}
         if (wantBraces)
-            writer.println("}");
+            writer.closeBrace();
     }
 
     /**
diff --git a/jode/jode/flow/CatchBlock.java b/jode/jode/flow/CatchBlock.java
index 800e0d9..f64b83f 100644
--- a/jode/jode/flow/CatchBlock.java
+++ b/jode/jode/flow/CatchBlock.java
@@ -104,8 +104,10 @@ public class CatchBlock extends StructuredBlock {
 
     public void dumpInstruction(jode.TabbedPrintWriter writer) 
         throws java.io.IOException {
-        writer.println("} catch ("+exceptionType.toString() + " "
-                       + exceptionLocal.getName().toString()+ ") {");
+	writer.closeBraceContinue();
+        writer.print("catch ("+exceptionType.toString() + " "
+		     + exceptionLocal.getName().toString()+ ")");
+	writer.openBrace();
         writer.tab();
         catchBlock.dumpSource(writer);
         writer.untab();
diff --git a/jode/jode/flow/FinallyBlock.java b/jode/jode/flow/FinallyBlock.java
index 5998ffa..709ad4e 100644
--- a/jode/jode/flow/FinallyBlock.java
+++ b/jode/jode/flow/FinallyBlock.java
@@ -46,7 +46,9 @@ public class FinallyBlock extends CatchBlock {
 
     public void dumpInstruction(jode.TabbedPrintWriter writer) 
         throws java.io.IOException {
-        writer.println("} finally {");
+	writer.closeBraceContinue();
+        writer.print("finally");
+	writer.openBrace();
         writer.tab();
         catchBlock.dumpSource(writer);
         writer.untab();