diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java index 01740f961..bfc963834 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructPropAVM2Item.java @@ -41,7 +41,7 @@ public class ConstructPropAVM2Item extends AVM2Item { hilight("new ", writer); int idx = writer.getLength(); object.toString(writer, constants, localRegNames, fullyQualifiedNames); - if (idx > writer.getLength()) { + if (idx < writer.getLength()) { hilight(".", writer); } propertyName.toString(writer, constants, localRegNames, fullyQualifiedNames); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java index 06dad3558..7d699a251 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java @@ -81,18 +81,20 @@ public class IfItem extends GraphTargetItem implements Block { ti.toStringSemicoloned(writer, localData).appendNewLine(); } } - hilight(Graph.INDENTCLOSE + "\r\n", writer); + hilight(Graph.INDENTCLOSE, writer).appendNewLine(); hilight("}", writer); if (elseBranch.size() > 0) { - hilight("\r\nelse\r\n", writer); - hilight("{\r\n" + Graph.INDENTOPEN + "\r\n", writer); + writer.appendNewLine(); + hilight("else", writer).appendNewLine(); + hilight("{", writer).appendNewLine(); + hilight(Graph.INDENTOPEN, writer).appendNewLine(); for (GraphTargetItem ti : elseBranch) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData); - hilight("\r\n", writer); + ti.toStringSemicoloned(writer, localData).appendNewLine(); } } - hilight(Graph.INDENTCLOSE + "\r\n}", writer); + hilight(Graph.INDENTCLOSE, writer).appendNewLine(); + hilight("}", writer); } return writer; }