diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java index b1f726942..a56d7ba59 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AVM2Item.java @@ -33,8 +33,6 @@ public abstract class AVM2Item extends GraphTargetItem { super(instruction, precedence); } - public abstract HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData); - public String toStringNoH(LocalData localData) { HilightedTextWriter writer = new HilightedTextWriter(false); toString(writer, localData); @@ -45,7 +43,7 @@ public abstract class AVM2Item extends GraphTargetItem { toString(writer, localData); if (needsSemicolon()) { hilight(";", writer); - }; + } return writer; } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java index 4741d4597..6e9669560 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyLoadAVM2Item.java @@ -37,7 +37,7 @@ public class AlchemyLoadAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("op_" + name + "(", writer); ofs.toString(writer, localData); return hilight(") /*Alchemy*/", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java index ba5f204f0..931985ec9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemySignExtendAVM2Item.java @@ -36,7 +36,7 @@ public class AlchemySignExtendAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("op_" + name + "(", writer); value.toString(writer, localData); return hilight(") /*Alchemy*/", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java index 8e741f40a..7146d7324 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/AlchemyStoreAVM2Item.java @@ -38,7 +38,7 @@ public class AlchemyStoreAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("op_" + name + "(", writer); ofs.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java index eb9d1e46f..5be911b15 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ApplyTypeAVM2Item.java @@ -34,7 +34,7 @@ public class ApplyTypeAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); if (!params.isEmpty()) { hilight(".<", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java index 8750e186e..074ca8082 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/BooleanAVM2Item.java @@ -30,7 +30,7 @@ public class BooleanAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight(value ? "true" : "false", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java index c1b5b3778..492e6a954 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallAVM2Item.java @@ -36,7 +36,7 @@ public class CallAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { /*String recPart = ""; receiver.toString(constants, localRegNames) + hilight(".", writer); if (receiver instanceof NewActivationAVM2Item) { recPart = ""; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java index 56dda16ca..31c21d8fd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallMethodAVM2Item.java @@ -36,7 +36,7 @@ public class CallMethodAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { receiver.toString(writer, localData); hilight(".", writer); hilight(methodName, writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java index 95eab0b6c..d35574b0c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallPropertyAVM2Item.java @@ -38,7 +38,7 @@ public class CallPropertyAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { formatProperty(writer, receiver, propertyName, localData); hilight("(", writer); for (int a = 0; a < arguments.size(); a++) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java index eb7f21579..2b7bfe636 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallStaticAVM2Item.java @@ -36,7 +36,7 @@ public class CallStaticAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { receiver.toString(writer, localData); hilight(".", writer); hilight(methodName, writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java index e67b79e32..e9d0ebb82 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CallSuperAVM2Item.java @@ -38,7 +38,7 @@ public class CallSuperAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!receiver.toString(false, localData).equals("this")) { receiver.toString(writer, localData); hilight(".", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java index 97aba4a43..3daabe9f8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ClassAVM2Item.java @@ -30,7 +30,7 @@ public class ClassAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight(className.getName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java index 1c0baef8a..7e075b3c1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/CoerceAVM2Item.java @@ -35,7 +35,7 @@ public class CoerceAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { //return hilight("("+type+")", highlight)+ return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java index 20348a856..97fd3790a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructAVM2Item.java @@ -34,7 +34,7 @@ public class ConstructAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (object instanceof NewFunctionAVM2Item) { hilight("new ", writer); return object.toString(writer, localData); 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 18d7de00d..b9197f755 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 @@ -36,7 +36,7 @@ public class ConstructPropAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("new ", writer); int idx = writer.getLength(); object.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java index 96deced6a..fe0be0009 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConstructSuperAVM2Item.java @@ -34,7 +34,7 @@ public class ConstructSuperAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!object.toString(false, localData).equals("this")) { object.toString(writer, localData); hilight(".", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java index 85be58903..906521724 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ConvertAVM2Item.java @@ -34,7 +34,7 @@ public class ConvertAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java index 21b4c8ab4..c43d56bf7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecLocalAVM2Item.java @@ -30,7 +30,7 @@ public class DecLocalAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight(localRegName(localData.localRegNames, regIndex), writer); return hilight("--", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java index ec8466832..8a9a7587e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DecrementAVM2Item.java @@ -30,7 +30,7 @@ public class DecrementAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { value.toString(writer, localData); return hilight("-1", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java index c04950b15..62541987a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/DefaultXMLNamespace.java @@ -35,7 +35,7 @@ public class DefaultXMLNamespace extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("default xml namespace = ", writer); return ns.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java index f7193767b..5996a41bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXAttrAVM2Item.java @@ -33,7 +33,7 @@ public class EscapeXAttrAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("{", writer); value.toString(writer, localData); return hilight("}", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java index 3a20bf0a3..c36deb8cb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/EscapeXElemAVM2Item.java @@ -35,7 +35,7 @@ public class EscapeXElemAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("{", writer); expression.toString(writer, localData); return hilight("}", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java index 480821f3e..e7028dc4c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java @@ -35,7 +35,7 @@ public class FilteredCheckAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return object.toString(writer, localData); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java index 50d0de9f7..679b6f9c6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FindPropertyAVM2Item.java @@ -30,7 +30,7 @@ public class FindPropertyAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return writer; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java index 12a4092cc..6187bec17 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FloatValueAVM2Item.java @@ -30,7 +30,7 @@ public class FloatValueAVM2Item extends NumberValueAVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("" + value, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java index 2f5f643c1..43f1b84e2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FullMultinameAVM2Item.java @@ -76,7 +76,7 @@ public class FullMultinameAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (namespace != null) { namespace.toString(writer, localData); hilight("::", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java index 65a81a73d..6448744d6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetDescendantsAVM2Item.java @@ -33,7 +33,7 @@ public class GetDescendantsAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); hilight("..", writer); return multiname.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java index d86aac405..3cf4d70ef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetLexAVM2Item.java @@ -31,7 +31,7 @@ public class GetLexAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight(propertyName.getName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java index 3194bc338..fb0368968 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetPropertyAVM2Item.java @@ -33,7 +33,7 @@ public class GetPropertyAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return formatProperty(writer, object, propertyName, localData); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java index eba0c2bee..17ed747ac 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSlotAVM2Item.java @@ -34,7 +34,7 @@ public class GetSlotAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (slotName == null) { return hilight("/*UnknownSlot*/", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java index 5e76ebfa4..18ab9f888 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/GetSuperAVM2Item.java @@ -33,7 +33,7 @@ public class GetSuperAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!object.toString(false, localData).equals("this")) { object.toString(writer, localData); hilight(".", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java index 7a0b216aa..e9cbacd9f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/HasNextAVM2Item.java @@ -37,7 +37,7 @@ public class HasNextAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { collection.toString(writer, localData); hilight(" hasNext ", writer); return object.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java index 7b1f9c901..cc80c59b2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InAVM2Item.java @@ -33,7 +33,7 @@ public class InAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); hilight(" in ", writer); return collection.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java index db330dac8..865037ef9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncLocalAVM2Item.java @@ -30,7 +30,7 @@ public class IncLocalAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight(localRegName(localData.localRegNames, regIndex), writer); return hilight("++", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java index 399d876ed..c6a0a1cde 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IncrementAVM2Item.java @@ -30,7 +30,7 @@ public class IncrementAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { value.toString(writer, localData); return hilight("+1", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java index c21bb2000..3934743b7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/InitPropertyAVM2Item.java @@ -36,7 +36,7 @@ public class InitPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, A } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { formatProperty(writer, object, propertyName, localData); hilight(" = ", writer); return value.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java index a1bc0f636..f01694413 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/IntegerValueAVM2Item.java @@ -30,7 +30,7 @@ public class IntegerValueAVM2Item extends NumberValueAVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("" + value, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java index 4c0190777..cb7184126 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/LocalRegAVM2Item.java @@ -47,7 +47,7 @@ public class LocalRegAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (computedValue instanceof FilterAVM2Item) { return computedValue.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java index 29f25f216..d7a41053a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameSpaceAVM2Item.java @@ -31,7 +31,7 @@ public class NameSpaceAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (namespaceIndex == 0) { return hilight("*", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java index 24536d3ce..81cb6ea0a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NameValuePair.java @@ -33,7 +33,7 @@ public class NameValuePair extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { name.toString(writer, localData); hilight(":", writer); if (value instanceof TernarOpItem) { //Ternar operator contains ":" diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java index 2dffef6a5..6433b7167 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NanAVM2Item.java @@ -27,7 +27,7 @@ public class NanAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("NaN", writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java index 94ffdd4b0..83db8875a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewActivationAVM2Item.java @@ -31,7 +31,7 @@ public class NewActivationAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("newactivation()", writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java index 10113b16d..a1f243628 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewArrayAVM2Item.java @@ -32,7 +32,7 @@ public class NewArrayAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("[", writer); for (int a = 0; a < values.size(); a++) { if (a > 0) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java index af6a5b02f..d6a55171d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewFunctionAVM2Item.java @@ -40,7 +40,7 @@ public class NewFunctionAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("function" + (!functionName.equals("") ? " " + functionName : ""), writer); boolean highlight = writer.getIsHighlighted(); String mhead = "(" + (highlight ? paramStr : Highlighting.stripHilights(paramStr)) + "):" + (highlight ? returnStr : Highlighting.stripHilights(returnStr)); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java index 457c19a73..6e104815e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NewObjectAVM2Item.java @@ -32,7 +32,7 @@ public class NewObjectAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { boolean singleLine = pairs.size() < 2; if (!singleLine) { writer.appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java index 61895f39b..9a37ad6a8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextNameAVM2Item.java @@ -37,7 +37,7 @@ public class NextNameAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("nextName(", writer); index.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java index bc005f843..24832772d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NextValueAVM2Item.java @@ -37,7 +37,7 @@ public class NextValueAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("nextValue(", writer); index.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java index 848983658..7dbcaff99 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/NullAVM2Item.java @@ -28,7 +28,7 @@ public class NullAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("null", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java index 89c52f796..355c256bd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostDecrementAVM2Item.java @@ -32,7 +32,7 @@ public class PostDecrementAVM2Item extends AVM2Item implements AssignmentAVM2Ite } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); return hilight("--", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java index d437aefd1..9d3197ee0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/PostIncrementAVM2Item.java @@ -32,7 +32,7 @@ public class PostIncrementAVM2Item extends AVM2Item implements AssignmentAVM2Ite } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); return hilight("++", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java index 0c95d24bd..d87a28bae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnValueAVM2Item.java @@ -31,7 +31,7 @@ public class ReturnValueAVM2Item extends AVM2Item implements ExitItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("return ", writer); return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java index bd3deea53..7ef674af5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ReturnVoidAVM2Item.java @@ -28,7 +28,7 @@ public class ReturnVoidAVM2Item extends AVM2Item implements ExitItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("return", writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java index 09511b505..f674f1e49 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ScriptAVM2Item.java @@ -33,7 +33,7 @@ public class ScriptAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("script" + scriptIndex, writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java index 8462e7497..299517cbc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetGlobalSlotAVM2Item.java @@ -39,7 +39,7 @@ public class SetGlobalSlotAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("setglobalslot(" + slotId + ",", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java index e065ab053..ff59cc711 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetLocalAVM2Item.java @@ -34,7 +34,7 @@ public class SetLocalAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assig } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight(localRegName(localData.localRegNames, regIndex) + " = ", writer); return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java index dac8888f8..b7f6ff127 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetPropertyAVM2Item.java @@ -42,7 +42,7 @@ public class SetPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, As } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { formatProperty(writer, object, propertyName, localData); hilight(" = ", writer); return value.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java index 9d98d643e..30aa663d8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSlotAVM2Item.java @@ -43,7 +43,7 @@ public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assign } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { getName(writer, localData); hilight(" = ", writer); return value.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java index 44aa9295f..041a3e54e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/SetSuperAVM2Item.java @@ -41,7 +41,7 @@ public class SetSuperAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!object.toString(false, localData).equals("this")) { object.toString(writer, localData); hilight(".", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java index 850b905e8..114c58333 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/StringAVM2Item.java @@ -31,7 +31,7 @@ public class StringAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("\"" + Helper.escapeString(value) + "\"", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java index 469330e60..905221c7c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThisAVM2Item.java @@ -30,7 +30,7 @@ public class ThisAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("this", writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java index 58c153db8..76703560e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/ThrowAVM2Item.java @@ -30,7 +30,7 @@ public class ThrowAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("throw ", writer); return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java index 32c64f27c..1ef4ce5d4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UndefinedAVM2Item.java @@ -28,7 +28,7 @@ public class UndefinedAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("undefined", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java index 244117610..7a7b6a9e5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/UnparsedAVM2Item.java @@ -30,7 +30,7 @@ public class UnparsedAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight(value, writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java index a8029520e..2f02b5d62 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithAVM2Item.java @@ -42,7 +42,7 @@ public class WithAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("with(", writer); scope.toString(writer, localData); hilight(")", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java index 076ef7ced..97fbe7a2a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithEndAVM2Item.java @@ -31,7 +31,7 @@ public class WithEndAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("}", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java index 450475811..625925a61 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/WithObjectAVM2Item.java @@ -31,7 +31,7 @@ public class WithObjectAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return writer; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java index 40ea90ae9..ce885d683 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/XMLAVM2Item.java @@ -36,7 +36,7 @@ public class XMLAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { for (GraphTargetItem part : parts) { if (part instanceof StringAVM2Item) { hilight(((StringAVM2Item) part).value, writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java index be0c2c517..3c36a9574 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/DeclarationAVM2Item.java @@ -45,7 +45,7 @@ public class DeclarationAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (assignment instanceof SetLocalAVM2Item) { SetLocalAVM2Item lti = (SetLocalAVM2Item) assignment; String type = "*"; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java index db57a02b5..1ef06e707 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ExceptionAVM2Item.java @@ -31,7 +31,7 @@ public class ExceptionAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight(exception.getVarName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java index 11c818d12..9710f2bac 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/FilterAVM2Item.java @@ -38,7 +38,7 @@ public class FilterAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { collection.toString(writer, localData); hilight(".(", writer); expression.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java index 0d29c282a..301b42674 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java @@ -70,7 +70,7 @@ public class ForEachInAVM2Item extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("for each (", writer); expression.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java index 775cd56c9..2a1eb60a3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java @@ -70,7 +70,7 @@ public class ForInAVM2Item extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("for (", writer); expression.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java index 3d1c62bd8..89d14c014 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java @@ -52,7 +52,7 @@ public class TryAVM2Item extends AVM2Item implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("try", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java index dd4532f4d..cc1a44f72 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AddAVM2Item.java @@ -31,7 +31,7 @@ public class AddAVM2Item extends BinaryOpItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (rightSide.precedence >= precedence) { //string + vs number + if (leftSide.precedence > precedence) { hilight("(", writer); @@ -48,7 +48,7 @@ public class AddAVM2Item extends BinaryOpItem { rightSide.toString(writer, localData); return hilight(")", writer); } else { - return super.toString(writer, localData); + return super.appendTo(writer, localData); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java index a49675bcf..7875d98c6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DeletePropertyAVM2Item.java @@ -35,7 +35,7 @@ public class DeletePropertyAVM2Item extends AVM2Item { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("delete ", writer); object.toString(writer, localData); hilight("[", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java index ca7bdbc04..4db2d38ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/SubtractAVM2Item.java @@ -35,7 +35,7 @@ public class SubtractAVM2Item extends BinaryOpItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (rightSide.precedence >= precedence) { // >= add or subtract too if (leftSide.precedence > precedence) { hilight("(", writer); @@ -52,7 +52,7 @@ public class SubtractAVM2Item extends BinaryOpItem { rightSide.toString(writer, localData); return hilight(")", writer); } else { - return super.toString(writer, localData); + return super.appendTo(writer, localData); } } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java index 27a31cb36..a299b9f4b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java @@ -37,8 +37,6 @@ public abstract class ActionItem extends GraphTargetItem implements Serializable super(instruction, precedence); } - public abstract HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData); - protected boolean isEmptyString(GraphTargetItem target) { if (target instanceof DirectValueActionItem) { if (((DirectValueActionItem) target).value instanceof String) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java index 4f1eb0808..065182802 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java @@ -33,7 +33,7 @@ public class AsciiToCharActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("chr(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java index 88a9a8061..f0eceb5b9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java @@ -33,7 +33,7 @@ public class CallActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("call(", writer); stripQuotes(value, localData, writer); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java index a6b8dccb6..e260a4763 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java @@ -43,7 +43,7 @@ public class CallFunctionActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String paramStr = ""; stripQuotes(functionName, localData, writer); hilight("(", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java index e168315af..9301ed6b3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -49,7 +49,7 @@ public class CallMethodActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { boolean blankMethod = false; if (methodName instanceof DirectValueActionItem) { if (((DirectValueActionItem) methodName).value instanceof Undefined) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java index c46c71930..b1ff9b051 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java @@ -46,7 +46,7 @@ public class CastOpActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("(", writer); stripQuotes(constructor, localData, writer); hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java index f186f1bbc..372cbb187 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java @@ -33,7 +33,7 @@ public class CharToAsciiActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("ord(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java index 3c36fdc50..4c06f854e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java @@ -49,7 +49,7 @@ public class CloneSpriteActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("duplicateMovieClip(", writer); target.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java index 062bad8e4..4d0ae4930 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java @@ -44,7 +44,7 @@ public class DecrementActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); return hilight(" - 1", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java index a32248cb9..6e826b02e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java @@ -70,7 +70,7 @@ public class DefineLocalActionItem extends ActionItem implements SetTypeActionIt } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("var ", writer); stripQuotes(name, localData, writer); if (value == null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java index fc7db8d94..385134dc7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java @@ -35,7 +35,7 @@ public class DefineRegisterActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("var " + identifier, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java index 3d9027507..8ba574635 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java @@ -46,7 +46,7 @@ public class DeleteActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("delete ", writer); if (object == null) { return propertyName.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java index a732b2f90..dfae5fbfd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java @@ -128,7 +128,7 @@ public class DirectValueActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { return hilight("0", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java index f14a3f275..c493f1084 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java @@ -41,7 +41,7 @@ public class EnumerateActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("enumerate ", writer); return object.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java index 13d1c688e..98824e4ef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java @@ -36,7 +36,7 @@ public class EvalActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("eval(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java index f71236d31..e60fd1b56 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java @@ -35,7 +35,7 @@ public class ExtendsActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { subclass.toString(writer, localData); hilight(" extends ", writer); return stripQuotes(superclass, localData, writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java index 30b12fd69..8d95b11fc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java @@ -48,7 +48,7 @@ public class FSCommand2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("FSCommand2(", writer); command.toString(writer, localData); for (int t = 0; t < arguments.size(); t++) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java index c8018e4cd..f2ee5ee3b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -38,7 +38,7 @@ public class FSCommandActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("fscommand(\"", writer); hilight(Helper.escapeString(command), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java index e569d179b..45f153d06 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -73,7 +73,7 @@ public class FunctionActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (true) { //return writer.appendNoHilight("") } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java index 6911b1a26..68a09af76 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java @@ -45,7 +45,7 @@ public class GetMemberActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!((memberName instanceof DirectValueActionItem) && (((DirectValueActionItem) memberName).value instanceof String))) { //if(!(functionName instanceof GetVariableActionItem)) object.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java index cb517d363..7b89098ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java @@ -47,7 +47,7 @@ public class GetPropertyActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (isEmptyString(target)) { return hilight(Action.propertyNames[propertyIndex], writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java index 48ac1dfb5..f302b3243 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java @@ -31,7 +31,7 @@ public class GetTimeActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("getTimer()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java index 9161ef04c..dba1d10d5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java @@ -41,7 +41,7 @@ public class GetURL2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (sendVarsMethod == 1) { methodStr = ",\"GET\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java index 1c2870649..bfb6292dd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -30,7 +30,7 @@ public class GetURLActionItem extends ActionItem { public String targetString; @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("getUrl(\"", writer); hilight(Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java index db7ca8303..7711d898b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java @@ -48,7 +48,7 @@ public class GetVariableActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return stripQuotes(name, localData, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java index 7e67a449c..3f30a6356 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java @@ -35,7 +35,7 @@ public class GetVersionActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("getVersion()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java index d40b95894..18c6397c7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java @@ -49,7 +49,7 @@ public class GotoFrame2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String prefix = "gotoAndStop"; if (playFlag) { prefix = "gotoAndPlay"; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java index a630ab936..e5283bdde 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java @@ -33,7 +33,7 @@ public class GotoFrameActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("gotoAndStop(", writer); hilight("" + (frame + 1), writer); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java index 8b3bd5e2c..a2b662184 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java @@ -34,7 +34,7 @@ public class GotoLabelActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("gotoAndStop(\"", writer); hilight(Helper.escapeString(label), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java index 4b89af851..d572bcae1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java @@ -35,7 +35,7 @@ public class ImplementsOpActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { subclass.toString(writer, localData); hilight(" implements ", writer); for (int i = 0; i < superclasses.size(); i++) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java index 81def81f7..5b3399edf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java @@ -44,7 +44,7 @@ public class IncrementActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); return hilight(" + 1", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java index 84cc1b6f2..5793c8ec3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java @@ -43,7 +43,7 @@ public class InitArrayActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("[", writer); for (int i = 0; i < values.size(); i++) { if (i > 0) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java index 32ef99f13..7d09ab46a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java @@ -47,7 +47,7 @@ public class InitObjectActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("{", writer); for (int i = 0; i < values.size(); i++) { if (i > 0) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java index 44661d60f..f21ae27a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java @@ -51,7 +51,7 @@ public class LoadMovieActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java index 762aaf8af..447325d35 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java @@ -53,7 +53,7 @@ public class LoadMovieNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java index 1a4afd8a8..fed262a5a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java @@ -51,7 +51,7 @@ public class LoadVariablesActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java index b8c28f33b..474e62cc7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java @@ -53,7 +53,7 @@ public class LoadVariablesNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String methodStr = ""; if (method == 1) { methodStr = ",\"GET\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java index 2b5afc70a..e1c2f10db 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java @@ -33,7 +33,7 @@ public class MBAsciiToCharActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("mbchr(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java index 5d6e46a29..e09f55d32 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java @@ -33,7 +33,7 @@ public class MBCharToAsciiActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("mbord(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java index 4f7f9e402..fdf09acdc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java @@ -49,7 +49,7 @@ public class MBStringExtractActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("mbsubstring(", writer); value.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java index ff1e7fb38..8da71276d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java @@ -34,7 +34,7 @@ public class MBStringLengthActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("mblength(", writer); if (value.precedence > precedence) { hilight("(", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java index 5d3bf3193..bd5f85077 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java @@ -49,7 +49,7 @@ public class NewMethodActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { boolean blankMethod = false; if (methodName instanceof DirectValueActionItem) { if (((DirectValueActionItem) methodName).value instanceof Undefined) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java index b669370ea..a17b4971b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java @@ -46,7 +46,7 @@ public class NewObjectActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("new ", writer); stripQuotes(objectName, localData, writer); hilight("(", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java index 94c13fce9..0487c1926 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class NextFrameActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("nextFrame()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java index 229ae828c..325ba44a0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class PlayActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("play()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java index 5eff5e3d9..446a73cc5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PopActionItem.java @@ -34,7 +34,7 @@ public class PopActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return writer; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java index f255170e7..f2d637416 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java @@ -51,7 +51,7 @@ public class PostDecrementActionItem extends ActionItem implements SetTypeAction } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); return hilight("--", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java index 591798f47..19f625385 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java @@ -51,7 +51,7 @@ public class PostIncrementActionItem extends ActionItem implements SetTypeAction } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); return hilight("++", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java index c2806a671..258dea499 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class PrevFrameActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("prevFrame()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java index 325395d30..5b53ad28c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java @@ -51,7 +51,7 @@ public class PrintActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("print(", writer); target.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java index 4aea4e215..610406369 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java @@ -51,7 +51,7 @@ public class PrintAsBitmapActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("printAsBitmap(", writer); target.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java index b11b93046..f8dcf1dac 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java @@ -51,7 +51,7 @@ public class PrintAsBitmapNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("printAsBitmapNum(", writer); num.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java index c8334a8b3..107b1164f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java @@ -51,7 +51,7 @@ public class PrintNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("printNum(", writer); num.toString(writer, localData); hilight(",", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java index 5ae5e6e02..8ad79ac76 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java @@ -33,7 +33,7 @@ public class RandomNumberActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("random(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java index 52b07b3b9..41ca3ce3a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java @@ -33,7 +33,7 @@ public class RemoveSpriteActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("removeMovieClip(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java index 23fe26456..d7de50d5f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java @@ -45,7 +45,7 @@ public class ReturnActionItem extends ActionItem implements ExitItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("return ", writer); return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java index ec9a646ab..e139b7e11 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java @@ -79,7 +79,7 @@ public class SetMemberActionItem extends ActionItem implements SetTypeActionItem } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!((objectName instanceof DirectValueActionItem) && (((DirectValueActionItem) objectName).value instanceof String))) { //if(!(functionName instanceof GetVariableActionItem)) object.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java index e2a244b5e..c2fccc3a8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java @@ -71,7 +71,7 @@ public class SetPropertyActionItem extends ActionItem implements SetTypeActionIt } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (isEmptyString(target)) { hilight(Action.propertyNames[propertyIndex] + " = ", writer); return value.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java index 2ace40c6b..7ba9b75ca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java @@ -34,7 +34,7 @@ public class SetTarget2ActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("tellTarget(", writer); target.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java index 3b30b9bf8..4d48ffe58 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java @@ -33,7 +33,7 @@ public class SetTargetActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("tellTarget(\"", writer); hilight(Helper.escapeString(target), writer); return hilight("\")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java index 41aa221b3..5ad9e6ac3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java @@ -68,7 +68,7 @@ public class SetVariableActionItem extends ActionItem implements SetTypeActionIt } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (name instanceof DirectValueActionItem || name instanceof GetVariableActionItem) { stripQuotes(name, localData, writer); hilight(" = ", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java index de03b7d66..249b6690b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java @@ -48,7 +48,7 @@ public class StartDragActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { boolean hasConstrains = true; if (constrain instanceof DirectValueActionItem) { if (Double.compare(EcmaScript.toNumber(constrain.getResult()), 0) == 0) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java index be04d4f94..d45dd7d7f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class StopActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("stop()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java index 0de087f66..0ca39bef5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class StopAllSoundsActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("stopAllSounds()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java index 4008f654a..c90c51340 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class StopDragActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("stopDrag()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java index 79db9db74..59b5d35e4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java @@ -68,7 +68,7 @@ public class StoreRegisterActionItem extends ActionItem implements SetTypeAction } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (temporary) { value.toString(writer, localData); } else { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java index a6ccc5b43..bb120a2e2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java @@ -30,7 +30,7 @@ public class StrictModeActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("StrictMode(" + mode + ");", writer); //I still don't know how AS source of Strict Mode instruction looks like, assuming this... } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java index bf97d4790..2ea261d1a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java @@ -39,7 +39,7 @@ public class StringExtractActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { value.toString(writer, localData); hilight(".substr(", writer); index.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java index 3f3c09d3e..19f560f94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java @@ -33,7 +33,7 @@ public class StringLengthActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("length(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java index e8260b488..527e4419e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java @@ -33,7 +33,7 @@ public class TargetPathActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("targetPath(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java index e301b843a..cc453b9c2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TemporaryRegister.java @@ -46,7 +46,7 @@ public class TemporaryRegister extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java index db11f5ddf..4535871bd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java @@ -33,7 +33,7 @@ public class ThrowActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("throw ", writer); return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java index bf4613848..eae580a58 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java @@ -33,7 +33,7 @@ public class ToIntegerActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("int(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java index 2d582ab2f..2c1a49cb8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java @@ -33,7 +33,7 @@ public class ToNumberActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("Number(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java index 6e158c6b9..ec5dbde6f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java @@ -33,7 +33,7 @@ public class ToStringActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("String(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java index a34f63d92..ac43b6fb2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java @@ -26,7 +26,7 @@ import java.util.List; public class ToggleHighQualityActionItem extends ActionItem { @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("toggleHighQuality()", writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java index e90e136f5..21199c62e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java @@ -33,7 +33,7 @@ public class TraceActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("trace(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java index 0e8a62566..dbdc42c92 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java @@ -35,7 +35,7 @@ public class TypeOfActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("typeof(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java index 7ea3c2099..4448f187f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java @@ -47,7 +47,7 @@ public class UnLoadMovieActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("unloadMovie(", writer); targetString.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java index 9f1f085ff..1b3bc5824 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -49,7 +49,7 @@ public class UnLoadMovieNumActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("unloadMovieNum(", writer); num.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java index 527d40de9..6c4ec2675 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java @@ -30,7 +30,7 @@ public class UnsupportedActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("//Unsupported by decompiler:" + value, writer); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java index 14bb75f20..8fb92ff4e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java @@ -156,7 +156,7 @@ public class ClassActionItem extends ActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("class ", writer); className.toStringNoQuotes(writer, localData); if (extendsOp != null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java index a3bcfac51..4fc464e3d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java @@ -64,7 +64,7 @@ public class ForInActionItem extends LoopActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("for(", writer); if ((variableName instanceof DirectValueActionItem) && (((DirectValueActionItem) variableName).value instanceof RegisterNumber)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java index 53ad23f12..66807db39 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java @@ -45,7 +45,7 @@ public class IfFrameLoadedActionItem extends ActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("ifFrameLoaded(", writer); frame.toString(writer, localData); hilight(")", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java index b9242b1a5..0bbd3f439 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java @@ -43,7 +43,7 @@ public class InterfaceActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("interface ", writer); name.toStringNoQuotes(writer, localData); boolean first = true; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java index 5abb86176..1293e616d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java @@ -41,7 +41,7 @@ public class TellTargetActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("tellTarget(", writer); target.toString(writer, localData); hilight(")", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java index 4a116cfbc..e8ebfb143 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java @@ -59,7 +59,7 @@ public class TryActionItem extends ActionItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("try", writer).appendNewLine(); hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java index f9a9de1b3..964b67789 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/clauses/WithActionItem.java @@ -47,7 +47,7 @@ public class WithActionItem extends ActionItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String ret; hilight("with(", writer); scope.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java index 9b6b31d2f..73683b182 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AddActionItem.java @@ -37,7 +37,7 @@ public class AddActionItem extends BinaryOpItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (rightSide.precedence >= precedence) { //string + vs number + String ret = ""; if (leftSide.precedence > precedence) { @@ -54,7 +54,7 @@ public class AddActionItem extends BinaryOpItem { rightSide.toString(writer, localData); return hilight(")", writer); } else { - return super.toString(writer, localData); + return super.appendTo(writer, localData); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java index 8b7b4b222..2a2d6a921 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/SubtractActionItem.java @@ -38,7 +38,7 @@ public class SubtractActionItem extends BinaryOpItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (rightSide.precedence >= precedence) { // >= add or subtract too String ret = ""; if (leftSide.precedence > precedence) { @@ -56,7 +56,7 @@ public class SubtractActionItem extends BinaryOpItem { rightSide.toString(writer, localData); return hilight(")", writer); } else { - return super.toString(writer, localData); + return super.appendTo(writer, localData); } } diff --git a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java index 9f97c7d6f..a82b85d7f 100644 --- a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java @@ -104,8 +104,12 @@ public abstract class GraphTargetItem implements Serializable { return this.getClass().getName(); } - public abstract HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData); + public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + return appendTo(writer, localData); + } + protected abstract HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData); + public String toString(boolean highlight, LocalData localData) { HilightedTextWriter writer = new HilightedTextWriter(highlight); toString(writer, localData); @@ -161,8 +165,12 @@ public abstract class GraphTargetItem implements Serializable { return false; } - public String toStringNL(HilightedTextWriter writer, LocalData localData) { - return toString(writer, localData) + (needsNewLine() ? "\r\n" : ""); + public HilightedTextWriter toStringNL(HilightedTextWriter writer, LocalData localData) { + toString(writer, localData); + if (needsNewLine()) { + writer.appendNewLine(); + } + return writer; } public boolean isEmpty() { diff --git a/trunk/src/com/jpexs/decompiler/graph/MarkItem.java b/trunk/src/com/jpexs/decompiler/graph/MarkItem.java index 3a064e144..7b1a0f9e9 100644 --- a/trunk/src/com/jpexs/decompiler/graph/MarkItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/MarkItem.java @@ -33,7 +33,7 @@ public class MarkItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("//decompiler mark:" + mark, writer); } diff --git a/trunk/src/com/jpexs/decompiler/graph/NotCompileTimeItem.java b/trunk/src/com/jpexs/decompiler/graph/NotCompileTimeItem.java index 6306ea3ed..cc3099b8b 100644 --- a/trunk/src/com/jpexs/decompiler/graph/NotCompileTimeItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/NotCompileTimeItem.java @@ -46,7 +46,7 @@ public class NotCompileTimeItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return object.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java index d53833a8f..e0f57226c 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java @@ -47,7 +47,7 @@ public abstract class BinaryOpItem extends GraphTargetItem implements BinaryOp { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (leftSide.getPrecedence() > precedence) { hilight("(", writer); leftSide.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java index 8f2681770..9c78f8f9a 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java @@ -37,7 +37,7 @@ public class BlockItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("{", writer).appendNewLine(); hilight(Graph.INDENTOPEN, writer).appendNewLine(); writer.appendNoHilight(Graph.graphToString(commands, writer.getIsHighlighted(), false, localData)); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java index fc5075f29..384b37941 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java @@ -20,7 +20,7 @@ public class BreakItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("break ", writer); return hilight("loop" + loopId, writer); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java b/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java index f7688be42..40179dc4a 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java @@ -36,7 +36,7 @@ public class CommaExpressionItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { boolean first = true; for (GraphTargetItem t : commands) { if (!first) { diff --git a/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java b/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java index 468c85fa8..c37832344 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java @@ -33,7 +33,7 @@ public class CommentItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("/* " + comment + " */", writer); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java index fac6321ad..618277c04 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java @@ -20,7 +20,7 @@ public class ContinueItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("continue ", writer); return hilight("loop" + loopId, writer); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java index 06f89d4da..2bd8b8838 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java @@ -50,7 +50,7 @@ public class DoWhileItem extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("do", writer).appendNewLine(); hilight("{", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java index 8a9d26439..f22de66f1 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DuplicateItem.java @@ -39,7 +39,7 @@ public class DuplicateItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return value.toString(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java index f1f8af1ba..dafb647de 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java @@ -51,7 +51,7 @@ public class ForItem extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("for(", writer); int p = 0; diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java index e19073f4d..754aa2570 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java @@ -52,7 +52,7 @@ public class IfItem extends GraphTargetItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { GraphTargetItem expr = expression; List ifBranch = onTrue; List elseBranch = onFalse; diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java index 6c02f1a83..0a50ec898 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java @@ -34,7 +34,7 @@ public class IntegerValueItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("" + intValue, writer); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java index 65f3c903f..b84ae7e87 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java @@ -34,7 +34,7 @@ public class ParenthesisItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("(", writer); value.toString(writer, localData); return hilight(")", writer); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java index d57f7a7ec..f1bfd1a0f 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ScriptEndItem.java @@ -30,7 +30,7 @@ public class ScriptEndItem extends GraphTargetItem implements ExitItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java index 9ba9d1b74..4a52b7c18 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java @@ -52,7 +52,7 @@ public class SwitchItem extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loopswitch" + loop.id + ":", writer).appendNewLine(); hilight("switch(", writer); switchedObject.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java index b2020e26f..11cb57533 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java @@ -36,7 +36,7 @@ public class TernarOpItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { expression.toString(writer, localData); hilight("?", writer); onTrue.toString(writer, localData); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java index 48b6ff5da..adf7f8a94 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java @@ -15,7 +15,7 @@ public class TrueItem extends GraphTargetItem { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { return hilight("true", writer); } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java index b63e4a175..30ef4983e 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java @@ -34,7 +34,7 @@ public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight(operator, writer); if (value != null) { if (value.precedence > precedence) { diff --git a/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java index b7acdd5b5..baf78d90b 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java @@ -38,7 +38,7 @@ public class UniversalLoopItem extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("while(true)", writer).appendNewLine(); hilight("{", writer).appendNewLine(); diff --git a/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java index 0ad451a3c..104791901 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java @@ -45,7 +45,7 @@ public class WhileItem extends LoopItem implements Block { } @Override - public HilightedTextWriter toString(HilightedTextWriter writer, LocalData localData) { + protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { hilight("loop" + loop.id + ":", writer).appendNewLine(); hilight("while(", writer); for (int i = 0; i < expression.size(); i++) {