From 32c4bbd575d5b1af47bcc54c27a41dfd3aed5607 Mon Sep 17 00:00:00 2001 From: Honfika Date: Tue, 25 Mar 2014 23:37:40 +0100 Subject: [PATCH] do not create else blocks for "elseif" statements --- .../src/com/jpexs/decompiler/graph/model/IfItem.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java index 078391d9a..80107c21e 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java @@ -91,18 +91,26 @@ public class IfItem extends GraphTargetItem implements Block { } writer.endBlock(); if (elseBranch.size() > 0) { + boolean elseIf = elseBranch.size() == 1 && (elseBranch.get(0) instanceof IfItem); if (writer.getFormatting().beginBlockOnNewLine) { writer.newLine(); } else { writer.append(" "); } - writer.append("else").startBlock(); + writer.append("else"); + if (!elseIf) { + writer.startBlock(); + } else { + writer.append(" "); + } for (GraphTargetItem ti : elseBranch) { if (!ti.isEmpty()) { ti.toStringSemicoloned(writer, localData).newLine(); } } - writer.endBlock(); + if (!elseIf) { + writer.endBlock(); + } } return writer; }