From c68e14fc054908ae80520af33a946a9c9c83bd70 Mon Sep 17 00:00:00 2001 From: jochen Date: Sun, 7 Feb 1999 19:34:39 +0000 Subject: [PATCH] New braces style git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@206 379699f6-c40d-0410-875b-85095c16579e --- jode/jode/flow/IfThenElseBlock.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/jode/jode/flow/IfThenElseBlock.java b/jode/jode/flow/IfThenElseBlock.java index 611cf56..a38d328 100644 --- a/jode/jode/flow/IfThenElseBlock.java +++ b/jode/jode/flow/IfThenElseBlock.java @@ -97,13 +97,18 @@ public class IfThenElseBlock extends StructuredBlock { throws java.io.IOException { boolean needBrace = thenBlock.needsBraces(); - writer.println("if ("+cond.simplify().toString()+")" - +(needBrace?" {":"")); + writer.print("if ("+cond.simplify().toString()+")"); + if (needBrace) + writer.openBrace(); + else + writer.println(); writer.tab(); thenBlock.dumpSource(writer); writer.untab(); if (elseBlock != null) { - writer.print(needBrace ? "} " : ""); + if (needBrace) + writer.closeBraceContinue(); + if (elseBlock instanceof IfThenElseBlock && (elseBlock.declare == null || elseBlock.declare.isEmpty())) { @@ -112,14 +117,18 @@ public class IfThenElseBlock extends StructuredBlock { elseBlock.dumpSource(writer); } else { needBrace = elseBlock.needsBraces(); - writer.println("else" + (needBrace ? " {" : "")); + writer.print("else"); + if (needBrace) + writer.openBrace(); + else + writer.println(); writer.tab(); elseBlock.dumpSource(writer); writer.untab(); } } if (needBrace) - writer.println("}"); + writer.closeBrace(); } /**