From f325ba0db7a268749ea28d1b1efbb70c6c77e78c Mon Sep 17 00:00:00 2001 From: Honfika Date: Sun, 13 Oct 2013 17:08:51 +0200 Subject: [PATCH] highlight method removed, indent-unindents --- .../decompiler/flash/abc/avm2/AVM2Code.java | 2 +- .../decompiler/flash/abc/avm2/CodeStats.java | 4 +- .../flash/abc/avm2/model/AVM2Item.java | 10 ++--- .../abc/avm2/model/AlchemyLoadAVM2Item.java | 4 +- .../avm2/model/AlchemySignExtendAVM2Item.java | 4 +- .../abc/avm2/model/AlchemyStoreAVM2Item.java | 6 +-- .../abc/avm2/model/ApplyTypeAVM2Item.java | 8 ++-- .../flash/abc/avm2/model/BooleanAVM2Item.java | 2 +- .../flash/abc/avm2/model/CallAVM2Item.java | 12 ++--- .../abc/avm2/model/CallMethodAVM2Item.java | 10 ++--- .../abc/avm2/model/CallPropertyAVM2Item.java | 6 +-- .../abc/avm2/model/CallStaticAVM2Item.java | 10 ++--- .../abc/avm2/model/CallSuperAVM2Item.java | 10 ++--- .../flash/abc/avm2/model/ClassAVM2Item.java | 2 +- .../abc/avm2/model/ConstructAVM2Item.java | 10 ++--- .../abc/avm2/model/ConstructPropAVM2Item.java | 10 ++--- .../avm2/model/ConstructSuperAVM2Item.java | 8 ++-- .../abc/avm2/model/DecLocalAVM2Item.java | 4 +- .../abc/avm2/model/DecrementAVM2Item.java | 2 +- .../abc/avm2/model/DefaultXMLNamespace.java | 2 +- .../abc/avm2/model/EscapeXAttrAVM2Item.java | 4 +- .../abc/avm2/model/EscapeXElemAVM2Item.java | 4 +- .../abc/avm2/model/FloatValueAVM2Item.java | 2 +- .../abc/avm2/model/FullMultinameAVM2Item.java | 8 ++-- .../avm2/model/GetDescendantsAVM2Item.java | 2 +- .../flash/abc/avm2/model/GetLexAVM2Item.java | 2 +- .../flash/abc/avm2/model/GetSlotAVM2Item.java | 4 +- .../abc/avm2/model/GetSuperAVM2Item.java | 4 +- .../flash/abc/avm2/model/HasNextAVM2Item.java | 2 +- .../flash/abc/avm2/model/InAVM2Item.java | 2 +- .../abc/avm2/model/IncLocalAVM2Item.java | 4 +- .../abc/avm2/model/IncrementAVM2Item.java | 2 +- .../abc/avm2/model/InitPropertyAVM2Item.java | 2 +- .../abc/avm2/model/IntegerValueAVM2Item.java | 2 +- .../abc/avm2/model/LocalRegAVM2Item.java | 2 +- .../abc/avm2/model/NameSpaceAVM2Item.java | 4 +- .../flash/abc/avm2/model/NameValuePair.java | 6 +-- .../flash/abc/avm2/model/NanAVM2Item.java | 2 +- .../abc/avm2/model/NewActivationAVM2Item.java | 2 +- .../abc/avm2/model/NewArrayAVM2Item.java | 6 +-- .../abc/avm2/model/NewFunctionAVM2Item.java | 14 +++--- .../abc/avm2/model/NewObjectAVM2Item.java | 22 +++++----- .../abc/avm2/model/NextNameAVM2Item.java | 6 +-- .../abc/avm2/model/NextValueAVM2Item.java | 6 +-- .../flash/abc/avm2/model/NullAVM2Item.java | 2 +- .../abc/avm2/model/PostDecrementAVM2Item.java | 2 +- .../abc/avm2/model/PostIncrementAVM2Item.java | 2 +- .../abc/avm2/model/ReturnValueAVM2Item.java | 2 +- .../abc/avm2/model/ReturnVoidAVM2Item.java | 2 +- .../flash/abc/avm2/model/ScriptAVM2Item.java | 2 +- .../abc/avm2/model/SetGlobalSlotAVM2Item.java | 4 +- .../abc/avm2/model/SetLocalAVM2Item.java | 2 +- .../abc/avm2/model/SetPropertyAVM2Item.java | 2 +- .../flash/abc/avm2/model/SetSlotAVM2Item.java | 6 +-- .../abc/avm2/model/SetSuperAVM2Item.java | 6 +-- .../flash/abc/avm2/model/StringAVM2Item.java | 2 +- .../flash/abc/avm2/model/ThisAVM2Item.java | 2 +- .../flash/abc/avm2/model/ThrowAVM2Item.java | 2 +- .../abc/avm2/model/UndefinedAVM2Item.java | 2 +- .../abc/avm2/model/UnparsedAVM2Item.java | 2 +- .../flash/abc/avm2/model/WithAVM2Item.java | 12 ++--- .../flash/abc/avm2/model/WithEndAVM2Item.java | 2 +- .../flash/abc/avm2/model/XMLAVM2Item.java | 2 +- .../model/clauses/DeclarationAVM2Item.java | 14 +++--- .../avm2/model/clauses/ExceptionAVM2Item.java | 2 +- .../avm2/model/clauses/FilterAVM2Item.java | 4 +- .../avm2/model/clauses/ForEachInAVM2Item.java | 18 ++++---- .../abc/avm2/model/clauses/ForInAVM2Item.java | 18 ++++---- .../abc/avm2/model/clauses/TryAVM2Item.java | 42 +++++++++--------- .../avm2/model/operations/AddAVM2Item.java | 14 +++--- .../operations/DeletePropertyAVM2Item.java | 6 +-- .../model/operations/SubtractAVM2Item.java | 14 +++--- .../flash/action/model/ActionItem.java | 2 +- .../action/model/AsciiToCharActionItem.java | 4 +- .../flash/action/model/CallActionItem.java | 4 +- .../action/model/CallFunctionActionItem.java | 6 +-- .../action/model/CallMethodActionItem.java | 12 ++--- .../flash/action/model/CastOpActionItem.java | 4 +- .../action/model/CharToAsciiActionItem.java | 4 +- .../action/model/CloneSpriteActionItem.java | 8 ++-- .../action/model/DecrementActionItem.java | 2 +- .../action/model/DefineLocalActionItem.java | 4 +- .../model/DefineRegisterActionItem.java | 2 +- .../flash/action/model/DeleteActionItem.java | 4 +- .../action/model/DirectValueActionItem.java | 22 +++++----- .../action/model/EnumerateActionItem.java | 2 +- .../flash/action/model/EvalActionItem.java | 4 +- .../flash/action/model/ExtendsActionItem.java | 2 +- .../action/model/FSCommand2ActionItem.java | 6 +-- .../action/model/FSCommandActionItem.java | 6 +-- .../action/model/FunctionActionItem.java | 24 +++++----- .../action/model/GetMemberActionItem.java | 6 +-- .../action/model/GetPropertyActionItem.java | 4 +- .../flash/action/model/GetTimeActionItem.java | 2 +- .../flash/action/model/GetURL2ActionItem.java | 6 +-- .../flash/action/model/GetURLActionItem.java | 6 +-- .../action/model/GetVersionActionItem.java | 2 +- .../action/model/GotoFrame2ActionItem.java | 6 +-- .../action/model/GotoFrameActionItem.java | 6 +-- .../action/model/GotoLabelActionItem.java | 6 +-- .../action/model/ImplementsOpActionItem.java | 4 +- .../action/model/IncrementActionItem.java | 2 +- .../action/model/InitArrayActionItem.java | 6 +-- .../action/model/InitObjectActionItem.java | 12 ++--- .../action/model/LoadMovieActionItem.java | 6 +-- .../action/model/LoadMovieNumActionItem.java | 6 +-- .../action/model/LoadVariablesActionItem.java | 6 +-- .../model/LoadVariablesNumActionItem.java | 6 +-- .../action/model/MBAsciiToCharActionItem.java | 4 +- .../action/model/MBCharToAsciiActionItem.java | 4 +- .../model/MBStringExtractActionItem.java | 8 ++-- .../model/MBStringLengthActionItem.java | 8 ++-- .../action/model/NewMethodActionItem.java | 10 ++--- .../action/model/NewObjectActionItem.java | 8 ++-- .../action/model/NextFrameActionItem.java | 2 +- .../flash/action/model/PlayActionItem.java | 2 +- .../action/model/PostDecrementActionItem.java | 2 +- .../action/model/PostIncrementActionItem.java | 2 +- .../action/model/PrevFrameActionItem.java | 2 +- .../flash/action/model/PrintActionItem.java | 6 +-- .../action/model/PrintAsBitmapActionItem.java | 6 +-- .../model/PrintAsBitmapNumActionItem.java | 6 +-- .../action/model/PrintNumActionItem.java | 6 +-- .../action/model/RandomNumberActionItem.java | 4 +- .../action/model/RemoveSpriteActionItem.java | 4 +- .../flash/action/model/ReturnActionItem.java | 2 +- .../action/model/SetMemberActionItem.java | 10 ++--- .../action/model/SetPropertyActionItem.java | 4 +- .../action/model/SetTarget2ActionItem.java | 4 +- .../action/model/SetTargetActionItem.java | 6 +-- .../action/model/SetVariableActionItem.java | 8 ++-- .../action/model/StartDragActionItem.java | 14 +++--- .../flash/action/model/StopActionItem.java | 2 +- .../action/model/StopAllSoundsActionItem.java | 2 +- .../action/model/StopDragActionItem.java | 2 +- .../action/model/StoreRegisterActionItem.java | 4 +- .../action/model/StrictModeActionItem.java | 2 +- .../action/model/StringExtractActionItem.java | 6 +-- .../action/model/StringLengthActionItem.java | 4 +- .../action/model/TargetPathActionItem.java | 4 +- .../flash/action/model/ThrowActionItem.java | 2 +- .../action/model/ToIntegerActionItem.java | 4 +- .../action/model/ToNumberActionItem.java | 4 +- .../action/model/ToStringActionItem.java | 4 +- .../model/ToggleHighQualityActionItem.java | 2 +- .../flash/action/model/TraceActionItem.java | 4 +- .../flash/action/model/TypeOfActionItem.java | 4 +- .../action/model/UnLoadMovieActionItem.java | 4 +- .../model/UnLoadMovieNumActionItem.java | 4 +- .../action/model/UnsupportedActionItem.java | 2 +- .../action/model/clauses/ClassActionItem.java | 44 +++++++++---------- .../action/model/clauses/ForInActionItem.java | 22 +++++----- .../clauses/IfFrameLoadedActionItem.java | 12 ++--- .../model/clauses/InterfaceActionItem.java | 12 ++--- .../model/clauses/TellTargetActionItem.java | 14 +++--- .../action/model/clauses/TryActionItem.java | 42 +++++++++--------- .../action/model/clauses/WithActionItem.java | 14 +++--- .../model/operations/AddActionItem.java | 14 +++--- .../model/operations/SubtractActionItem.java | 14 +++--- .../flash/helpers/HilightedTextWriter.java | 16 +++++-- .../src/com/jpexs/decompiler/graph/Graph.java | 2 +- .../decompiler/graph/GraphTargetItem.java | 8 +--- .../com/jpexs/decompiler/graph/MarkItem.java | 2 +- .../decompiler/graph/model/BinaryOpItem.java | 14 +++--- .../decompiler/graph/model/BlockItem.java | 10 ++--- .../decompiler/graph/model/BreakItem.java | 4 +- .../graph/model/CommaExpressionItem.java | 2 +- .../decompiler/graph/model/CommentItem.java | 2 +- .../decompiler/graph/model/ContinueItem.java | 4 +- .../decompiler/graph/model/DoWhileItem.java | 22 +++++----- .../jpexs/decompiler/graph/model/ForItem.java | 26 +++++------ .../jpexs/decompiler/graph/model/IfItem.java | 28 ++++++------ .../graph/model/IntegerValueItem.java | 2 +- .../graph/model/ParenthesisItem.java | 4 +- .../decompiler/graph/model/SwitchItem.java | 36 +++++++-------- .../decompiler/graph/model/TernarOpItem.java | 4 +- .../decompiler/graph/model/TrueItem.java | 2 +- .../decompiler/graph/model/UnaryOpItem.java | 8 ++-- .../graph/model/UniversalLoopItem.java | 16 +++---- .../decompiler/graph/model/WhileItem.java | 20 ++++----- 180 files changed, 630 insertions(+), 626 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index d1d1fbc61..929ba0db8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -712,7 +712,7 @@ public class AVM2Code implements Serializable { for (AVM2Instruction instruction : code) { writer.appendNoHilight(Helper.formatAddress(i)); writer.appendNoHilight(" "); - instruction.toString(writer, localData).appendNewLine(); + instruction.toString(writer, localData).newLine(); i++; } return writer; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java index 0a65f6a1b..d7ef39fab 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java @@ -35,7 +35,7 @@ public class CodeStats { public InstructionStats[] instructionStats; public HilightedTextWriter toString(HilightedTextWriter writer, ABC abc, List fullyQualifiedNames) { - writer.appendNoHilight("Stats: maxstack=" + maxstack + ", maxscope=" + maxscope + ", maxlocal=" + maxlocal).appendNewLine(); + writer.appendNoHilight("Stats: maxstack=" + maxstack + ", maxscope=" + maxscope + ", maxlocal=" + maxlocal).newLine(); int i = 0; int ms = 0; for (InstructionStats stats : instructionStats) { @@ -43,7 +43,7 @@ public class CodeStats { if (stats.stackpos > ms) { ms = stats.stackpos; } - writer.appendNoHilight(i + ":" + stats.stackpos + (deltastack >= 0 ? "+" + deltastack : deltastack) + "," + stats.scopepos + " " + stats.ins.toString(writer, LocalData.create(abc.constants, null, fullyQualifiedNames))).appendNewLine(); + writer.appendNoHilight(i + ":" + stats.stackpos + (deltastack >= 0 ? "+" + deltastack : deltastack) + "," + stats.scopepos + " " + stats.ins.toString(writer, LocalData.create(abc.constants, null, fullyQualifiedNames))).newLine(); i++; } return writer; 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 313f210d5..356a057dc 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 @@ -56,9 +56,9 @@ public abstract class AVM2Item extends GraphTargetItem { if (!empty) { if (object.precedence > PRECEDENCE_PRIMARY) { - hilight("(", writer); + writer.append("("); object.toString(writer, localData); - hilight(")", writer); + writer.append(")"); empty = false; } else { int writerLength = writer.getLength(); @@ -76,13 +76,13 @@ public abstract class AVM2Item extends GraphTargetItem { if (((FullMultinameAVM2Item) propertyName).name != null) { return propertyName.toString(writer, localData); } else { - hilight(".", writer); + writer.append("."); return propertyName.toString(writer, localData); } } else { - hilight("[", writer); + writer.append("["); propertyName.toString(writer, localData); - return hilight("]", writer); + return writer.append("]"); } } 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 6e9669560..9d82ba304 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 @@ -38,8 +38,8 @@ public class AlchemyLoadAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("op_" + name + "(", writer); + writer.append("op_" + name + "("); ofs.toString(writer, localData); - return hilight(") /*Alchemy*/", writer); + return writer.append(") /*Alchemy*/"); } } 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 931985ec9..9ff6481cf 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 @@ -37,8 +37,8 @@ public class AlchemySignExtendAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("op_" + name + "(", writer); + writer.append("op_" + name + "("); value.toString(writer, localData); - return hilight(") /*Alchemy*/", writer); + return writer.append(") /*Alchemy*/"); } } 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 7146d7324..6ca6de185 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 @@ -39,10 +39,10 @@ public class AlchemyStoreAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("op_" + name + "(", writer); + writer.append("op_" + name + "("); ofs.toString(writer, localData); - hilight(",", writer); + writer.append(","); value.toString(writer, localData); - return hilight(") /*Alchemy*/", writer); + return writer.append(") /*Alchemy*/"); } } 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 5be911b15..4d64d2da0 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 @@ -37,19 +37,19 @@ public class ApplyTypeAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); if (!params.isEmpty()) { - hilight(".<", writer); + writer.append(".<"); for (int i = 0; i < params.size(); i++) { if (i > 0) { - hilight(",", writer); + writer.append(","); } GraphTargetItem p = params.get(i); if (p instanceof NullAVM2Item) { - hilight("*", writer); + writer.append("*"); } else { p.toString(writer, localData); } } - hilight(">", writer); + writer.append(">"); } return 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 074ca8082..c4765716a 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 @@ -31,7 +31,7 @@ public class BooleanAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight(value ? "true" : "false", writer); + return writer.append(value ? "true" : "false"); } @Override 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 492e6a954..587566f6c 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 @@ -37,7 +37,7 @@ public class CallAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - /*String recPart = ""; receiver.toString(constants, localRegNames) + hilight(".", writer); + /*String recPart = ""; receiver.toString(constants, localRegNames) + writer.append("."); if (receiver instanceof NewActivationAVM2Item) { recPart = ""; } @@ -45,19 +45,19 @@ public class CallAVM2Item extends AVM2Item { recPart = ""; }*/ if (function.precedence > precedence) { - hilight("(", writer); + writer.append("("); function.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { function.toString(writer, localData); } - hilight("(", writer); + writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 31c21d8fd..ce8b1a03f 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 @@ -38,15 +38,15 @@ public class CallMethodAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { receiver.toString(writer, localData); - hilight(".", writer); - hilight(methodName, writer); - hilight("(", writer); + writer.append("."); + writer.append(methodName); + writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 d35574b0c..936c6fe26 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 @@ -40,13 +40,13 @@ public class CallPropertyAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { formatProperty(writer, receiver, propertyName, localData); - hilight("(", writer); + writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 2b7bfe636..9fb8d9c3c 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 @@ -38,15 +38,15 @@ public class CallStaticAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { receiver.toString(writer, localData); - hilight(".", writer); - hilight(methodName, writer); - hilight("(", writer); + writer.append("."); + writer.append(methodName); + writer.append("("); for (int a = 0; a < arguments.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 e9d0ebb82..4c59046dc 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 @@ -41,18 +41,18 @@ public class CallSuperAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!receiver.toString(false, localData).equals("this")) { receiver.toString(writer, localData); - hilight(".", writer); + writer.append("."); } - hilight("super.", writer); + writer.append("super."); multiname.toString(writer, localData); - hilight("(", writer); + writer.append("("); String args = ""; for (int a = 0; a < arguments.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 3daabe9f8..8a6e81565 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 @@ -31,6 +31,6 @@ public class ClassAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight(className.getName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); + return writer.append(className.getName(localData.constantsAvm2, localData.fullyQualifiedNames)); } } 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 97fd3790a..2fb37f629 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 @@ -36,18 +36,18 @@ public class ConstructAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (object instanceof NewFunctionAVM2Item) { - hilight("new ", writer); + writer.append("new "); return object.toString(writer, localData); } - hilight("new ", writer); + writer.append("new "); object.toString(writer, localData); - hilight("(", writer); + writer.append("("); for (int a = 0; a < args.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } args.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 b9197f755..416ca30dc 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 @@ -37,20 +37,20 @@ public class ConstructPropAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("new ", writer); + writer.append("new "); int idx = writer.getLength(); object.toString(writer, localData); if (idx < writer.getLength()) { - hilight(".", writer); + writer.append("."); } propertyName.toString(writer, localData); - hilight("(", writer); + writer.append("("); for (int a = 0; a < args.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } args.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 fe0be0009..182483eed 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 @@ -37,15 +37,15 @@ public class ConstructSuperAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!object.toString(false, localData).equals("this")) { object.toString(writer, localData); - hilight(".", writer); + writer.append("."); } - hilight("super(", writer); + writer.append("super("); for (int a = 0; a < args.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } args.get(a).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } } 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 c43d56bf7..d93228ef1 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 @@ -31,7 +31,7 @@ public class DecLocalAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight(localRegName(localData.localRegNames, regIndex), writer); - return hilight("--", writer); + writer.append(localRegName(localData.localRegNames, regIndex)); + return writer.append("--"); } } 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 8a9a7587e..865429e89 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 @@ -32,7 +32,7 @@ public class DecrementAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { value.toString(writer, localData); - return hilight("-1", writer); + return writer.append("-1"); } @Override 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 62541987a..34dc9aba2 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 @@ -36,7 +36,7 @@ public class DefaultXMLNamespace extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("default xml namespace = ", writer); + writer.append("default xml namespace = "); 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 5996a41bc..df556a355 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 @@ -34,8 +34,8 @@ public class EscapeXAttrAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("{", writer); + writer.append("{"); value.toString(writer, localData); - return hilight("}", writer); + return writer.append("}"); } } 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 c36deb8cb..1f1d8b638 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 @@ -36,8 +36,8 @@ public class EscapeXElemAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("{", writer); + writer.append("{"); expression.toString(writer, localData); - return hilight("}", writer); + return writer.append("}"); } } 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 6187bec17..962123a81 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 @@ -31,7 +31,7 @@ public class FloatValueAVM2Item extends NumberValueAVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("" + value, writer); + return writer.append("" + value); } @Override 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 43f1b84e2..5ce694640 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 @@ -79,7 +79,7 @@ public class FullMultinameAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (namespace != null) { namespace.toString(writer, localData); - hilight("::", writer); + writer.append("::"); } else { /*Namespace ns = constants.constant_multiname[multinameIndex].getNamespace(constants); if ((ns != null)&&(ns.name_index!=0)) { @@ -87,13 +87,13 @@ public class FullMultinameAVM2Item extends AVM2Item { }*/ } if (name != null) { - hilight("[", writer); + writer.append("["); name.toString(writer, localData); - hilight("]", writer); + writer.append("]"); } else { ConstantPool constants = localData.constantsAvm2; List fullyQualifiedNames = localData.fullyQualifiedNames; - hilight(constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames), writer); + writer.append(constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames)); } return 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 6448744d6..78c08dd69 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 @@ -35,7 +35,7 @@ public class GetDescendantsAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - hilight("..", writer); + writer.append(".."); 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 3cf4d70ef..dffa98cf9 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 @@ -32,6 +32,6 @@ public class GetLexAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight(propertyName.getName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); + return writer.append(propertyName.getName(localData.constantsAvm2, localData.fullyQualifiedNames)); } } 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 17ed747ac..e14629138 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 @@ -36,8 +36,8 @@ public class GetSlotAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (slotName == null) { - return hilight("/*UnknownSlot*/", writer); + return writer.append("/*UnknownSlot*/"); } - return hilight(slotName.getName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); + return writer.append(slotName.getName(localData.constantsAvm2, localData.fullyQualifiedNames)); } } 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 18ab9f888..d53247f2e 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 @@ -36,9 +36,9 @@ public class GetSuperAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!object.toString(false, localData).equals("this")) { object.toString(writer, localData); - hilight(".", writer); + writer.append("."); } - hilight("super.", writer); + writer.append("super."); return propertyName.toString(writer, localData); } } 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 e9cbacd9f..25dc4380b 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 @@ -39,7 +39,7 @@ public class HasNextAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { collection.toString(writer, localData); - hilight(" hasNext ", writer); + writer.append(" hasNext "); 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 cc80c59b2..ebaec08cb 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 @@ -35,7 +35,7 @@ public class InAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - hilight(" in ", writer); + writer.append(" in "); 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 865037ef9..8d4d2c656 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 @@ -31,7 +31,7 @@ public class IncLocalAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight(localRegName(localData.localRegNames, regIndex), writer); - return hilight("++", writer); + writer.append(localRegName(localData.localRegNames, regIndex)); + return writer.append("++"); } } 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 c6a0a1cde..0f05776c9 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 @@ -32,7 +32,7 @@ public class IncrementAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { value.toString(writer, localData); - return hilight("+1", writer); + return writer.append("+1"); } @Override 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 3934743b7..a2b2b1da8 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 @@ -38,7 +38,7 @@ public class InitPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, A @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { formatProperty(writer, object, propertyName, localData); - hilight(" = ", writer); + writer.append(" = "); 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 f01694413..b22b6c72a 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 @@ -31,7 +31,7 @@ public class IntegerValueAVM2Item extends NumberValueAVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("" + value, writer); + return writer.append("" + value); } @Override 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 cb7184126..2c6339abb 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 @@ -51,7 +51,7 @@ public class LocalRegAVM2Item extends AVM2Item { if (computedValue instanceof FilterAVM2Item) { return computedValue.toString(writer, localData); } - return hilight(localRegName(localData.localRegNames, regIndex), writer); + return writer.append(localRegName(localData.localRegNames, regIndex)); } @Override 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 d7a41053a..5a169717b 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 @@ -33,9 +33,9 @@ public class NameSpaceAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (namespaceIndex == 0) { - return hilight("*", writer); + return writer.append("*"); } ConstantPool constants = localData.constantsAvm2; - return hilight(constants.constant_namespace[namespaceIndex].toString(constants), writer); + return writer.append(constants.constant_namespace[namespaceIndex].toString(constants)); } } 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 81cb6ea0a..871855597 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 @@ -35,11 +35,11 @@ public class NameValuePair extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { name.toString(writer, localData); - hilight(":", writer); + writer.append(":"); if (value instanceof TernarOpItem) { //Ternar operator contains ":" - hilight("(", writer); + writer.append("("); value.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { value.toString(writer, localData); } 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 6433b7167..826a2b84b 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 @@ -28,6 +28,6 @@ public class NanAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("NaN", writer); + return writer.append("NaN"); } } 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 83db8875a..389021deb 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 @@ -32,6 +32,6 @@ public class NewActivationAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("newactivation()", writer); + return writer.append("newactivation()"); } } 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 a1f243628..ee320293a 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 @@ -33,13 +33,13 @@ public class NewArrayAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("[", writer); + writer.append("["); for (int a = 0; a < values.size(); a++) { if (a > 0) { - hilight(",", writer); + writer.append(","); } values.get(a).toString(writer, localData); } - return hilight("]", writer); + return writer.append("]"); } } 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 d6a55171d..2aa6b1f45 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 @@ -41,17 +41,17 @@ public class NewFunctionAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("function" + (!functionName.equals("") ? " " + functionName : ""), writer); + writer.append("function" + (!functionName.equals("") ? " " + functionName : "")); boolean highlight = writer.getIsHighlighted(); String mhead = "(" + (highlight ? paramStr : Highlighting.stripHilights(paramStr)) + "):" + (highlight ? returnStr : Highlighting.stripHilights(returnStr)); writer.appendNoHilight(writer.getIsHighlighted() ? Highlighting.hilighMethod(mhead, methodIndex) : mhead); - writer.appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.append("{").newLine(); + writer.indent(); writer.appendNoHilight((writer.getIsHighlighted() ? functionBody : Highlighting.stripHilights(functionBody))); - writer.appendNewLine(); - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.newLine(); + writer.unindent(); + writer.append("}"); return writer; } } 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 6e104815e..15743dd8f 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 @@ -35,28 +35,28 @@ public class NewObjectAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { boolean singleLine = pairs.size() < 2; if (!singleLine) { - writer.appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.indent(); } - hilight("{", writer); + writer.append("{"); if (!singleLine) { - writer.appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.indent(); } for (int n = 0; n < pairs.size(); n++) { if (n > 0) { - hilight(",", writer).appendNewLine(); + writer.append(",").newLine(); } pairs.get(n).toString(writer, localData); } if (!singleLine) { - writer.appendNewLine(); - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); + writer.newLine(); + writer.unindent(); } - hilight("}", writer); + writer.append("}"); if (!singleLine) { - writer.appendNewLine(); - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); + writer.newLine(); + writer.unindent(); } return writer; } 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 9a37ad6a8..a962153e7 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 @@ -38,10 +38,10 @@ public class NextNameAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("nextName(", writer); + writer.append("nextName("); index.toString(writer, localData); - hilight(",", writer); + writer.append(","); obj.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } } 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 24832772d..b78678451 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 @@ -38,10 +38,10 @@ public class NextValueAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("nextValue(", writer); + writer.append("nextValue("); index.toString(writer, localData); - hilight(",", writer); + writer.append(","); obj.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } } 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 7dbcaff99..66ce02b34 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 @@ -29,7 +29,7 @@ public class NullAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("null", writer); + return writer.append("null"); } @Override 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 355c256bd..34e22085a 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 @@ -34,7 +34,7 @@ public class PostDecrementAVM2Item extends AVM2Item implements AssignmentAVM2Ite @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - return hilight("--", writer); + return writer.append("--"); } @Override 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 9d3197ee0..e3bc58dd2 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 @@ -34,7 +34,7 @@ public class PostIncrementAVM2Item extends AVM2Item implements AssignmentAVM2Ite @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - return hilight("++", writer); + return writer.append("++"); } @Override 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 d87a28bae..1cb4bf038 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 @@ -32,7 +32,7 @@ public class ReturnValueAVM2Item extends AVM2Item implements ExitItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("return ", writer); + writer.append("return "); 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 7ef674af5..b6786a662 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 @@ -29,6 +29,6 @@ public class ReturnVoidAVM2Item extends AVM2Item implements ExitItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("return", writer); + return writer.append("return"); } } 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 f674f1e49..0bfcece6a 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 @@ -34,6 +34,6 @@ public class ScriptAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("script" + scriptIndex, writer); + return writer.append("script" + scriptIndex); } } 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 299517cbc..f60bd9753 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 @@ -40,9 +40,9 @@ public class SetGlobalSlotAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("setglobalslot(" + slotId + ",", writer); + writer.append("setglobalslot(" + slotId + ","); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 ff59cc711..2521eab3b 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 @@ -35,7 +35,7 @@ public class SetLocalAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assig @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight(localRegName(localData.localRegNames, regIndex) + " = ", writer); + writer.append(localRegName(localData.localRegNames, regIndex) + " = "); 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 b7f6ff127..d3acfdd78 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 @@ -44,7 +44,7 @@ public class SetPropertyAVM2Item extends AVM2Item implements SetTypeAVM2Item, As @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { formatProperty(writer, object, propertyName, localData); - hilight(" = ", writer); + writer.append(" = "); 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 30aa663d8..5969bcf18 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 @@ -45,7 +45,7 @@ public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assign @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { getName(writer, localData); - hilight(" = ", writer); + writer.append(" = "); return value.toString(writer, localData); } @@ -62,9 +62,9 @@ public class SetSlotAVM2Item extends AVM2Item implements SetTypeAVM2Item, Assign } }*/ if (slotName == null) { - return hilight("/*UnknownSlot*/", writer); + return writer.append("/*UnknownSlot*/"); } - return hilight(slotName.getName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); + return writer.append(slotName.getName(localData.constantsAvm2, localData.fullyQualifiedNames)); } @Override 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 041a3e54e..ca91dff0e 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 @@ -44,11 +44,11 @@ public class SetSuperAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (!object.toString(false, localData).equals("this")) { object.toString(writer, localData); - hilight(".", writer); + writer.append("."); } - hilight("super.", writer); + writer.append("super."); propertyName.toString(writer, localData); - hilight(" = ", writer); + writer.append(" = "); return value.toString(writer, localData); } 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 114c58333..da4027aeb 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 @@ -32,7 +32,7 @@ public class StringAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("\"" + Helper.escapeString(value) + "\"", writer); + return writer.append("\"" + Helper.escapeString(value) + "\""); } @Override 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 905221c7c..c3eb1a1d8 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 @@ -31,6 +31,6 @@ public class ThisAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("this", writer); + return writer.append("this"); } } 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 76703560e..14c4130f5 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 @@ -31,7 +31,7 @@ public class ThrowAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("throw ", writer); + writer.append("throw "); 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 1ef4ce5d4..4aa3180a2 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 @@ -29,7 +29,7 @@ public class UndefinedAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("undefined", writer); + return writer.append("undefined"); } @Override 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 7a7b6a9e5..757ace246 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 @@ -31,6 +31,6 @@ public class UnparsedAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight(value, writer); + return writer.append(value); } } 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 2f02b5d62..03d258099 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 @@ -43,16 +43,16 @@ public class WithAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("with(", writer); + writer.append("with("); scope.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); /*for (GraphTargetItem ti : items) { ret += ti.toString(constants, localRegNames, fullyQualifiedNames) + "\r\n"; }*/ - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer); + writer.unindent(); + return writer.append("}"); } @Override 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 97fbe7a2a..8d0157f92 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 @@ -32,7 +32,7 @@ public class WithEndAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("}", writer); + return writer.append("}"); } @Override 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 ce885d683..ad665e94c 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 @@ -39,7 +39,7 @@ public class XMLAVM2Item extends AVM2Item { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { for (GraphTargetItem part : parts) { if (part instanceof StringAVM2Item) { - hilight(((StringAVM2Item) part).value, writer); + writer.append(((StringAVM2Item) part).value); } else { part.toString(writer, localData); } 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 3c36a9574..34260100e 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 @@ -55,20 +55,20 @@ public class DeclarationAVM2Item extends AVM2Item { if (lti.value instanceof ConvertAVM2Item) { type = ((ConvertAVM2Item) lti.value).type; } - hilight("var ", writer); - hilight(localRegName(localData.localRegNames, lti.regIndex) + ":" + type + " = ", writer); + writer.append("var "); + writer.append(localRegName(localData.localRegNames, lti.regIndex) + ":" + type + " = "); return lti.value.toString(writer, localData); } if (assignment instanceof SetSlotAVM2Item) { SetSlotAVM2Item ssti = (SetSlotAVM2Item) assignment; - hilight("var ", writer); + writer.append("var "); ssti.getName(writer, localData); - hilight(":", writer); - hilight(type, writer); - hilight(" = ", writer); + writer.append(":"); + writer.append(type); + writer.append(" = "); return ssti.value.toString(writer, localData); } - hilight("var ", writer); + writer.append("var "); return assignment.toString(writer, localData); } } 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 1ef06e707..6324439e7 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 @@ -32,6 +32,6 @@ public class ExceptionAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight(exception.getVarName(localData.constantsAvm2, localData.fullyQualifiedNames), writer); + return writer.append(exception.getVarName(localData.constantsAvm2, localData.fullyQualifiedNames)); } } 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 9710f2bac..5167163b7 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 @@ -40,8 +40,8 @@ public class FilterAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { collection.toString(writer, localData); - hilight(".(", writer); + writer.append(".("); expression.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } } 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 301b42674..88fd77419 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 @@ -71,20 +71,20 @@ public class ForEachInAVM2Item extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("for each (", writer); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("for each ("); expression.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight(":loop" + loop.id, writer); + writer.unindent(); + writer.append("}").newLine(); + writer.append(":loop" + loop.id); return writer; } 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 2a1eb60a3..6a690df7e 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 @@ -71,20 +71,20 @@ public class ForInAVM2Item extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("for (", writer); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("for ("); expression.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight(":loop" + loop.id, writer); + writer.unindent(); + writer.append("}").newLine(); + writer.append(":loop" + loop.id); return writer; } 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 89d14c014..c6b218555 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 @@ -53,43 +53,43 @@ public class TryAVM2Item extends AVM2Item implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("try", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append("try").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : tryCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); for (int e = 0; e < catchExceptions.size(); e++) { - writer.appendNewLine(); - hilight("catch(" + catchExceptions.get(e).getVarName(localData.constantsAvm2, localData.fullyQualifiedNames) + ":" + catchExceptions.get(e).getTypeName(localData.constantsAvm2, localData.fullyQualifiedNames) + ")", writer); - writer.appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.append("catch(" + catchExceptions.get(e).getVarName(localData.constantsAvm2, localData.fullyQualifiedNames) + ":" + catchExceptions.get(e).getTypeName(localData.constantsAvm2, localData.fullyQualifiedNames) + ")"); + writer.newLine(); + writer.append("{").newLine(); + writer.indent(); List commands = catchCommands.get(e); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); } if (finallyCommands.size() > 0) { - writer.appendNewLine(); - hilight("finally", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.append("finally").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : finallyCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); } return writer; } 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 cc1a44f72..6f9530945 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 @@ -34,19 +34,19 @@ public class AddAVM2Item extends BinaryOpItem { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (rightSide.precedence >= precedence) { //string + vs number + if (leftSide.precedence > precedence) { - hilight("(", writer); + writer.append("("); leftSide.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { leftSide.toString(writer, localData); } - hilight(" ", writer); - hilight(operator, writer); - hilight(" ", writer); + writer.append(" "); + writer.append(operator); + writer.append(" "); - hilight("(", writer); + writer.append("("); rightSide.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } else { 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 7875d98c6..5025e69d9 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 @@ -36,10 +36,10 @@ public class DeletePropertyAVM2Item extends AVM2Item { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("delete ", writer); + writer.append("delete "); object.toString(writer, localData); - hilight("[", writer); + writer.append("["); propertyName.toString(writer, localData); - return hilight("]", writer); + return writer.append("]"); } } 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 4db2d38ff..805ee01d2 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 @@ -38,19 +38,19 @@ public class SubtractAVM2Item extends BinaryOpItem { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (rightSide.precedence >= precedence) { // >= add or subtract too if (leftSide.precedence > precedence) { - hilight("(", writer); + writer.append("("); leftSide.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { leftSide.toString(writer, localData); } - hilight(" ", writer); - hilight(operator, writer); - hilight(" ", writer); + writer.append(" "); + writer.append(operator); + writer.append(" "); - hilight("(", writer); + writer.append("("); rightSide.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } else { 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 a299b9f4b..9d484ce16 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java @@ -52,7 +52,7 @@ public abstract class ActionItem extends GraphTargetItem implements Serializable protected HilightedTextWriter stripQuotes(GraphTargetItem target, LocalData localData, HilightedTextWriter writer) { if (target instanceof DirectValueActionItem) { if (((DirectValueActionItem) target).value instanceof String) { - return ((DirectValueActionItem) target).hilight((String) ((DirectValueActionItem) target).value, writer); + return writer.append((String) ((DirectValueActionItem) target).value); } } if (target == null) { 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 065182802..e7e108cf7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/AsciiToCharActionItem.java @@ -34,9 +34,9 @@ public class AsciiToCharActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("chr(", writer); + writer.append("chr("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 f0eceb5b9..592c33b8f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallActionItem.java @@ -34,9 +34,9 @@ public class CallActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("call(", writer); + writer.append("call("); stripQuotes(value, localData, writer); - return hilight(")", writer); + return writer.append(")"); } @Override 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 e260a4763..fe99c950b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallFunctionActionItem.java @@ -46,14 +46,14 @@ public class CallFunctionActionItem extends ActionItem { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String paramStr = ""; stripQuotes(functionName, localData, writer); - hilight("(", writer); + writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(t).toStringNL(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 9301ed6b3..983aeae50 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CallMethodActionItem.java @@ -63,27 +63,27 @@ public class CallMethodActionItem extends ActionItem { } if (!blankMethod) { if (scriptObject.precedence > this.precedence) { - hilight("(", writer); + writer.append("("); scriptObject.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { scriptObject.toString(writer, localData); } - hilight(".", writer); + writer.append("."); stripQuotes(methodName, localData, writer); } else { scriptObject.toString(writer, localData); } - hilight("(", writer); + writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(t).toStringNL(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 b1ff9b051..b68294837 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java @@ -47,9 +47,9 @@ public class CastOpActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("(", writer); + writer.append("("); stripQuotes(constructor, localData, writer); - hilight(")", writer); + writer.append(")"); return object.toString(writer, localData); } 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 372cbb187..f3f12b780 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CharToAsciiActionItem.java @@ -34,9 +34,9 @@ public class CharToAsciiActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("ord(", writer); + writer.append("ord("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 4c06f854e..690724156 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CloneSpriteActionItem.java @@ -50,13 +50,13 @@ public class CloneSpriteActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("duplicateMovieClip(", writer); + writer.append("duplicateMovieClip("); target.toString(writer, localData); - hilight(",", writer); + writer.append(","); source.toString(writer, localData); - hilight(",", writer); + writer.append(","); depth.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 4d0ae4930..44c6fcf81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DecrementActionItem.java @@ -46,7 +46,7 @@ public class DecrementActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - return hilight(" - 1", writer); + return writer.append(" - 1"); } @Override 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 6e826b02e..f0167cb38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineLocalActionItem.java @@ -71,12 +71,12 @@ public class DefineLocalActionItem extends ActionItem implements SetTypeActionIt @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("var ", writer); + writer.append("var "); stripQuotes(name, localData, writer); if (value == null) { return writer; } - hilight(" = ", writer); + writer.append(" = "); return value.toString(writer, localData); } 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 385134dc7..dda24edbd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DefineRegisterActionItem.java @@ -36,7 +36,7 @@ public class DefineRegisterActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("var " + identifier, writer); + return writer.append("var " + identifier); } @Override 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 8ba574635..5f0d59ed7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DeleteActionItem.java @@ -47,12 +47,12 @@ public class DeleteActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("delete ", writer); + writer.append("delete "); if (object == null) { return propertyName.toString(writer, localData); } object.toString(writer, localData); - hilight(".", writer); + writer.append("."); return stripQuotes(propertyName, localData, writer); } 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 51e671d0c..ae0607cc7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java @@ -90,21 +90,21 @@ public class DirectValueActionItem extends ActionItem { protected HilightedTextWriter appendToNoQuotes(HilightedTextWriter writer, LocalData localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { - return hilight("0", writer); + return writer.append("0"); } } if (value instanceof Float) { if (Float.compare((float) (Float) value, 0) == 0) { - return hilight("0", writer); + return writer.append("0"); } } if (value instanceof String) { - return hilight((String) value, writer); + return writer.append((String) value); } if (value instanceof ConstantIndex) { - return hilight(this.constants.get(((ConstantIndex) value).index), writer); + return writer.append(this.constants.get(((ConstantIndex) value).index)); } - return hilight(value.toString(), writer); + return writer.append(value.toString()); } public String toStringNoH(ConstantPool constants) { @@ -131,24 +131,24 @@ public class DirectValueActionItem extends ActionItem { protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { - return hilight("0", writer); + return writer.append("0"); } } if (value instanceof Float) { if (Float.compare((float) (Float) value, 0) == 0) { - return hilight("0", writer); + return writer.append("0"); } } if (value instanceof String) { - return hilight("\"" + Helper.escapeString((String) value) + "\"", writer); + return writer.append("\"" + Helper.escapeString((String) value) + "\""); } if (value instanceof ConstantIndex) { - return hilight("\"" + Helper.escapeString(this.constants.get(((ConstantIndex) value).index)) + "\"", writer); + return writer.append("\"" + Helper.escapeString(this.constants.get(((ConstantIndex) value).index)) + "\""); } if (value instanceof RegisterNumber) { - return hilight(((RegisterNumber) value).translate(), writer); + return writer.append(((RegisterNumber) value).translate()); } - return hilight(value.toString(), writer); + return writer.append(value.toString()); } @Override 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 c493f1084..90b349c59 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java @@ -42,7 +42,7 @@ public class EnumerateActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("enumerate ", writer); + writer.append("enumerate "); 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 98824e4ef..d32560d81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EvalActionItem.java @@ -37,9 +37,9 @@ public class EvalActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("eval(", writer); + writer.append("eval("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 e60fd1b56..f1bf47359 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ExtendsActionItem.java @@ -37,7 +37,7 @@ public class ExtendsActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { subclass.toString(writer, localData); - hilight(" extends ", writer); + writer.append(" extends "); 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 8d95b11fc..06cb4d580 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommand2ActionItem.java @@ -49,13 +49,13 @@ public class FSCommand2ActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("FSCommand2(", writer); + writer.append("FSCommand2("); command.toString(writer, localData); for (int t = 0; t < arguments.size(); t++) { - hilight(",", writer); + writer.append(","); arguments.get(t).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 f2ee5ee3b..075662271 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -39,9 +39,9 @@ public class FSCommandActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("fscommand(\"", writer); - hilight(Helper.escapeString(command), writer); - return hilight("\")", writer); + writer.append("fscommand(\""); + writer.append(Helper.escapeString(command)); + return writer.append("\")"); } @Override 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 45f153d06..148acdeb5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -77,31 +77,31 @@ public class FunctionActionItem extends ActionItem { if (true) { //return writer.appendNoHilight("") } - hilight("function", writer); + writer.append("function"); if (calculatedFunctionName != null) { - hilight(" ", writer); + writer.append(" "); calculatedFunctionName.toStringNoQuotes(writer, localData); } else if (!functionName.equals("")) { - hilight(" ", writer); - hilight(functionName, writer); + writer.append(" "); + writer.append(functionName); } - hilight("(", writer); + writer.append("("); for (int p = 0; p < paramNames.size(); p++) { if (p > 0) { - hilight(", ", writer); + writer.append(", "); } String pname = paramNames.get(p); if (pname == null || pname.equals("")) { pname = new RegisterNumber(regStart + p).translate(); } - hilight(pname, writer); + writer.append(pname); } - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); writer.appendNoHilight(Graph.graphToString(actions, writer.getIsHighlighted(), false, localData)); - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer); + writer.unindent(); + return writer.append("}"); } @Override 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 68a09af76..c9c7a03cb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java @@ -49,12 +49,12 @@ public class GetMemberActionItem extends ActionItem { if (!((memberName instanceof DirectValueActionItem) && (((DirectValueActionItem) memberName).value instanceof String))) { //if(!(functionName instanceof GetVariableActionItem)) object.toString(writer, localData); - hilight("[", writer); + writer.append("["); stripQuotes(memberName, localData, writer); - return hilight("]", writer); + return writer.append("]"); } object.toString(writer, localData); - hilight(".", writer); + writer.append("."); return stripQuotes(memberName, localData, writer); } 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 7b89098ff..dca1fd28d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetPropertyActionItem.java @@ -49,10 +49,10 @@ public class GetPropertyActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (isEmptyString(target)) { - return hilight(Action.propertyNames[propertyIndex], writer); + return writer.append(Action.propertyNames[propertyIndex]); } target.toString(writer, localData); - return hilight("." + Action.propertyNames[propertyIndex], writer); + return writer.append("." + Action.propertyNames[propertyIndex]); } @Override 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 f302b3243..29b6c3c24 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetTimeActionItem.java @@ -32,7 +32,7 @@ public class GetTimeActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("getTimer()", writer); + return writer.append("getTimer()"); } @Override 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 dba1d10d5..7afb7b0d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURL2ActionItem.java @@ -50,11 +50,11 @@ public class GetURL2ActionItem extends ActionItem { methodStr = ",\"POST\""; } - hilight("getURL(", writer); + writer.append("getURL("); urlString.toString(writer, localData); - hilight(",", writer); + writer.append(","); targetString.toString(writer, localData); - return hilight(methodStr + ")", writer); + return writer.append(methodStr + ")"); } public GetURL2ActionItem(GraphSourceItem instruction, GraphTargetItem urlString, GraphTargetItem targetString, int method) { 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 bfb6292dd..98d21f624 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -31,9 +31,9 @@ public class GetURLActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("getUrl(\"", writer); - hilight(Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString), writer); - return hilight("\")", writer); + writer.append("getUrl(\""); + writer.append(Helper.escapeString(urlString) + "\", \"" + Helper.escapeString(targetString)); + return writer.append("\")"); } public GetURLActionItem(GraphSourceItem instruction, String urlString, String targetString) { 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 3f30a6356..3ca236c1e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java @@ -36,7 +36,7 @@ public class GetVersionActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("getVersion()", writer); + return writer.append("getVersion()"); } @Override 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 18c6397c7..69ec88893 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrame2ActionItem.java @@ -54,10 +54,10 @@ public class GotoFrame2ActionItem extends ActionItem { if (playFlag) { prefix = "gotoAndPlay"; } - hilight(prefix + "(", writer); + writer.append(prefix + "("); frame.toString(writer, localData); - hilight((sceneBiasFlag ? "," + sceneBias : ""), writer); - return hilight(")", writer); + writer.append((sceneBiasFlag ? "," + sceneBias : "")); + return writer.append(")"); } @Override 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 e5283bdde..88bf6bf7b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoFrameActionItem.java @@ -34,9 +34,9 @@ public class GotoFrameActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("gotoAndStop(", writer); - hilight("" + (frame + 1), writer); - return hilight(")", writer); + writer.append("gotoAndStop("); + writer.append("" + (frame + 1)); + return writer.append(")"); } @Override 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 a2b662184..3cf0923db 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java @@ -35,9 +35,9 @@ public class GotoLabelActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("gotoAndStop(\"", writer); - hilight(Helper.escapeString(label), writer); - return hilight("\")", writer); + writer.append("gotoAndStop(\""); + writer.append(Helper.escapeString(label)); + return writer.append("\")"); } @Override 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 d572bcae1..a2ddefd8d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java @@ -37,10 +37,10 @@ public class ImplementsOpActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { subclass.toString(writer, localData); - hilight(" implements ", writer); + writer.append(" implements "); for (int i = 0; i < superclasses.size(); i++) { if (i > 0) { - hilight(",", writer); + writer.append(","); } superclasses.get(i).toString(writer, localData); } 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 5b3399edf..87c485b20 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/IncrementActionItem.java @@ -46,7 +46,7 @@ public class IncrementActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - return hilight(" + 1", writer); + return writer.append(" + 1"); } @Override 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 5793c8ec3..ac5c44899 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitArrayActionItem.java @@ -44,14 +44,14 @@ public class InitArrayActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("[", writer); + writer.append("["); for (int i = 0; i < values.size(); i++) { if (i > 0) { - hilight(",", writer); + writer.append(","); } values.get(i).toString(writer, localData); } - return hilight("]", writer); + return writer.append("]"); } @Override 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 7d09ab46a..7ced47ea0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/InitObjectActionItem.java @@ -48,22 +48,22 @@ public class InitObjectActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("{", writer); + writer.append("{"); for (int i = 0; i < values.size(); i++) { if (i > 0) { - hilight(",", writer); + writer.append(","); } names.get(i).toStringNoQuotes(writer, localData); //AS1/2 do not allow quotes in name here - hilight(":", writer); + writer.append(":"); if (values.get(i) instanceof TernarOpItem) { //Ternar operator contains ":" - hilight("(", writer); + writer.append("("); values.get(i).toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { values.get(i).toString(writer, localData); } } - return hilight("}", writer); + return writer.append("}"); } @Override 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 f21ae27a5..11532628f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java @@ -59,11 +59,11 @@ public class LoadMovieActionItem extends ActionItem { if (method == 2) { methodStr = ",\"POST\""; } - hilight("loadMovie(", writer); + writer.append("loadMovie("); urlString.toString(writer, localData); - hilight(",", writer); + writer.append(","); targetString.toString(writer, localData); - return hilight(methodStr + ")", writer); + return writer.append(methodStr + ")"); } @Override 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 447325d35..581c66ed6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java @@ -61,11 +61,11 @@ public class LoadMovieNumActionItem extends ActionItem { if (method == 2) { methodStr = ",\"POST\""; } - hilight("loadMovieNum(", writer); + writer.append("loadMovieNum("); urlString.toString(writer, localData); - hilight(",", writer); + writer.append(","); num.toString(writer, localData); - return hilight(methodStr + ")", writer); + return writer.append(methodStr + ")"); } @Override 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 fed262a5a..d2fc96826 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesActionItem.java @@ -59,11 +59,11 @@ public class LoadVariablesActionItem extends ActionItem { if (method == 2) { methodStr = ",\"POST\""; } - hilight("loadVariables(", writer); + writer.append("loadVariables("); urlString.toString(writer, localData); - hilight(",", writer); + writer.append(","); targetString.toString(writer, localData); - return hilight(methodStr + ")", writer); + return writer.append(methodStr + ")"); } @Override 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 474e62cc7..e4a87b46c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java @@ -61,11 +61,11 @@ public class LoadVariablesNumActionItem extends ActionItem { if (method == 2) { methodStr = ",\"POST\""; } - hilight("loadVariablesNum(", writer); + writer.append("loadVariablesNum("); urlString.toString(writer, localData); - hilight(",", writer); + writer.append(","); num.toString(writer, localData); - return hilight(methodStr + ")", writer); + return writer.append(methodStr + ")"); } @Override 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 e1c2f10db..b0f14aaec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBAsciiToCharActionItem.java @@ -34,9 +34,9 @@ public class MBAsciiToCharActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("mbchr(", writer); + writer.append("mbchr("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 e09f55d32..97efb8a9f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBCharToAsciiActionItem.java @@ -34,9 +34,9 @@ public class MBCharToAsciiActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("mbord(", writer); + writer.append("mbord("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 fdf09acdc..e8568dae9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringExtractActionItem.java @@ -50,13 +50,13 @@ public class MBStringExtractActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("mbsubstring(", writer); + writer.append("mbsubstring("); value.toString(writer, localData); - hilight(",", writer); + writer.append(","); index.toString(writer, localData); - hilight(",", writer); + writer.append(","); count.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 8da71276d..d8c13ba64 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/MBStringLengthActionItem.java @@ -35,15 +35,15 @@ public class MBStringLengthActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("mblength(", writer); + writer.append("mblength("); if (value.precedence > precedence) { - hilight("(", writer); + writer.append("("); value.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { value.toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 bd5f85077..b7e558eb1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewMethodActionItem.java @@ -61,11 +61,11 @@ public class NewMethodActionItem extends ActionItem { } } if (!blankMethod) { - hilight("new ", writer); + writer.append("new "); } scriptObject.toString(writer, localData); if (!blankMethod) { - hilight(".", writer); + writer.append("."); if (methodName instanceof DirectValueActionItem) { if (((DirectValueActionItem) methodName).value instanceof Undefined) { } else if (((DirectValueActionItem) methodName).value instanceof String) { @@ -77,14 +77,14 @@ public class NewMethodActionItem extends ActionItem { methodName.toString(writer, localData); } } - hilight("(", writer); + writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(t).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 a17b4971b..90e16144f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NewObjectActionItem.java @@ -47,16 +47,16 @@ public class NewObjectActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("new ", writer); + writer.append("new "); stripQuotes(objectName, localData, writer); - hilight("(", writer); + writer.append("("); for (int t = 0; t < arguments.size(); t++) { if (t > 0) { - hilight(",", writer); + writer.append(","); } arguments.get(t).toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 0487c1926..6b976cd97 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/NextFrameActionItem.java @@ -27,7 +27,7 @@ public class NextFrameActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("nextFrame()", writer); + return writer.append("nextFrame()"); } public NextFrameActionItem(GraphSourceItem instruction) { 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 325ba44a0..aaa00d9e5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PlayActionItem.java @@ -27,7 +27,7 @@ public class PlayActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("play()", writer); + return writer.append("play()"); } public PlayActionItem(GraphSourceItem instruction) { 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 f2d637416..049c6c617 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java @@ -53,7 +53,7 @@ public class PostDecrementActionItem extends ActionItem implements SetTypeAction @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - return hilight("--", writer); + return writer.append("--"); } @Override 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 19f625385..f79512f3f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java @@ -53,7 +53,7 @@ public class PostIncrementActionItem extends ActionItem implements SetTypeAction @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { object.toString(writer, localData); - return hilight("++", writer); + return writer.append("++"); } @Override 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 258dea499..2038b73d7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrevFrameActionItem.java @@ -27,7 +27,7 @@ public class PrevFrameActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("prevFrame()", writer); + return writer.append("prevFrame()"); } public PrevFrameActionItem(GraphSourceItem instruction) { 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 5b53ad28c..84236ee8c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java @@ -52,11 +52,11 @@ public class PrintActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("print(", writer); + writer.append("print("); target.toString(writer, localData); - hilight(",", writer); + writer.append(","); boundingBox.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 610406369..54efb1d39 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java @@ -52,11 +52,11 @@ public class PrintAsBitmapActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("printAsBitmap(", writer); + writer.append("printAsBitmap("); target.toString(writer, localData); - hilight(",", writer); + writer.append(","); boundingBox.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 f8dcf1dac..dc6b863df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java @@ -52,11 +52,11 @@ public class PrintAsBitmapNumActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("printAsBitmapNum(", writer); + writer.append("printAsBitmapNum("); num.toString(writer, localData); - hilight(",", writer); + writer.append(","); boundingBox.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 107b1164f..c0b172998 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java @@ -52,11 +52,11 @@ public class PrintNumActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("printNum(", writer); + writer.append("printNum("); num.toString(writer, localData); - hilight(",", writer); + writer.append(","); boundingBox.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 8ad79ac76..2a5d66f29 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RandomNumberActionItem.java @@ -34,9 +34,9 @@ public class RandomNumberActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("random(", writer); + writer.append("random("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 41ca3ce3a..1e66aed31 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/RemoveSpriteActionItem.java @@ -34,9 +34,9 @@ public class RemoveSpriteActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("removeMovieClip(", writer); + writer.append("removeMovieClip("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 d7de50d5f..d7549aa38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java @@ -46,7 +46,7 @@ public class ReturnActionItem extends ActionItem implements ExitItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("return ", writer); + writer.append("return "); 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 e139b7e11..478edf1aa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetMemberActionItem.java @@ -83,16 +83,16 @@ public class SetMemberActionItem extends ActionItem implements SetTypeActionItem if (!((objectName instanceof DirectValueActionItem) && (((DirectValueActionItem) objectName).value instanceof String))) { //if(!(functionName instanceof GetVariableActionItem)) object.toString(writer, localData); - hilight("[", writer); + writer.append("["); stripQuotes(objectName, localData, writer); - hilight("]", writer); - hilight(" = ", writer); + writer.append("]"); + writer.append(" = "); return value.toString(writer, localData); } object.toString(writer, localData); - hilight(".", writer); + writer.append("."); stripQuotes(objectName, localData, writer); - hilight(" = ", writer); + writer.append(" = "); return value.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 c2fccc3a8..796011249 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetPropertyActionItem.java @@ -73,11 +73,11 @@ public class SetPropertyActionItem extends ActionItem implements SetTypeActionIt @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (isEmptyString(target)) { - hilight(Action.propertyNames[propertyIndex] + " = ", writer); + writer.append(Action.propertyNames[propertyIndex] + " = "); return value.toString(writer, localData); } target.toString(writer, localData); - hilight("." + Action.propertyNames[propertyIndex] + " = ", writer); + writer.append("." + Action.propertyNames[propertyIndex] + " = "); 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 7ba9b75ca..5fb8b9530 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTarget2ActionItem.java @@ -35,9 +35,9 @@ public class SetTarget2ActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("tellTarget(", writer); + writer.append("tellTarget("); target.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 4d48ffe58..09a7403df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java @@ -34,9 +34,9 @@ public class SetTargetActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("tellTarget(\"", writer); - hilight(Helper.escapeString(target), writer); - return hilight("\")", writer); + writer.append("tellTarget(\""); + writer.append(Helper.escapeString(target)); + return writer.append("\")"); } @Override 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 5ad9e6ac3..7e2f06408 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetVariableActionItem.java @@ -71,14 +71,14 @@ public class SetVariableActionItem extends ActionItem implements SetTypeActionIt protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (name instanceof DirectValueActionItem || name instanceof GetVariableActionItem) { stripQuotes(name, localData, writer); - hilight(" = ", writer); + writer.append(" = "); return value.toString(writer, localData); } else { - hilight("set(", writer); + writer.append("set("); name.toString(writer, localData); - hilight(",", writer); + writer.append(","); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } } 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 249b6690b..f6079ea18 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StartDragActionItem.java @@ -55,21 +55,21 @@ public class StartDragActionItem extends ActionItem { hasConstrains = false; } } - hilight("startDrag(", writer); + writer.append("startDrag("); target.toString(writer, localData); - hilight(",", writer); + writer.append(","); lockCenter.toString(writer, localData); if (hasConstrains) { - hilight(",", writer); + writer.append(","); x1.toString(writer, localData); - hilight(",", writer); + writer.append(","); y1.toString(writer, localData); - hilight(",", writer); + writer.append(","); x2.toString(writer, localData); - hilight(",", writer); + writer.append(","); y2.toString(writer, localData); } - return hilight(")", writer); + return writer.append(")"); } @Override 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 d45dd7d7f..e04107856 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopActionItem.java @@ -27,7 +27,7 @@ public class StopActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("stop()", writer); + return writer.append("stop()"); } public StopActionItem(GraphSourceItem instruction) { 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 0ca39bef5..66da981a7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopAllSoundsActionItem.java @@ -27,7 +27,7 @@ public class StopAllSoundsActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("stopAllSounds()", writer); + return writer.append("stopAllSounds()"); } public StopAllSoundsActionItem(GraphSourceItem instruction) { 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 c90c51340..ecb2c4ec9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StopDragActionItem.java @@ -27,7 +27,7 @@ public class StopDragActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("stopDrag()", writer); + return writer.append("stopDrag()"); } public StopDragActionItem(GraphSourceItem instruction) { 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 59b5d35e4..50b88579c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StoreRegisterActionItem.java @@ -73,9 +73,9 @@ public class StoreRegisterActionItem extends ActionItem implements SetTypeAction value.toString(writer, localData); } else { if (define) { - hilight("var ", writer); + writer.append("var "); } - hilight(register.translate() + " = ", writer); + writer.append(register.translate() + " = "); value.toString(writer, localData); } return writer; 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 bb120a2e2..fe2300d0c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StrictModeActionItem.java @@ -31,7 +31,7 @@ public class StrictModeActionItem extends ActionItem { @Override 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... + return writer.append("StrictMode(" + mode + ");"); //I still don't know how AS source of Strict Mode instruction looks like, assuming this... } @Override 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 2ea261d1a..58dccc0ff 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringExtractActionItem.java @@ -41,11 +41,11 @@ public class StringExtractActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { value.toString(writer, localData); - hilight(".substr(", writer); + writer.append(".substr("); index.toString(writer, localData); - hilight(",", writer); + writer.append(","); count.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 19f560f94..c811b6ae3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/StringLengthActionItem.java @@ -34,9 +34,9 @@ public class StringLengthActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("length(", writer); + writer.append("length("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 527e4419e..1712a9029 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TargetPathActionItem.java @@ -34,9 +34,9 @@ public class TargetPathActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("targetPath(", writer); + writer.append("targetPath("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 4535871bd..ced104426 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java @@ -34,7 +34,7 @@ public class ThrowActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("throw ", writer); + writer.append("throw "); 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 eae580a58..ba43409c0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToIntegerActionItem.java @@ -34,9 +34,9 @@ public class ToIntegerActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("int(", writer); + writer.append("int("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 2c1a49cb8..b128976f5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java @@ -34,9 +34,9 @@ public class ToNumberActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("Number(", writer); + writer.append("Number("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 ec5dbde6f..26392594f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java @@ -34,9 +34,9 @@ public class ToStringActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("String(", writer); + writer.append("String("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 ac43b6fb2..da2ad1765 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToggleHighQualityActionItem.java @@ -27,7 +27,7 @@ public class ToggleHighQualityActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("toggleHighQuality()", writer); + return writer.append("toggleHighQuality()"); } public ToggleHighQualityActionItem(GraphSourceItem instruction) { 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 21199c62e..a5a7531af 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TraceActionItem.java @@ -34,9 +34,9 @@ public class TraceActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("trace(", writer); + writer.append("trace("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 dbdc42c92..9ced64842 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java @@ -36,9 +36,9 @@ public class TypeOfActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("typeof(", writer); + writer.append("typeof("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 4448f187f..d40c0fb29 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieActionItem.java @@ -48,9 +48,9 @@ public class UnLoadMovieActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("unloadMovie(", writer); + writer.append("unloadMovie("); targetString.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 1b3bc5824..da7b9566f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -50,9 +50,9 @@ public class UnLoadMovieNumActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("unloadMovieNum(", writer); + writer.append("unloadMovieNum("); num.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override 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 6c4ec2675..01df9e129 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnsupportedActionItem.java @@ -31,7 +31,7 @@ public class UnsupportedActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("//Unsupported by decompiler:" + value, writer); + return writer.append("//Unsupported by decompiler:" + value); } @Override 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 8fb92ff4e..29d716c05 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 @@ -157,62 +157,62 @@ public class ClassActionItem extends ActionItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("class ", writer); + writer.append("class "); className.toStringNoQuotes(writer, localData); if (extendsOp != null) { - hilight(" extends ", writer); + writer.append(" extends "); extendsOp.toStringNoQuotes(writer, localData); } if (!implementsOp.isEmpty()) { - hilight(" implements ", writer); + writer.append(" implements "); boolean first = true; for (GraphTargetItem t : implementsOp) { if (!first) { - hilight(", ", writer); + writer.append(", "); } first = false; Action.getWithoutGlobal(t).toString(writer, localData); } } - writer.appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.append("{").newLine(); + writer.indent(); if (constructor != null) { - constructor.toString(writer, localData).appendNewLine(); + constructor.toString(writer, localData).newLine(); } for (MyEntry item : vars) { - hilight("var ", writer); + writer.append("var "); item.key.toStringNoQuotes(writer, localData); - hilight(" = ", writer); + writer.append(" = "); item.value.toString(writer, localData); - hilight(";", writer).appendNewLine(); + writer.append(";").newLine(); } for (String v : uninitializedVars) { - hilight("var ", writer); - hilight(v, writer); - hilight(";", writer).appendNewLine(); + writer.append("var "); + writer.append(v); + writer.append(";").newLine(); } for (MyEntry item : staticVars) { - hilight("static var ", writer); + writer.append("static var "); item.key.toStringNoQuotes(writer, localData); - hilight(" = ", writer); + writer.append(" = "); item.value.toString(writer, localData); - hilight(";", writer).appendNewLine(); + writer.append(";").newLine(); } for (GraphTargetItem f : functions) { - f.toString(writer, localData).appendNewLine(); + f.toString(writer, localData).newLine(); } for (GraphTargetItem f : staticFunctions) { - hilight("static ", writer); - f.toString(writer, localData).appendNewLine(); + writer.append("static "); + f.toString(writer, localData).newLine(); } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer).appendNewLine(); + writer.unindent(); + return writer.append("}").newLine(); } @Override 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 4fc464e3d..5d697590f 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 @@ -65,23 +65,23 @@ public class ForInActionItem extends LoopActionItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("for(", writer); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("for("); if ((variableName instanceof DirectValueActionItem) && (((DirectValueActionItem) variableName).value instanceof RegisterNumber)) { - hilight("var ", writer); + writer.append("var "); } stripQuotes(variableName, localData, writer); - hilight(" in ", writer); + writer.append(" in "); enumVariable.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - return hilight(":loop" + loop.id, writer); + writer.unindent(); + writer.append("}").newLine(); + return writer.append(":loop" + loop.id); } @Override 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 66807db39..0677cc586 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 @@ -46,14 +46,14 @@ public class IfFrameLoadedActionItem extends ActionItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("ifFrameLoaded(", writer); + writer.append("ifFrameLoaded("); frame.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); writer.appendNoHilight(Graph.graphToString(actions, writer.getIsHighlighted(), false, localData)); - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer); + writer.unindent(); + return writer.append("}"); } @Override 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 0bbd3f439..3195b3456 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 @@ -44,22 +44,22 @@ public class InterfaceActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("interface ", writer); + writer.append("interface "); name.toStringNoQuotes(writer, localData); boolean first = true; if (!superInterfaces.isEmpty()) { - hilight(" extends ", writer); + writer.append(" extends "); } for (GraphTargetItem ti : superInterfaces) { if (!first) { - hilight(", ", writer); + writer.append(", "); } first = false; Action.getWithoutGlobal(ti).toStringNoQuotes(writer, localData); } - writer.appendNewLine(); - hilight("{", writer).appendNewLine(); - return hilight("}", writer).appendNewLine(); + writer.newLine(); + writer.append("{").newLine(); + return writer.append("}").newLine(); } @Override 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 1293e616d..c0860193a 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 @@ -42,16 +42,16 @@ public class TellTargetActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("tellTarget(", writer); + writer.append("tellTarget("); target.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { - ti.toString(writer, localData).appendNewLine(); + ti.toString(writer, localData).newLine(); } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer); + writer.unindent(); + return writer.append("}"); } @Override 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 e8ebfb143..67bbc444b 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 @@ -60,44 +60,44 @@ public class TryActionItem extends ActionItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("try", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append("try").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : tryCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); for (int e = 0; e < catchExceptions.size(); e++) { - writer.appendNewLine(); - hilight("catch(", writer); + writer.newLine(); + writer.append("catch("); catchExceptions.get(e).toStringNoQuotes(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); List commands = catchCommands.get(e); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); } if (finallyCommands.size() > 0) { - writer.appendNewLine(); - hilight("finally", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.append("finally").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : finallyCommands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); } return writer; } 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 964b67789..69bfc371b 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 @@ -49,16 +49,16 @@ public class WithActionItem extends ActionItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { String ret; - hilight("with(", writer); + writer.append("with("); scope.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : items) { - ti.toString(writer, localData).appendNewLine(); + ti.toString(writer, localData).newLine(); } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer); + writer.unindent(); + return writer.append("}"); } @Override 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 73683b182..bd29a3740 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 @@ -41,18 +41,18 @@ public class AddActionItem extends BinaryOpItem { if (rightSide.precedence >= precedence) { //string + vs number + String ret = ""; if (leftSide.precedence > precedence) { - hilight("(", writer); + writer.append("("); leftSide.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { leftSide.toString(writer, localData); } - hilight(" ", writer); - hilight(operator, writer); - hilight(" ", writer); - hilight("(", writer); + writer.append(" "); + writer.append(operator); + writer.append(" "); + writer.append("("); rightSide.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } else { 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 2a2d6a921..1e01a5407 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 @@ -42,19 +42,19 @@ public class SubtractActionItem extends BinaryOpItem { if (rightSide.precedence >= precedence) { // >= add or subtract too String ret = ""; if (leftSide.precedence > precedence) { - hilight("(", writer); + writer.append("("); leftSide.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { leftSide.toString(writer, localData); } - hilight(" ", writer); - hilight(operator, writer); - hilight(" ", writer); + writer.append(" "); + writer.append(operator); + writer.append(" "); - hilight("(", writer); + writer.append("("); rightSide.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } else { return super.appendTo(writer, localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java b/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java index ea13a2f63..022113b09 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/HilightedTextWriter.java @@ -17,6 +17,7 @@ package com.jpexs.decompiler.flash.helpers; import com.jpexs.decompiler.flash.helpers.hilight.Highlighting; +import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphSourceItem; import java.util.Stack; @@ -54,9 +55,6 @@ public class HilightedTextWriter { } public HilightedTextWriter append(String str) { - if (offsets.isEmpty()) { - System.out.println("WTF?"); - } GraphSourceItemPosition itemPos = offsets.peek(); GraphSourceItem src = itemPos.graphSourceItem; int pos = itemPos.position; @@ -73,7 +71,17 @@ public class HilightedTextWriter { return this; } - public HilightedTextWriter appendNewLine() { + public HilightedTextWriter indent() { + append(Graph.INDENTOPEN).newLine(); + return this; + } + + public HilightedTextWriter unindent() { + append(Graph.INDENTCLOSE).newLine(); + return this; + } + + public HilightedTextWriter newLine() { sb.append("\r\n"); return this; } diff --git a/trunk/src/com/jpexs/decompiler/graph/Graph.java b/trunk/src/com/jpexs/decompiler/graph/Graph.java index 587723ef6..5ff0c9bbc 100644 --- a/trunk/src/com/jpexs/decompiler/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/graph/Graph.java @@ -2160,7 +2160,7 @@ public class Graph { HilightedTextWriter writer = new HilightedTextWriter(highlight); for (GraphTargetItem ti : tree) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } String[] parts = writer.toString().split("\r\n"); diff --git a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java index f7a597433..ab426ac98 100644 --- a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java @@ -83,15 +83,11 @@ public abstract class GraphTargetItem implements Serializable { return ret; } - public HilightedTextWriter hilight(String str, HilightedTextWriter writer) { - return writer.append(str); - } - public HilightedTextWriter toStringSemicoloned(HilightedTextWriter writer, LocalData localData) { writer.addOffset(src, pos); appendTo(writer, localData); if (needsSemicolon()) { - hilight(";", writer); + writer.append(";"); } writer.removeOffset(); return writer; @@ -181,7 +177,7 @@ public abstract class GraphTargetItem implements Serializable { writer.addOffset(src, pos); appendTo(writer, localData); if (needsNewLine()) { - writer.appendNewLine(); + writer.newLine(); } writer.removeOffset(); return writer; diff --git a/trunk/src/com/jpexs/decompiler/graph/MarkItem.java b/trunk/src/com/jpexs/decompiler/graph/MarkItem.java index 7b1a0f9e9..61922b159 100644 --- a/trunk/src/com/jpexs/decompiler/graph/MarkItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/MarkItem.java @@ -34,7 +34,7 @@ public class MarkItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("//decompiler mark:" + mark, writer); + return writer.append("//decompiler mark:" + mark); } public String getMark() { diff --git a/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java index e0f57226c..e106b148f 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BinaryOpItem.java @@ -49,21 +49,21 @@ public abstract class BinaryOpItem extends GraphTargetItem implements BinaryOp { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { if (leftSide.getPrecedence() > precedence) { - hilight("(", writer); + writer.append("("); leftSide.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { leftSide.toString(writer, localData); } - hilight(" ", writer); - hilight(operator, writer); - hilight(" ", writer); + writer.append(" "); + writer.append(operator); + writer.append(" "); if (rightSide.getPrecedence() > precedence) { - hilight("(", writer); + writer.append("("); rightSide.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { rightSide.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 9c78f8f9a..1d08cbc33 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BlockItem.java @@ -38,12 +38,12 @@ public class BlockItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append("{").newLine(); + writer.indent(); writer.appendNoHilight(Graph.graphToString(commands, writer.getIsHighlighted(), false, localData)); - writer.appendNewLine(); - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - return hilight("}", writer); + writer.newLine(); + writer.unindent(); + return writer.append("}"); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java b/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java index 384b37941..38fbe3fc6 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/BreakItem.java @@ -21,8 +21,8 @@ public class BreakItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("break ", writer); - return hilight("loop" + loopId, writer); + writer.append("break "); + return writer.append("loop" + loopId); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java b/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java index 40179dc4a..1be01b6b5 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/CommaExpressionItem.java @@ -40,7 +40,7 @@ public class CommaExpressionItem extends GraphTargetItem { boolean first = true; for (GraphTargetItem t : commands) { if (!first) { - hilight(", ", writer); + writer.append(", "); } t.toString(writer, localData); first = false; diff --git a/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java b/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java index c37832344..bdb25b239 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/CommentItem.java @@ -34,7 +34,7 @@ public class CommentItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("/* " + comment + " */", writer); + return writer.append("/* " + comment + " */"); } public String getComment() { diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java index 618277c04..10d8ce3a7 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ContinueItem.java @@ -21,8 +21,8 @@ public class ContinueItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("continue ", writer); - return hilight("loop" + loopId, writer); + writer.append("continue "); + return writer.append("loop" + loopId); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java index 2bd8b8838..0b82355a6 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/DoWhileItem.java @@ -51,31 +51,31 @@ public class DoWhileItem extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("do", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("do").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight("while(", writer); + writer.unindent(); + writer.append("}").newLine(); + writer.append("while("); for (int i = 0; i < expression.size(); i++) { if (expression.get(i).isEmpty()) { continue; } if (i != 0) { - hilight(", ", writer); + writer.append(", "); } expression.get(i).toString(writer, localData); } - hilight(");", writer).appendNewLine(); - return hilight(":loop" + loop.id, writer); + writer.append(");").newLine(); + return writer.append(":loop" + loop.id); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java index dafb647de..0b29084ee 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ForItem.java @@ -52,8 +52,8 @@ public class ForItem extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("for(", writer); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("for("); int p = 0; for (int i = 0; i < firstCommands.size(); i++) { if (firstCommands.get(i).isEmpty()) { @@ -61,38 +61,38 @@ public class ForItem extends LoopItem implements Block { } if (p > 0) { - hilight(",", writer); + writer.append(","); } firstCommands.get(i).toString(writer, localData); writer.stripSemicolon(); p++; } - hilight(";", writer); + writer.append(";"); expression.toString(writer, localData); - hilight(";", writer); + writer.append(";"); p = 0; for (int i = 0; i < finalCommands.size(); i++) { if (finalCommands.get(i).isEmpty()) { continue; } if (p > 0) { - hilight(",", writer); + writer.append(","); } finalCommands.get(i).toString(writer, localData); writer.stripSemicolon(); p++; } - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight(":loop" + loop.id, writer).appendNewLine(); + writer.unindent(); + writer.append("}").newLine(); + writer.append(":loop" + loop.id).newLine(); return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java index 754aa2570..2e55a0b97 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IfItem.java @@ -71,30 +71,30 @@ public class IfItem extends GraphTargetItem implements Block { elseBranch = onTrue; } } - hilight("if(", writer); + writer.append("if("); expr.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : ifBranch) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); if (elseBranch.size() > 0) { - writer.appendNewLine(); - hilight("else", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.newLine(); + writer.append("else").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : elseBranch) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer); + writer.unindent(); + writer.append("}"); } return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java index 0a50ec898..b06110c4f 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/IntegerValueItem.java @@ -35,7 +35,7 @@ public class IntegerValueItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("" + intValue, writer); + return writer.append("" + intValue); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java b/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java index b84ae7e87..678bfdc20 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/ParenthesisItem.java @@ -35,9 +35,9 @@ public class ParenthesisItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("(", writer); + writer.append("("); value.toString(writer, localData); - return hilight(")", writer); + return writer.append(")"); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java index 4a52b7c18..df801caff 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/SwitchItem.java @@ -53,44 +53,44 @@ public class SwitchItem extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loopswitch" + loop.id + ":", writer).appendNewLine(); - hilight("switch(", writer); + writer.append("loopswitch" + loop.id + ":").newLine(); + writer.append("switch("); switchedObject.toString(writer, localData); - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (int i = 0; i < caseCommands.size(); i++) { for (int k = 0; k < valuesMapping.size(); k++) { if (valuesMapping.get(k) == i) { - hilight("case ", writer); + writer.append("case "); caseValues.get(k).toString(writer, localData); - hilight(":", writer).appendNewLine(); + writer.append(":").newLine(); } } - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.indent(); for (int j = 0; j < caseCommands.get(i).size(); j++) { if (!caseCommands.get(i).get(j).isEmpty()) { - caseCommands.get(i).get(j).toStringSemicoloned(writer, localData).appendNewLine(); + caseCommands.get(i).get(j).toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); + writer.unindent(); } if (defaultCommands != null) { if (defaultCommands.size() > 0) { - hilight("default", writer); - hilight(":", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append("default"); + writer.append(":").newLine(); + writer.indent(); for (int j = 0; j < defaultCommands.size(); j++) { if (!defaultCommands.get(j).isEmpty()) { - defaultCommands.get(j).toStringSemicoloned(writer, localData).appendNewLine(); + defaultCommands.get(j).toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); + writer.unindent(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight(":loop" + loop.id, writer); + writer.unindent(); + writer.append("}").newLine(); + writer.append(":loop" + loop.id); return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java index 11cb57533..f294e642e 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/TernarOpItem.java @@ -38,9 +38,9 @@ public class TernarOpItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { expression.toString(writer, localData); - hilight("?", writer); + writer.append("?"); onTrue.toString(writer, localData); - hilight(":", writer); + writer.append(":"); onFalse.toString(writer, localData); return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java b/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java index adf7f8a94..8dc6b75c5 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/TrueItem.java @@ -16,7 +16,7 @@ public class TrueItem extends GraphTargetItem { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - return hilight("true", writer); + return writer.append("true"); } @Override diff --git a/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java index 30ef4983e..077d3f800 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UnaryOpItem.java @@ -35,17 +35,17 @@ public abstract class UnaryOpItem extends GraphTargetItem implements UnaryOp { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight(operator, writer); + writer.append(operator); if (value != null) { if (value.precedence > precedence) { - hilight("(", writer); + writer.append("("); value.toString(writer, localData); - hilight(")", writer); + writer.append(")"); } else { value.toString(writer, localData); } } else { - hilight("null", writer); + writer.append("null"); } return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java index baf78d90b..8afe489ce 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/UniversalLoopItem.java @@ -39,18 +39,18 @@ public class UniversalLoopItem extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("while(true)", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("while(true)").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight(":loop" + loop.id, writer); + writer.unindent(); + writer.append("}").newLine(); + writer.append(":loop" + loop.id); return writer; } diff --git a/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java index 104791901..433c2582e 100644 --- a/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/model/WhileItem.java @@ -46,28 +46,28 @@ public class WhileItem extends LoopItem implements Block { @Override protected HilightedTextWriter appendTo(HilightedTextWriter writer, LocalData localData) { - hilight("loop" + loop.id + ":", writer).appendNewLine(); - hilight("while(", writer); + writer.append("loop" + loop.id + ":").newLine(); + writer.append("while("); for (int i = 0; i < expression.size(); i++) { if (expression.get(i).isEmpty()) { continue; } if (i != 0) { - hilight(", ", writer); + writer.append(", "); } expression.get(i).toString(writer, localData); } - hilight(")", writer).appendNewLine(); - hilight("{", writer).appendNewLine(); - hilight(Graph.INDENTOPEN, writer).appendNewLine(); + writer.append(")").newLine(); + writer.append("{").newLine(); + writer.indent(); for (GraphTargetItem ti : commands) { if (!ti.isEmpty()) { - ti.toStringSemicoloned(writer, localData).appendNewLine(); + ti.toStringSemicoloned(writer, localData).newLine(); } } - hilight(Graph.INDENTCLOSE, writer).appendNewLine(); - hilight("}", writer).appendNewLine(); - hilight(":loop" + loop.id, writer); + writer.unindent(); + writer.append("}").newLine(); + writer.append(":loop" + loop.id); return writer; }