From 4aa87128e70b5bd36a85c60219adcea235035efb Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Sat, 11 Dec 2010 12:59:42 +0100
Subject: [PATCH] fix parens on ops and prettified multiple case labels

---
 .../antlr3/src/cs2j/bin/Debug/templates/java.stg            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg b/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg
index 3c7982e..5b677b5 100644
--- a/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg
+++ b/CSharpTranslator/antlr3/src/cs2j/bin/Debug/templates/java.stg
@@ -179,7 +179,7 @@ switch(<scrutinee>)
 >>
 
 switch_section(labels,statements) ::= <<
-<labels>
+<labels; separator="\n">
     <statements; separator="\n">
 
 >>
@@ -234,9 +234,9 @@ void() ::= "void"
 optparens(parens, e) ::= "<if(parens)>(<endif><e><if(parens)>)<endif>"
 parens(e) ::= "(<e>)"
 rank_specifiers(rs) ::= "<rs>"
-op(comments,pre,op,post,mkparen,space) ::= <<
+op(comments,pre,op,post,preparen,postparen,space) ::= <<
 <comments; separator="\n">
-<if(mkparen)>(<endif><if(pre)><pre><space><endif><op><if(post)><space><post><endif><if(mkparen)>)<endif>
+<if(pre)><if(preparen)>(<endif><pre><if(preparen)>)<endif><space><endif><op><if(post)><space><if(postparen)>(<endif><post><if(postparen)>)<endif><endif>
 >>
 assign(lhs,lhsparen,assign,rhs,rhsparen) ::= "<if(lhsparen)>(<endif><lhs><if(lhsparen)>)<endif> <assign> <if(rhsparen)>(<endif><rhs><if(rhsparen)>)<endif>"
 generic_args(args) ::= "\<<args>\>"