diff --git a/trunk/lib/flamingo-6.2.jar b/trunk/lib/flamingo-6.2.jar new file mode 100644 index 000000000..3ab39069e Binary files /dev/null and b/trunk/lib/flamingo-6.2.jar differ diff --git a/trunk/lib/substance-6.2.jar b/trunk/lib/substance-6.2.jar new file mode 100644 index 000000000..ebbf8cec4 Binary files /dev/null and b/trunk/lib/substance-6.2.jar differ diff --git a/trunk/lib/substance-flamingo-6.2.jar b/trunk/lib/substance-flamingo-6.2.jar new file mode 100644 index 000000000..543793aa0 Binary files /dev/null and b/trunk/lib/substance-flamingo-6.2.jar differ diff --git a/trunk/lib/trident-6.2.jar b/trunk/lib/trident-6.2.jar new file mode 100644 index 000000000..5300a3516 Binary files /dev/null and b/trunk/lib/trident-6.2.jar differ diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index 97ea8fed2..a9e8aed6c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -23,6 +23,13 @@ import com.jpexs.decompiler.flash.abc.RenameType; import com.jpexs.decompiler.flash.abc.ScriptPack; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraphSource; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; import com.jpexs.decompiler.flash.action.swf4.ActionEquals; import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable; import com.jpexs.decompiler.flash.action.swf4.ActionIf; @@ -41,22 +48,11 @@ import com.jpexs.decompiler.flash.action.swf5.ActionNewMethod; import com.jpexs.decompiler.flash.action.swf5.ActionNewObject; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; -import com.jpexs.decompiler.flash.action.model.ConstantPool; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.FunctionActionItem; -import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; -import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; -import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; -import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.flv.AUDIODATA; import com.jpexs.decompiler.flash.flv.FLVOutputStream; import com.jpexs.decompiler.flash.flv.FLVTAG; import com.jpexs.decompiler.flash.flv.VIDEODATA; -import com.jpexs.decompiler.graph.Graph; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Cache; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.collections.MyEntry; @@ -98,6 +94,10 @@ import com.jpexs.decompiler.flash.types.filters.Filtering; import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; import com.jpexs.decompiler.flash.types.sound.AdpcmDecoder; import com.jpexs.decompiler.flash.xfl.XFLConverter; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Graphics2D; diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index 0beef39bd..8cee77563 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -18,6 +18,8 @@ package com.jpexs.decompiler.flash; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraphSource; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.special.ActionEnd; import com.jpexs.decompiler.flash.action.special.ActionNop; import com.jpexs.decompiler.flash.action.special.ActionStore; @@ -26,14 +28,8 @@ import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.swf6.*; import com.jpexs.decompiler.flash.action.swf7.*; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.graph.Graph; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphSourceItemContainer; -import com.jpexs.decompiler.graph.GraphSourceItemPos; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.*; @@ -52,6 +48,11 @@ import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord; import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord; import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; +import com.jpexs.decompiler.graph.GraphSourceItemPos; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -70,7 +71,6 @@ import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.InflaterInputStream; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; /** * Class for reading data from SWF file diff --git a/trunk/src/com/jpexs/decompiler/flash/TagNode.java b/trunk/src/com/jpexs/decompiler/flash/TagNode.java index a2f089254..003e98134 100644 --- a/trunk/src/com/jpexs/decompiler/flash/TagNode.java +++ b/trunk/src/com/jpexs/decompiler/flash/TagNode.java @@ -17,7 +17,6 @@ package com.jpexs.decompiler.flash; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag; @@ -48,6 +47,7 @@ import com.jpexs.decompiler.flash.tags.Tag; import com.jpexs.decompiler.flash.tags.base.ASMSource; import com.jpexs.decompiler.flash.tags.base.Container; import com.jpexs.decompiler.flash.tags.base.Exportable; +import com.jpexs.decompiler.graph.Graph; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; 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 22f0b4fcf..bd761e3df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -56,10 +56,10 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.other.*; import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.*; import com.jpexs.decompiler.flash.abc.avm2.instructions.types.*; import com.jpexs.decompiler.flash.abc.avm2.instructions.xml.*; -import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; -import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; import com.jpexs.decompiler.flash.abc.avm2.model.*; import com.jpexs.decompiler.flash.abc.avm2.model.clauses.*; +import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; +import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; import com.jpexs.decompiler.flash.abc.types.ABCException; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; @@ -68,12 +68,12 @@ import com.jpexs.decompiler.flash.abc.types.traits.Trait; import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import com.jpexs.decompiler.flash.abc.types.traits.Traits; import com.jpexs.decompiler.flash.ecma.EcmaScript; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; -import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.*; import java.util.*; import java.util.logging.Level; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java index 746db2c6c..adf677bc6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java @@ -49,14 +49,14 @@ import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictEqAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.StrictNeqAVM2Item; import com.jpexs.decompiler.flash.abc.types.ABCException; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.graph.model.BreakItem; import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphPartMulti; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.IfItem; import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.IfItem; import com.jpexs.decompiler.graph.model.LoopItem; import com.jpexs.decompiler.graph.model.NotItem; import com.jpexs.decompiler.graph.model.SwitchItem; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index b82b294a6..d516e065b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -27,10 +27,10 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnVoidIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ThrowIns; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Serializable; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java index 371350e55..7246ec08d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java @@ -25,11 +25,11 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.DecLocalIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.IncLocalIIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.IncLocalIns; import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.SetLocalTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java index 185b8eff0..64f40609f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java @@ -23,8 +23,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.model.UnparsedAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java index 0a05b3770..d7a6c4abe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java @@ -24,8 +24,8 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.model.NewFunctionAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java index 78694c05a..9e7ed6b59 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java @@ -26,11 +26,8 @@ import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.UndefinedAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.graph.GraphTargetItem; -import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.Stack; public abstract class GetLocalTypeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java index 6477bb1b4..6f8e5afaf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java @@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.FindPropertyAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.IncrementAVM2Item; @@ -31,7 +32,6 @@ import com.jpexs.decompiler.flash.abc.avm2.model.NotCompileTimeAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.PostDecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.PostIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetLocalAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; @@ -51,7 +51,7 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S int regId = getRegisterId(ins); GraphTargetItem value = (GraphTargetItem) stack.pop(); if (localRegs.containsKey(regId)) { - localRegs.put(regId, new NotCompileTimeAVM2Item(ins, value)); + localRegs.put(regId, new NotCompileTimeAVM2Item(ins, value)); } else { localRegs.put(regId, value); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java index 307984265..0a00396a1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; -import com.jpexs.decompiler.flash.abc.avm2.model.SetGlobalSlotAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.SetGlobalSlotAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java index 4beae26cf..178dd829d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java @@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.GetPropertyAVM2Item; @@ -30,7 +31,6 @@ import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.PostDecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.PostIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetPropertyAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java index c35b35964..4fad7ae7d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java @@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.ClassAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.DecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.GetSlotAVM2Item; @@ -33,7 +34,6 @@ import com.jpexs.decompiler.flash.abc.avm2.model.PostIncrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.ScriptAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetSlotAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.ThisAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.clauses.ExceptionAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreDecrementAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.operations.PreIncrementAVM2Item; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java index 8d25b56ff..585778eec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetSuperAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java index 5f206f8f5..8bc86e09b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java @@ -23,8 +23,8 @@ import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; import com.jpexs.decompiler.flash.abc.types.MethodInfo; -import com.jpexs.decompiler.graph.model.DuplicateItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.DuplicateItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java index cfceb7111..1093ec52f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java @@ -16,17 +16,17 @@ */ package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -import com.jpexs.decompiler.flash.abc.avm2.model.CallAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.CallMethodAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.CallPropertyAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.CallSuperAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.CallStaticAVM2Item; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.model.CallAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallMethodAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallPropertyAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallStaticAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.CallSuperAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.graph.GraphTargetItem; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java index 604fb0374..51112b1aa 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java @@ -21,8 +21,8 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.decompiler.flash.abc.avm2.model.WithObjectAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.WithAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.WithObjectAVM2Item; import com.jpexs.decompiler.flash.abc.types.MethodBody; import com.jpexs.decompiler.flash.abc.types.MethodInfo; import com.jpexs.decompiler.graph.GraphTargetItem; 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 efd739b02..e8c127af5 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 @@ -18,11 +18,10 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; -import java.io.Serializable; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 da48e2e56..bf84f7a29 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 ff69fc30f..a386b997f 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 b36e13eb9..8ab2a4947 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 a0b85cf57..6ee157d51 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 04e9a8754..e1d9c30e3 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 fa51c8169..af61fc47c 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 d1f9a2cb7..8efe57ed9 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 8dcb7f5f9..a1bfa5f0e 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java index e27ce505b..0a09d5998 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/FilteredCheckAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 751bf1ae8..c2c7330a3 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 9864a01bc..c2015f6ba 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 39bb8c30e..4bb1b6a0e 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 @@ -20,8 +20,8 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.model.clauses.FilterAVM2Item; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 9bdcc85ce..0ec598bb0 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 b5a1d0bba..9545b5b86 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 b406c6aef..45ad2b406 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 @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 5489d6c24..af66b2c56 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 @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.abc.avm2.model.clauses.AssignmentAVM2Item; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 bfe6e6390..512969ee2 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 @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.graph.Graph; -import com.jpexs.decompiler.graph.model.ExitItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.ExitItem; import java.util.HashMap; import java.util.List; 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 fdb0a9119..1e0acf465 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 @@ -18,9 +18,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; 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 9fcbb3e06..ee2df4fc3 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 @@ -17,13 +17,13 @@ package com.jpexs.decompiler.flash.abc.avm2.model.clauses; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.CoerceAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.ConvertAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetLocalAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetSlotAVM2Item; -import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; 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 7fe9aa6a4..dfe22df4e 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 @@ -16,14 +16,14 @@ */ package com.jpexs.decompiler.flash.abc.avm2.model.clauses; -import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.InAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetTypeAVM2Item; import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.LoopItem; import java.util.ArrayList; import java.util.List; 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 bf1b66a8f..5c2b74577 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 @@ -16,14 +16,14 @@ */ package com.jpexs.decompiler.flash.abc.avm2.model.clauses; -import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.InAVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.LocalRegAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.SetTypeAVM2Item; import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.LoopItem; import java.util.ArrayList; import java.util.List; 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 c51d53e0a..128c499b2 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 @@ -19,10 +19,10 @@ package com.jpexs.decompiler.flash.abc.avm2.model.clauses; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; import com.jpexs.decompiler.flash.abc.types.ABCException; -import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.Block; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.ContinueItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 e678429e5..cb1744894 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 @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.EcmaType; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class AddAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java index 07027bfb9..ee378c8b0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AndAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class AndAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java index e4c3df0ef..5b7762919 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/AsTypeAVM2Item.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class AsTypeAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java index 1873bc899..dce00324e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitAndAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class BitAndAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java index 674228182..31b0eb2a6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitOrAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class BitOrAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java index d887f2178..937a58ba8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/BitXorAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class BitXorAVM2Item extends BinaryOpItem { 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 7b4795706..6216462fb 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.flash.abc.avm2.model.AVM2Item; +import com.jpexs.decompiler.flash.abc.avm2.model.FullMultinameAVM2Item; import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java index 52871c0f8..3f671e184 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/DivideAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class DivideAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java index b80de4f45..435433954 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/EqAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class EqAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java index 6eb7f1e5e..cd9688cd4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GeAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class GeAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java index 18a74c900..4d3c46a75 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/GtAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class GtAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java index 70a7c6f5e..1b27ea08d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InAVM2Item.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class InAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java index c43260141..11c28ad99 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/InstanceOfAVM2Item.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class InstanceOfAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java index d80f13d0b..60b67830d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/IsTypeAVM2Item.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class IsTypeAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java index 4c584e329..6b864aeba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LShiftAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class LShiftAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java index cee123f85..a744e839b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LeAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class LeAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java index 3c692bab5..9ee452120 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/LtAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class LtAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java index 234929198..afb1360d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/ModuloAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class ModuloAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java index eaa52c79f..64dcf439e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/MultiplyAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class MultiplyAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java index 8e4cd65d9..8a7e00dd9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/NeqAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class NeqAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java index ba3cc06f5..67affec4a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/OrAVM2Item.java @@ -18,9 +18,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class OrAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java index 2afe946a5..e97d2bf17 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/RShiftAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class RShiftAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java index 4ac5b7f01..fd0590abe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictEqAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class StrictEqAVM2Item extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java index a273e56e8..960e11cc9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/StrictNeqAVM2Item.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.model.LogicalOpItem; public class StrictNeqAVM2Item extends BinaryOpItem implements LogicalOpItem { 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 4671af0a2..6809dc1bd 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 @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class SubtractAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java index faee17ec1..9c932bd88 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/model/operations/URShiftAVM2Item.java @@ -18,8 +18,8 @@ package com.jpexs.decompiler.flash.abc.avm2.model.operations; import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import com.jpexs.decompiler.flash.ecma.EcmaScript; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class URShiftAVM2Item extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java index 658b54eb9..29f6b20c5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; import com.jpexs.decompiler.flash.abc.avm2.CodeStats; import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.traits.Traits; -import com.jpexs.decompiler.graph.Graph; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java index bf611fd51..342c9685a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java @@ -31,10 +31,10 @@ import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.NamespaceSet; import com.jpexs.decompiler.flash.abc.types.ScriptInfo; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.ABCContainerTag; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java index bf5ef4432..d9fa597ab 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java @@ -18,9 +18,9 @@ package com.jpexs.decompiler.flash.abc.types.traits; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.ABCContainerTag; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java index a83a4109d..e9a4c32d1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java @@ -18,9 +18,9 @@ package com.jpexs.decompiler.flash.abc.types.traits; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.types.MethodBody; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.ABCContainerTag; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java index 243072d2e..9d2cdb3b9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java @@ -21,11 +21,11 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.ValueKind; -import com.jpexs.decompiler.graph.Graph; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.ABCContainerTag; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index 2c903f6e1..2ecbbae77 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -16,29 +16,28 @@ */ package com.jpexs.decompiler.flash.action; -import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; -import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; -import com.jpexs.decompiler.flash.action.model.FunctionActionItem; -import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; -import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; -import com.jpexs.decompiler.flash.action.model.SetPropertyActionItem; -import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; -import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; -import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; -import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; -import com.jpexs.decompiler.flash.action.model.ExtendsActionItem; -import com.jpexs.decompiler.flash.action.model.NewObjectActionItem; -import com.jpexs.decompiler.flash.action.model.ConstantPool; -import com.jpexs.decompiler.flash.action.model.ImplementsOpActionItem; -import com.jpexs.decompiler.flash.action.model.SetMemberActionItem; -import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.UnsupportedActionItem; -import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.DisassemblyListener; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.ExtendsActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.ImplementsOpActionItem; +import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; +import com.jpexs.decompiler.flash.action.model.NewObjectActionItem; +import com.jpexs.decompiler.flash.action.model.SetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.SetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.flash.action.model.UnsupportedActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.InterfaceActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser; @@ -48,18 +47,18 @@ import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.graph.model.CommentItem; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.model.CommentItem; import com.jpexs.decompiler.graph.model.IfItem; import com.jpexs.decompiler.graph.model.NotItem; import com.jpexs.decompiler.graph.model.ScriptEndItem; -import com.jpexs.decompiler.flash.helpers.Helper; -import com.jpexs.decompiler.flash.helpers.Highlighting; -import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java index 3455a8b00..54ffee0e6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java @@ -16,14 +16,6 @@ */ package com.jpexs.decompiler.flash.action; -import com.jpexs.decompiler.flash.action.swf4.ActionEquals; -import com.jpexs.decompiler.flash.action.swf4.ActionIf; -import com.jpexs.decompiler.flash.action.swf4.ActionNot; -import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; -import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; -import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.model.EnumerateActionItem; import com.jpexs.decompiler.flash.action.model.FunctionActionItem; @@ -35,15 +27,23 @@ import com.jpexs.decompiler.flash.action.model.clauses.ForInActionItem; import com.jpexs.decompiler.flash.action.model.clauses.TellTargetActionItem; import com.jpexs.decompiler.flash.action.model.operations.NeqActionItem; import com.jpexs.decompiler.flash.action.model.operations.StrictEqActionItem; +import com.jpexs.decompiler.flash.action.swf4.ActionEquals; +import com.jpexs.decompiler.flash.action.swf4.ActionIf; +import com.jpexs.decompiler.flash.action.swf4.ActionNot; +import com.jpexs.decompiler.flash.action.swf4.ActionPush; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; +import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; +import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; +import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.ecma.Null; -import com.jpexs.decompiler.graph.model.BreakItem; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.Loop; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.SwitchItem; import com.jpexs.decompiler.graph.model.WhileItem; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java index 6edd2c8a5..bbd2ce2ab 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java @@ -1,10 +1,10 @@ package com.jpexs.decompiler.flash.action; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphPart; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java index 7f809da0d..e1c3b8e64 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.action.flashlite; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.StrictModeActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.model.StrictModeActionItem; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; 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 20a84fa13..9277f63fe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ActionItem.java @@ -20,7 +20,6 @@ import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import static com.jpexs.decompiler.graph.GraphTargetItem.PRECEDENCE_PRIMARY; import com.jpexs.decompiler.graph.SourceGenerator; import java.io.Serializable; import java.util.ArrayList; 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 724baee53..820c3342d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/CastOpActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf7.ActionCastOp; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class CastOpActionItem extends ActionItem { 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 088f584be..11037cd1d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/DirectValueActionItem.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.List; import java.util.Objects; 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 69e7bc4ba..87dca392b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/EnumerateActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class EnumerateActionItem extends ActionItem { 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 3e175ed26..b93c873f9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FSCommandActionItem.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; /** 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 9661eda8f..7bd528e62 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/FunctionActionItem.java @@ -24,11 +24,11 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionDefineFunction; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 175060540..9d9fb758e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetURLActionItem.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGetURL; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class GetURLActionItem extends ActionItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java index e2d3c7f9c..1cea1af2c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java @@ -116,8 +116,6 @@ public class GetVariableActionItem extends ActionItem { } return true; } - - @Override public List toSource(List localData, SourceGenerator generator) { 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 480a0132c..da058d829 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GotoLabelActionItem.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf3.ActionGoToLabel; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class GotoLabelActionItem extends ActionItem { 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 63064077a..c016f57b0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ImplementsOpActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class ImplementsOpActionItem extends ActionItem { 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 c5e080ba5..26bd8363f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieNumActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 fad0b0379..015d43ca0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadVariablesNumActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 2fd6ea9e2..86ef313c1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostDecrementActionItem.java @@ -16,6 +16,7 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem; import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; @@ -24,7 +25,6 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionDecrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 7f825a9a2..e3c10c5d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PostIncrementActionItem.java @@ -16,6 +16,7 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.swf4.ActionPop; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; @@ -24,7 +25,6 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionIncrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 1b63cbb5f..a4b81d2f1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 37268a6e7..5607a78d8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import static com.jpexs.decompiler.graph.GraphTargetItem.PRECEDENCE_PRIMARY; 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 6964b719c..4e1fa03e7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintAsBitmapNumActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 062424cd2..e1f8c3056 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/PrintNumActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 6509f4524..387f6c82a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ReturnActionItem.java @@ -26,10 +26,10 @@ import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.action.swf5.ActionReturn; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.graph.model.ExitItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.ExitItem; import java.util.ArrayList; import java.util.List; 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 2ea37f308..8cc5c3430 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/SetTargetActionItem.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class SetTargetActionItem extends ActionItem { 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 150987b61..c9938e640 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ThrowActionItem.java @@ -17,11 +17,11 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf7.ActionThrow; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemPos; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class ThrowActionItem extends ActionItem { 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 3dfea925e..aa092a6df 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToNumberActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionToNumber; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class ToNumberActionItem extends ActionItem { 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 af0e7006c..4e510f973 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/ToStringActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionToString; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class ToStringActionItem extends ActionItem { 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 2d312b5b0..a34c962c8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/TypeOfActionItem.java @@ -19,10 +19,10 @@ package com.jpexs.decompiler.flash.action.model; import com.jpexs.decompiler.flash.action.swf5.ActionTypeOf; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.ecma.EcmaType; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class TypeOfActionItem extends ActionItem { 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 ad57533e3..7a46ce692 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/UnLoadMovieNumActionItem.java @@ -16,10 +16,10 @@ */ package com.jpexs.decompiler.flash.action.model; +import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionGetURL2; import com.jpexs.decompiler.flash.action.swf4.ActionPush; -import com.jpexs.decompiler.flash.action.model.operations.AddActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 4c72ab147..28064ff5b 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 @@ -17,16 +17,16 @@ package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.flash.helpers.Helper; -import com.jpexs.decompiler.flash.helpers.collections.MyEntry; +import com.jpexs.decompiler.graph.model.ContinueItem; import java.util.ArrayList; import java.util.List; 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 c0ff95409..1ae93ba0d 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 @@ -18,6 +18,8 @@ package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionIf; import com.jpexs.decompiler.flash.action.swf4.ActionJump; @@ -28,15 +30,13 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf6.ActionEnumerate2; -import com.jpexs.decompiler.flash.action.model.ConstantPool; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.Loop; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.ContinueItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 28f70ba73..c8ec154dd 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 @@ -16,15 +16,15 @@ */ package com.jpexs.decompiler.flash.action.model.clauses; -import com.jpexs.decompiler.flash.action.swf4.ActionWaitForFrame2; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.swf4.ActionWaitForFrame2; import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.ContinueItem; import java.util.ArrayList; import java.util.List; 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 85c7a1856..e25eb8a90 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 @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 282a5a2a9..191732ed5 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 @@ -16,8 +16,8 @@ */ package com.jpexs.decompiler.flash.action.model.clauses; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.swf3.ActionSetTarget; import com.jpexs.decompiler.flash.action.swf4.ActionSetTarget2; import com.jpexs.decompiler.graph.GraphSourceItem; 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 4ad1d3eb6..703e55a95 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 @@ -18,16 +18,16 @@ package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionJump; import com.jpexs.decompiler.flash.action.swf7.ActionTry; -import com.jpexs.decompiler.flash.action.model.ConstantPool; -import com.jpexs.decompiler.flash.action.model.ActionItem; import com.jpexs.decompiler.graph.Block; -import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.ContinueItem; import java.util.ArrayList; import java.util.List; 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 f0695a26d..dd764f4ee 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 @@ -18,9 +18,9 @@ package com.jpexs.decompiler.flash.action.model.clauses; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.swf5.ActionWith; -import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.ConstantPool; +import com.jpexs.decompiler.flash.action.swf5.ActionWith; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; 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 ac66084d2..e48563294 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 @@ -19,10 +19,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionAdd2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class AddActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java index 3ad5f8e9a..09f4e9d30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/AndActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionAnd; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class AndActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java index 6468aea38..ac923bed9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitAndActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitAnd; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class BitAndActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java index dbf92e34c..c6e89761e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitOrActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitOr; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class BitOrActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java index f8bbfc33e..35aa9579c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/BitXorActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitXor; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class BitXorActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java index 6624202af..80f05efa5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/DivideActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionDivide; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class DivideActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java index 66c2707df..0d1ac1a21 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/EqActionItem.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class EqActionItem extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java index 9917c05f9..2c99c65d0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GeActionItem.java @@ -20,11 +20,11 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf5.ActionLess2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class GeActionItem extends BinaryOpItem implements LogicalOpItem, Inverted { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java index 50e29b59e..26d31364a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/GtActionItem.java @@ -18,11 +18,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf6.ActionGreater; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class GtActionItem extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java index 3a430acb0..eeffd8bd9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InActionItem.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.model.ActionItem; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.model.BinaryOpItem; public class InActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java index f9c268912..8653ebaa7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/InstanceOfActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf6.ActionInstanceOf; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class InstanceOfActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java index 4e51fd897..8264fdde4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LShiftActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitLShift; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class LShiftActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java index f1ec618ef..017871ad5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LeActionItem.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf6.ActionGreater; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class LeActionItem extends BinaryOpItem implements LogicalOpItem, Inverted { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java index 6cf72a0dd..3feaeaa4f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/LtActionItem.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf5.ActionLess2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class LtActionItem extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java index 5bc637fd3..5414be495 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/ModuloActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionModulo; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class ModuloActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java index 98c0c00df..0371e1fb0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/MultiplyActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionMultiply; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class MultiplyActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java index 814c8bfe1..a8cb6f492 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/NeqActionItem.java @@ -20,11 +20,11 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf5.ActionEquals2; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class NeqActionItem extends BinaryOpItem implements LogicalOpItem, Inverted { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java index ca1406b30..da721ebe9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/OrActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionOr; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class OrActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java index 8da277b14..0cbd07578 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreDecrementActionItem.java @@ -16,6 +16,10 @@ */ package com.jpexs.decompiler.flash.action.model.operations; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; @@ -24,10 +28,6 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionDecrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; -import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; -import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.ecma.*; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java index 1a7133c9b..e8d46f81d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/PreIncrementActionItem.java @@ -16,6 +16,10 @@ */ package com.jpexs.decompiler.flash.action.model.operations; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ActionSetProperty; @@ -24,10 +28,6 @@ import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.swf5.ActionIncrement; import com.jpexs.decompiler.flash.action.swf5.ActionSetMember; import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; -import com.jpexs.decompiler.flash.action.model.GetPropertyActionItem; -import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.ecma.*; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java index 5c7ccc05b..c866a9e62 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/RShiftActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitRShift; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class RShiftActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java index 828cce803..a4d438ee1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictEqActionItem.java @@ -18,11 +18,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class StrictEqActionItem extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java index a834cb170..0f9558885 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StrictNeqActionItem.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionNot; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; import java.util.List; public class StrictNeqActionItem extends BinaryOpItem implements LogicalOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java index 2ce5e865f..15579b5be 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringAddActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionStringAdd; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class StringAddActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java index 8c5dbd3aa..e54d15cf3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringEqActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionStringEquals; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class StringEqActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java index d02a44e13..256536372 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/StringLtActionItem.java @@ -17,10 +17,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionStringLess; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class StringLtActionItem extends BinaryOpItem { 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 3e102e23e..2505fbe0e 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 @@ -17,12 +17,11 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf4.ActionSubtract; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class SubtractActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java index d49842944..d2afcba00 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/model/operations/URShiftActionItem.java @@ -18,10 +18,10 @@ package com.jpexs.decompiler.flash.action.model.operations; import com.jpexs.decompiler.flash.action.swf5.ActionBitURShift; import com.jpexs.decompiler.flash.ecma.*; -import com.jpexs.decompiler.graph.model.BinaryOpItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.BinaryOpItem; import java.util.List; public class URShiftActionItem extends BinaryOpItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java index 12d53ad61..a2588a0b4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java @@ -27,8 +27,8 @@ import com.jpexs.decompiler.flash.action.swf4.*; import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.swf6.*; import com.jpexs.decompiler.flash.action.swf7.*; -import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphSourceItemContainer; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java index b70f58bec..64165e443 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java @@ -17,13 +17,10 @@ package com.jpexs.decompiler.flash.action.parser.script; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.ParseException; -import com.jpexs.decompiler.flash.action.swf4.*; -import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.action.model.AsciiToCharActionItem; +import com.jpexs.decompiler.flash.action.model.CallActionItem; import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; import com.jpexs.decompiler.flash.action.model.CallMethodActionItem; -import com.jpexs.decompiler.flash.action.model.CallActionItem; import com.jpexs.decompiler.flash.action.model.CharToAsciiActionItem; import com.jpexs.decompiler.flash.action.model.CloneSpriteActionItem; import com.jpexs.decompiler.flash.action.model.ConstantPool; @@ -41,10 +38,10 @@ import com.jpexs.decompiler.flash.action.model.GetVersionActionItem; import com.jpexs.decompiler.flash.action.model.GotoFrame2ActionItem; import com.jpexs.decompiler.flash.action.model.InitArrayActionItem; import com.jpexs.decompiler.flash.action.model.InitObjectActionItem; -import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.LoadMovieActionItem; -import com.jpexs.decompiler.flash.action.model.LoadVariablesNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.LoadVariablesActionItem; +import com.jpexs.decompiler.flash.action.model.LoadVariablesNumActionItem; import com.jpexs.decompiler.flash.action.model.MBAsciiToCharActionItem; import com.jpexs.decompiler.flash.action.model.MBCharToAsciiActionItem; import com.jpexs.decompiler.flash.action.model.MBStringExtractActionItem; @@ -56,19 +53,19 @@ import com.jpexs.decompiler.flash.action.model.PlayActionItem; import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; import com.jpexs.decompiler.flash.action.model.PrevFrameActionItem; -import com.jpexs.decompiler.flash.action.model.PrintAsBitmapNumActionItem; -import com.jpexs.decompiler.flash.action.model.PrintAsBitmapActionItem; -import com.jpexs.decompiler.flash.action.model.PrintNumActionItem; import com.jpexs.decompiler.flash.action.model.PrintActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintNumActionItem; import com.jpexs.decompiler.flash.action.model.RandomNumberActionItem; import com.jpexs.decompiler.flash.action.model.RemoveSpriteActionItem; import com.jpexs.decompiler.flash.action.model.ReturnActionItem; import com.jpexs.decompiler.flash.action.model.SetMemberActionItem; import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; import com.jpexs.decompiler.flash.action.model.StartDragActionItem; +import com.jpexs.decompiler.flash.action.model.StopActionItem; import com.jpexs.decompiler.flash.action.model.StopAllSoundsActionItem; import com.jpexs.decompiler.flash.action.model.StopDragActionItem; -import com.jpexs.decompiler.flash.action.model.StopActionItem; import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; import com.jpexs.decompiler.flash.action.model.StringExtractActionItem; import com.jpexs.decompiler.flash.action.model.StringLengthActionItem; @@ -79,8 +76,8 @@ import com.jpexs.decompiler.flash.action.model.ToStringActionItem; import com.jpexs.decompiler.flash.action.model.ToggleHighQualityActionItem; import com.jpexs.decompiler.flash.action.model.TraceActionItem; import com.jpexs.decompiler.flash.action.model.TypeOfActionItem; -import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.UnLoadMovieActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.clauses.ClassActionItem; import com.jpexs.decompiler.flash.action.model.clauses.ForInActionItem; import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; @@ -107,8 +104,14 @@ import com.jpexs.decompiler.flash.action.model.operations.PreIncrementActionItem import com.jpexs.decompiler.flash.action.model.operations.StrictEqActionItem; import com.jpexs.decompiler.flash.action.model.operations.StrictNeqActionItem; import com.jpexs.decompiler.flash.action.model.operations.SubtractActionItem; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.swf4.*; +import com.jpexs.decompiler.flash.action.swf5.*; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; +import com.jpexs.decompiler.flash.helpers.collections.MyEntry; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.model.AndItem; import com.jpexs.decompiler.graph.model.BinaryOp; import com.jpexs.decompiler.graph.model.BlockItem; @@ -117,8 +120,6 @@ import com.jpexs.decompiler.graph.model.CommaExpressionItem; import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.DoWhileItem; import com.jpexs.decompiler.graph.model.ForItem; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.model.IfItem; import com.jpexs.decompiler.graph.model.NotItem; import com.jpexs.decompiler.graph.model.OrItem; @@ -126,7 +127,6 @@ import com.jpexs.decompiler.graph.model.ParenthesisItem; import com.jpexs.decompiler.graph.model.SwitchItem; import com.jpexs.decompiler.graph.model.TernarOpItem; import com.jpexs.decompiler.graph.model.WhileItem; -import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java index bb0a25e76..84dce690c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java @@ -18,6 +18,11 @@ package com.jpexs.decompiler.flash.action.parser.script; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; +import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; +import com.jpexs.decompiler.flash.action.model.operations.Inverted; import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable; import com.jpexs.decompiler.flash.action.swf4.ActionIf; import com.jpexs.decompiler.flash.action.swf4.ActionJump; @@ -37,12 +42,12 @@ import com.jpexs.decompiler.flash.action.swf5.ActionStoreRegister; import com.jpexs.decompiler.flash.action.swf6.ActionStrictEquals; import com.jpexs.decompiler.flash.action.swf7.ActionExtends; import com.jpexs.decompiler.flash.action.swf7.ActionImplementsOp; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.FunctionActionItem; -import com.jpexs.decompiler.flash.action.model.GetMemberActionItem; -import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; -import com.jpexs.decompiler.flash.action.model.operations.Inverted; import com.jpexs.decompiler.flash.ecma.Null; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.collections.MyEntry; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.model.AndItem; import com.jpexs.decompiler.graph.model.BreakItem; import com.jpexs.decompiler.graph.model.CommaExpressionItem; @@ -50,17 +55,12 @@ import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.DoWhileItem; import com.jpexs.decompiler.graph.model.DuplicateItem; import com.jpexs.decompiler.graph.model.ForItem; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.model.IfItem; import com.jpexs.decompiler.graph.model.NotItem; import com.jpexs.decompiler.graph.model.OrItem; -import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.model.SwitchItem; import com.jpexs.decompiler.graph.model.TernarOpItem; import com.jpexs.decompiler.graph.model.WhileItem; -import com.jpexs.decompiler.flash.helpers.Helper; -import com.jpexs.decompiler.flash.helpers.collections.MyEntry; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java index c08659d2a..1d04f4c03 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java @@ -19,16 +19,16 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.ParseException; -import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.model.FSCommandActionItem; import com.jpexs.decompiler.flash.action.model.GetURLActionItem; import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; -import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.UnLoadMovieActionItem; -import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java index 1ba9431c4..a0f7affe7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.GotoLabelActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.model.GotoLabelActionItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java index b7664433f..a56fc5442 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.GotoFrameActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.model.GotoFrameActionItem; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java index f48b817bd..626618dcf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java @@ -19,11 +19,11 @@ package com.jpexs.decompiler.flash.action.swf3; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.SetTargetActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.model.SetTargetActionItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java index 67c5a366d..76ba554c2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java @@ -21,11 +21,11 @@ import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraph; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.special.ActionStore; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java index 421620832..48effecb2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java @@ -19,20 +19,20 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.ParseException; -import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.model.GetURL2ActionItem; -import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.LoadMovieActionItem; -import com.jpexs.decompiler.flash.action.model.LoadVariablesNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadMovieNumActionItem; import com.jpexs.decompiler.flash.action.model.LoadVariablesActionItem; -import com.jpexs.decompiler.flash.action.model.PrintAsBitmapNumActionItem; -import com.jpexs.decompiler.flash.action.model.PrintAsBitmapActionItem; -import com.jpexs.decompiler.flash.action.model.PrintNumActionItem; +import com.jpexs.decompiler.flash.action.model.LoadVariablesNumActionItem; import com.jpexs.decompiler.flash.action.model.PrintActionItem; -import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapActionItem; +import com.jpexs.decompiler.flash.action.model.PrintAsBitmapNumActionItem; +import com.jpexs.decompiler.flash.action.model.PrintNumActionItem; import com.jpexs.decompiler.flash.action.model.UnLoadMovieActionItem; +import com.jpexs.decompiler.flash.action.model.UnLoadMovieNumActionItem; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java index 6b2947033..5348f106f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.model.EvalActionItem; import com.jpexs.decompiler.flash.action.model.GetVariableActionItem; import com.jpexs.decompiler.flash.action.model.GetVersionActionItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java index bb9f7ffe3..a125a807c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.GotoFrame2ActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.model.GotoFrame2ActionItem; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index bb43d9fcc..136e478d3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraphSource; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java index be0432683..4f49c2351 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java @@ -22,9 +22,9 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraphSource; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSource; import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java index 21ed9cfb6..9be98743f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java @@ -17,11 +17,7 @@ package com.jpexs.decompiler.flash.action.swf4; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; -import com.jpexs.decompiler.flash.action.model.CallMethodActionItem; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.NewMethodActionItem; -import com.jpexs.decompiler.flash.action.model.SetTypeActionItem; import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; @@ -44,8 +40,8 @@ public class ActionPop extends Action { return; } GraphTargetItem val = stack.pop(); - if(val instanceof DirectValueActionItem){ - if(((DirectValueActionItem)val).value instanceof RegisterNumber){ + if (val instanceof DirectValueActionItem) { + if (((DirectValueActionItem) val).value instanceof RegisterNumber) { return; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java index a4beb7d47..521816933 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java @@ -20,16 +20,16 @@ import com.jpexs.decompiler.flash.EndOfStreamException; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.ecma.Null; import com.jpexs.decompiler.flash.ecma.Undefined; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java index be6a9ad39..8d2102d6e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java @@ -25,8 +25,8 @@ import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; import com.jpexs.decompiler.flash.action.model.SetVariableActionItem; import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java index 3e7d7f085..826a2f2e5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java @@ -21,10 +21,10 @@ import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.ActionGraph; +import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.special.ActionStore; -import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java index a96d01042..21e07e7c3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.model.CallFunctionActionItem; import com.jpexs.decompiler.flash.action.model.ConstantPool; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java index 2a508f8e5..b30e32d71 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java @@ -22,8 +22,8 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java index c9687819a..991669af0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java @@ -20,14 +20,14 @@ import com.jpexs.decompiler.flash.ReReadableInputStream; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; -import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java index 1cd2ebc49..bf4bd6bcd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java @@ -19,8 +19,8 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.model.ConstantPool; import com.jpexs.decompiler.flash.action.model.DefineLocalActionItem; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java index 50e56d4a8..e7b38dfe5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java @@ -19,15 +19,15 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.parser.ParseException; -import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; -import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.flash.action.model.DecrementActionItem; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.model.IncrementActionItem; import com.jpexs.decompiler.flash.action.model.PostDecrementActionItem; import com.jpexs.decompiler.flash.action.model.PostIncrementActionItem; import com.jpexs.decompiler.flash.action.model.StoreRegisterActionItem; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import com.jpexs.decompiler.graph.GraphSourceItemPos; import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index 252872894..3130a0c7d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -20,10 +20,10 @@ import com.jpexs.decompiler.flash.ReReadableInputStream; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.clauses.WithActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; -import com.jpexs.decompiler.flash.action.model.clauses.WithActionItem; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.graph.GraphTargetItem; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java index 74ece5bda..3bf52fcfd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java @@ -20,14 +20,14 @@ import com.jpexs.decompiler.flash.ReReadableInputStream; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.FunctionActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; -import com.jpexs.decompiler.flash.action.model.FunctionActionItem; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java index 1d1aee13d..b5a2f401e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java @@ -20,18 +20,18 @@ import com.jpexs.decompiler.flash.ReReadableInputStream; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; +import com.jpexs.decompiler.flash.action.model.clauses.TryActionItem; import com.jpexs.decompiler.flash.action.parser.ParseException; import com.jpexs.decompiler.flash.action.parser.pcode.ASMParsedSymbol; import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer; import com.jpexs.decompiler.flash.action.parser.pcode.Label; import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; -import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; -import com.jpexs.decompiler.flash.action.model.ActionItem; -import com.jpexs.decompiler.flash.action.model.clauses.TryActionItem; +import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.GraphSourceItemContainer; import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java index 1a6f54e26..b2d80c204 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java @@ -19,8 +19,12 @@ package com.jpexs.decompiler.flash.gui; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.SwingConstants; /** @@ -29,72 +33,119 @@ import javax.swing.SwingConstants; */ public class AboutDialog extends AppDialog { + private static final String[] CONTRIBUTORS = new String[]{ + "Paolo Cancedda", + "Capasha", + "focus", + "honfika", + "pepka"}; + private static final String AUTHOR = "JPEXS"; + public AboutDialog() { setDefaultCloseOperation(HIDE_ON_CLOSE); setSize(new Dimension(300, 320)); setTitle(translate("dialog.title")); - Container cp = getContentPane(); - cp.setLayout(new FlowLayout()); + Container cnt = getContentPane(); + JPanel cp = new JPanel(); + cp.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); + cnt.setLayout(new BorderLayout()); + cnt.add(cp, BorderLayout.CENTER); + cp.setLayout(new BoxLayout(cp, BoxLayout.Y_AXIS)); + JPanel appNamePanel = new JPanel(new FlowLayout()); JLabel jpLabel = new JLabel("JPEXS"); + jpLabel.setAlignmentX(0.5f); jpLabel.setForeground(new Color(0, 0, 160)); jpLabel.setFont(new Font("Tahoma", Font.BOLD, 25)); jpLabel.setHorizontalAlignment(SwingConstants.CENTER); - cp.add(jpLabel); + appNamePanel.add(jpLabel); - JLabel asLabel = new JLabel("Free Flash"); - asLabel.setFont(new Font("Tahoma", Font.BOLD, 25)); - asLabel.setHorizontalAlignment(SwingConstants.CENTER); - cp.add(asLabel); + JLabel ffLabel = new JLabel("Free Flash"); + ffLabel.setAlignmentX(0.5f); + ffLabel.setFont(new Font("Tahoma", Font.BOLD, 25)); + ffLabel.setHorizontalAlignment(SwingConstants.CENTER); + appNamePanel.add(ffLabel); JLabel decLabel = new JLabel("Decompiler"); + decLabel.setAlignmentX(0.5f); decLabel.setForeground(Color.red); decLabel.setFont(new Font("Tahoma", Font.BOLD, 25)); decLabel.setHorizontalAlignment(SwingConstants.CENTER); - cp.add(decLabel); + appNamePanel.add(decLabel); + appNamePanel.setAlignmentX(0.5f); + cp.add(appNamePanel); JLabel verLabel = new JLabel(translate("version") + " " + Main.version); - verLabel.setPreferredSize(new Dimension(300, 15)); + verLabel.setAlignmentX(0.5f); + //verLabel.setPreferredSize(new Dimension(300, 15)); verLabel.setFont(new Font("Tahoma", Font.BOLD, 15)); verLabel.setHorizontalAlignment(SwingConstants.CENTER); cp.add(verLabel); JLabel byLabel = new JLabel(translate("by")); - byLabel.setPreferredSize(new Dimension(300, 15)); + byLabel.setAlignmentX(0.5f); byLabel.setHorizontalAlignment(SwingConstants.CENTER); cp.add(byLabel); - JLabel jpexsLabel = new JLabel("JPEXS"); - jpexsLabel.setForeground(new Color(0, 0, 160)); - jpexsLabel.setFont(new Font("Tahoma", Font.BOLD, 20)); - jpexsLabel.setPreferredSize(new Dimension(300, 25)); - jpexsLabel.setHorizontalAlignment(SwingConstants.CENTER); - cp.add(jpexsLabel); + JLabel authorLabel = new JLabel(AUTHOR); + authorLabel.setAlignmentX(0.5f); + authorLabel.setForeground(new Color(0, 0, 160)); + authorLabel.setFont(new Font("Tahoma", Font.BOLD, 20)); + //jpexsLabel.setPreferredSize(new Dimension(300, 25)); + authorLabel.setHorizontalAlignment(SwingConstants.CENTER); + cp.add(authorLabel); + + + JLabel dateLabel = new JLabel("2010-2013"); - dateLabel.setPreferredSize(new Dimension(300, 10)); + dateLabel.setAlignmentX(0.5f); + //dateLabel.setPreferredSize(new Dimension(300, 10)); dateLabel.setHorizontalAlignment(SwingConstants.CENTER); cp.add(dateLabel); - LinkLabel wwwLabel = new LinkLabel(Main.projectPage); - wwwLabel.setForeground(Color.blue); - wwwLabel.setPreferredSize(new Dimension(300, 25)); - wwwLabel.setHorizontalAlignment(SwingConstants.CENTER); - cp.add(wwwLabel); + JLabel transAuthorLabel = new JLabel(translate("translation.author.label")); - transAuthorLabel.setPreferredSize(new Dimension(300, 20)); + transAuthorLabel.setAlignmentX(0.5f); + //transAuthorLabel.setPreferredSize(new Dimension(300, 20)); transAuthorLabel.setHorizontalAlignment(SwingConstants.CENTER); JLabel transAuthor = new JLabel(translate("translation.author")); - transAuthor.setPreferredSize(new Dimension(300, 20)); + transAuthor.setAlignmentX(0.5f); + //transAuthor.setPreferredSize(new Dimension(300, 20)); transAuthor.setHorizontalAlignment(SwingConstants.CENTER); cp.add(transAuthorLabel); cp.add(transAuthor); + + + JLabel contributorsLabel = new JLabel(translate("contributors")); + contributorsLabel.setAlignmentX(0.5f); + contributorsLabel.setHorizontalAlignment(SwingConstants.CENTER); + contributorsLabel.setFont(contributorsLabel.getFont().deriveFont(Font.BOLD)); + cp.add(contributorsLabel); + + for (String c : CONTRIBUTORS) { + JLabel contributorLabel = new JLabel(c); + contributorLabel.setAlignmentX(0.5f); + contributorLabel.setHorizontalAlignment(SwingConstants.CENTER); + cp.add(contributorLabel); + } + + cp.add(Box.createVerticalStrut(10)); + + LinkLabel wwwLabel = new LinkLabel(Main.projectPage); + wwwLabel.setAlignmentX(0.5f); + wwwLabel.setForeground(Color.blue); + //wwwLabel.setPreferredSize(new Dimension(300, 25)); + wwwLabel.setHorizontalAlignment(SwingConstants.CENTER); + cp.add(wwwLabel); + cp.add(Box.createVerticalStrut(10)); JButton okButton = new JButton(translate("button.ok")); + okButton.setAlignmentX(0.5f); cp.add(okButton); okButton.addActionListener(new ActionListener() { @Override @@ -107,5 +158,6 @@ public class AboutDialog extends AppDialog { View.centerScreen(this); View.setWindowIcon(this); setResizable(false); + pack(); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ActionRedirector.java b/trunk/src/com/jpexs/decompiler/flash/gui/ActionRedirector.java new file mode 100644 index 000000000..6a5a91ea6 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ActionRedirector.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +/** + * + * @author JPEXS + */ +public class ActionRedirector implements ActionListener { + + ActionListener target; + String actionCommand; + + public ActionRedirector(ActionListener target, String actionCommand) { + this.target = target; + this.actionCommand = actionCommand; + } + + @Override + public void actionPerformed(ActionEvent e) { + e = new ActionEvent(e.getSource(), e.getID(), actionCommand); + target.actionPerformed(e); + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java index a13d5e873..b878fdb9c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppDialog.java @@ -16,10 +16,9 @@ */ package com.jpexs.decompiler.flash.gui; -import com.jpexs.decompiler.flash.Configuration; -import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JDialog; +import javax.swing.JRootPane; /** * @@ -31,6 +30,7 @@ public abstract class AppDialog extends JDialog { public AppDialog() { View.installEscapeCloseOperation(this); + getRootPane().setWindowDecorationStyle(JRootPane.FRAME); } public String translate(String key) { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java index 0af532bfe..c3897bd43 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppFrame.java @@ -16,8 +16,6 @@ */ package com.jpexs.decompiler.flash.gui; -import com.jpexs.decompiler.flash.Configuration; -import java.util.Locale; import java.util.ResourceBundle; import javax.swing.JFrame; @@ -29,6 +27,9 @@ public abstract class AppFrame extends JFrame { private ResourceBundle resourceBundle = ResourceBundle.getBundle(AppStrings.getResourcePath(getClass())); + public AppFrame() { + } + public String translate(String key) { return resourceBundle.getString(key); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java new file mode 100644 index 000000000..509893ce2 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppRibbonFrame.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.util.ResourceBundle; +import org.pushingpixels.flamingo.api.ribbon.JRibbonFrame; + +/** + * + * @author JPEXS + */ +public abstract class AppRibbonFrame extends JRibbonFrame { + + private ResourceBundle resourceBundle = ResourceBundle.getBundle(AppStrings.getResourcePath(getClass())); + + public AppRibbonFrame() { + } + + public String translate(String key) { + return resourceBundle.getString(key); + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java b/trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java index b207307c5..d5b6d38a6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AppStrings.java @@ -16,8 +16,6 @@ */ package com.jpexs.decompiler.flash.gui; -import com.jpexs.decompiler.flash.Configuration; -import java.util.Locale; import java.util.ResourceBundle; /** diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/HeaderLabel.java b/trunk/src/com/jpexs/decompiler/flash/gui/HeaderLabel.java new file mode 100644 index 000000000..dcbe2d001 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/HeaderLabel.java @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.awt.Color; +import java.awt.Graphics; +import java.awt.geom.GeneralPath; +import java.util.EnumSet; +import java.util.Set; +import javax.swing.JLabel; +import org.pushingpixels.substance.api.DecorationAreaType; +import org.pushingpixels.substance.api.SubstanceConstants; +import org.pushingpixels.substance.api.painter.border.StandardBorderPainter; +import org.pushingpixels.substance.api.skin.OfficeBlue2007Skin; +import org.pushingpixels.substance.internal.utils.SubstanceOutlineUtilities; + +/** + * + * @author JPEXS + */ +public class HeaderLabel extends JLabel { + + public HeaderLabel(String text) { + super(text); + //setBorder(BorderFactory.createRaisedBevelBorder()); + + + /*setBorder(new Border() { + + @Override + public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) { + g.setColor(Color.gray); + g.drawLine(0, 0,width-1, 0); + g.drawLine(0, 0, 0, height-1); + g.setColor(Color.darkGray); + g.drawLine(width-1, 0, width-1, height-1); + g.drawLine(0, height-1, width-1, height-1); + } + + @Override + public Insets getBorderInsets(Component c) { + return new Insets(2, 2, 2, 2); + } + + @Override + public boolean isBorderOpaque() { + return false; + } + });*/ + + } + + @Override + public void paint(Graphics g) { + g.setColor(new Color(217, 232, 251)); + g.fillRect(0, 0, getWidth(), getHeight()); + StandardBorderPainter borderPainter = new StandardBorderPainter(); + + Set straightSides = EnumSet.of(SubstanceConstants.Side.BOTTOM); + int dy = 0; + float cornerRadius = 5f; + int borderThickness = 1; + int borderInsets = 0; + GeneralPath contourInner = borderPainter.isPaintingInnerContour() ? SubstanceOutlineUtilities.getBaseOutline(getWidth(), getHeight() + dy, + cornerRadius - borderThickness, straightSides, borderThickness + borderInsets) + : null; + + GeneralPath contour = SubstanceOutlineUtilities.getBaseOutline(getWidth(), + getHeight() + dy, cornerRadius, straightSides, borderInsets); + borderPainter.paintBorder(g, this, getWidth(), getHeight() + dy, + contour, contourInner, new OfficeBlue2007Skin().getActiveColorScheme(DecorationAreaType.HEADER)); + g.setColor(Color.black); + JLabel lab = new JLabel(getText(), JLabel.CENTER); + lab.setSize(getSize()); + lab.paint(g); + //g.drawString(getText(), getWidth()/2-getFontMetrics(getFont()).stringWidth(getText())/2, getFont().getSize()); + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java b/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java index 7ff1c1a74..5c362a1f6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java @@ -66,8 +66,9 @@ public class ListLayout implements LayoutManager { h += pref.height; first = false; } + h += border; - maxw = parent.getSize().width - ins.left - ins.right; + maxw = (parent.getSize().width == 0 ? maxw : parent.getSize().width) - ins.left - ins.right; return new Dimension(maxw, h); } @@ -91,6 +92,8 @@ public class ListLayout implements LayoutManager { top += border; } Dimension pref = c.getPreferredSize(); + c.setPreferredSize(new Dimension(dim.width, pref.height)); + c.setMinimumSize(new Dimension(dim.width, pref.height)); c.setBounds(0, top, dim.width, pref.height); top += pref.height; first = false; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java index 589e40561..4fa2a4a30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java @@ -23,7 +23,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.ImageObserver; import javax.swing.BorderFactory; -import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JProgressBar; @@ -36,7 +35,7 @@ import javax.swing.SwingConstants; */ public class LoadingDialog extends AppDialog implements ImageObserver { - private JLabel detailLabel = new JLabel("", JLabel.CENTER); + private JLabel detailLabel; private LoadingPanel loadingPanel; JProgressBar progressBar = new JProgressBar(0, 100); @@ -45,15 +44,20 @@ public class LoadingDialog extends AppDialog implements ImageObserver { detailLabel.setHorizontalAlignment(SwingConstants.CENTER); } - public void setPercent(int percent) { - progressBar.setValue(percent); - progressBar.setVisible(true); + public void setPercent(final int percent) { + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + progressBar.setIndeterminate(false); + progressBar.setValue(percent); + progressBar.setStringPainted(true); + } + }); } public void hidePercent() { - if (progressBar.isVisible()) { - progressBar.setVisible(false); - } + progressBar.setIndeterminate(true); + progressBar.setStringPainted(false); } /** @@ -62,31 +66,34 @@ public class LoadingDialog extends AppDialog implements ImageObserver { public LoadingDialog() { setResizable(false); setTitle(Main.shortApplicationVerName); - setSize(Math.max(300, 150 + getFontMetrics(new JLabel().getFont()).stringWidth(translate("loadingpleasewait"))), 150); - Container cnt = getContentPane(); + Container cntp = getContentPane(); + JPanel cnt = new JPanel(); + cntp.setLayout(new BorderLayout()); + cntp.add(cnt); + cnt.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); cnt.setLayout(new BorderLayout()); - loadingPanel = new LoadingPanel(50, 50); - loadingPanel.setPreferredSize(new Dimension(100, 100)); - add(loadingPanel, BorderLayout.WEST); + //loadingPanel = new LoadingPanel(50, 50); + //loadingPanel.setPreferredSize(new Dimension(100, 100)); + //add(loadingPanel, BorderLayout.WEST); JPanel pan = new JPanel(); pan.setLayout(new ListLayout(5)); //pan.setPreferredSize(new Dimension(120, 150)); JLabel loadingLabel = new JLabel(translate("loadingpleasewait")); //loadingLabel.setBounds(0, 30, 150, 20); loadingLabel.setHorizontalAlignment(SwingConstants.CENTER); + detailLabel = new JLabel("H", JLabel.CENTER); + detailLabel.setPreferredSize(new Dimension(loadingLabel.getPreferredSize())); detailLabel.setHorizontalAlignment(SwingConstants.CENTER); //detailLabel.setBounds(0, 45, 150, 20); //progressBar.setBounds(0, 70, 125, 25); pan.add(loadingLabel); pan.add(detailLabel); pan.add(progressBar); - pan.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10)); cnt.add(pan, BorderLayout.CENTER); - progressBar.setVisible(false); - progressBar.setStringPainted(true); //progressBar.setVisible(false); - View.centerScreen(this); + progressBar.setStringPainted(true); + //progressBar.setVisible(false); View.setWindowIcon(this); detailLabel.setHorizontalAlignment(SwingConstants.LEFT); addWindowListener(new WindowAdapter() { @@ -95,5 +102,9 @@ public class LoadingDialog extends AppDialog implements ImageObserver { System.exit(0); } }); + pack(); + Dimension siz = getSize(); + setSize(Math.max(300, 150 + getFontMetrics(new JLabel().getFont()).stringWidth(translate("loadingpleasewait"))), siz.height); + View.centerScreen(this); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java index e705da471..f63f60fd7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java @@ -65,7 +65,6 @@ import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.SwingWorker; -import javax.swing.UIDefaults; import javax.swing.UIManager; import javax.swing.filechooser.FileFilter; @@ -153,27 +152,33 @@ public class Main { startWork(name, -1); } - public static void startWork(String name, int percent) { + public static void startWork(final String name, final int percent) { working = true; - if (mainFrame != null) { - mainFrame.setWorkStatus(name); - if (percent == -1) { - mainFrame.hidePercent(); - } else { - mainFrame.setPercent(percent); + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + if (mainFrame != null) { + mainFrame.setWorkStatus(name); + if (percent == -1) { + mainFrame.hidePercent(); + } else { + mainFrame.setPercent(percent); + } + } + if (loadingDialog != null) { + loadingDialog.setDetail(name); + if (percent == -1) { + loadingDialog.hidePercent(); + } else { + loadingDialog.setPercent(percent); + } + } + if (Main.isCommandLineMode()) { + System.out.println(name); + } } - } - if (loadingDialog != null) { - loadingDialog.setDetail(name); - if (percent == -1) { - loadingDialog.hidePercent(); - } else { - loadingDialog.setPercent(percent); - } - } - if (Main.isCommandLineMode()) { - System.out.println(name); - } + }); + } public static void stopWork() { @@ -239,13 +244,26 @@ public class Main { try { Main.startWork(translate("work.creatingwindow") + "..."); - mainFrame = new MainFrame(swf); - loadingDialog.setVisible(false); - mainFrame.setVisible(true); - Main.stopWork(); + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + mainFrame = new MainFrame(swf); + } + }); + } catch (Exception ex) { Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); } + loadingDialog.setVisible(false); + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + mainFrame.setVisible(true); + } + }); + + Main.stopWork(); + return true; } } @@ -260,9 +278,15 @@ public class Main { System.gc(); } Main.file = swfFile; - if (Main.loadingDialog == null) { - Main.loadingDialog = new LoadingDialog(); - } + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + if (Main.loadingDialog == null) { + Main.loadingDialog = new LoadingDialog(); + } + } + }); + Main.loadingDialog.setVisible(true); (new OpenFileWorker()).execute(); return true; @@ -333,10 +357,16 @@ public class Main { } public static void showModeFrame() { - if (modeFrame == null) { - modeFrame = new ModeFrame(); - } - modeFrame.setVisible(true); + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + if (mainFrame == null) { + mainFrame = new MainFrame(null); + } + mainFrame.setVisible(true); + } + }); + } public static void updateLicense() { @@ -580,7 +610,9 @@ public class Main { initLogging(Configuration.debugMode); initLang(); + View.setLookAndFeel(); + if ((Boolean) Configuration.getConfig("cacheOnDisk", Boolean.TRUE)) { Cache.setStorageType(Cache.STORAGE_FILES); } else { @@ -607,12 +639,18 @@ public class Main { } } } - if (proxyFrame == null) { - proxyFrame = new ProxyFrame(); - } + View.execInEventDispatch(new Runnable() { + @Override + public void run() { + if (proxyFrame == null) { + proxyFrame = new ProxyFrame(); + } + } + }); proxyFrame.setPort(port); addTrayIcon(); switchProxy(); + } else if (args[pos].equals("-export")) { if (args.length < pos + 4) { badArguments(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java index aac2b247a..843a9ce45 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -91,7 +91,6 @@ import com.jpexs.decompiler.flash.types.MATRIX; import com.jpexs.decompiler.flash.types.RECT; import com.jpexs.decompiler.flash.types.RGB; import com.jpexs.decompiler.flash.types.TEXTRECORD; -import com.sun.jna.Platform; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Color; @@ -99,8 +98,12 @@ import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Graphics; import java.awt.GraphicsEnvironment; import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; @@ -149,8 +152,10 @@ import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.Icon; import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JCheckBoxMenuItem; import javax.swing.JComboBox; +import javax.swing.JComponent; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; @@ -170,23 +175,45 @@ import javax.swing.JTree; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; +import javax.swing.UIManager; import javax.swing.border.BevelBorder; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.filechooser.FileFilter; +import javax.swing.plaf.basic.BasicLabelUI; +import javax.swing.plaf.basic.BasicTreeUI; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import org.pushingpixels.flamingo.api.common.AbstractCommandButton; +import org.pushingpixels.flamingo.api.common.CommandButtonDisplayState; +import org.pushingpixels.flamingo.api.common.CommandButtonLayoutManager; +import org.pushingpixels.flamingo.api.common.JCommandButton; +import org.pushingpixels.flamingo.api.common.JCommandButton.CommandButtonKind; +import org.pushingpixels.flamingo.api.common.icon.ResizableIcon; +import org.pushingpixels.flamingo.api.ribbon.JRibbon; +import org.pushingpixels.flamingo.api.ribbon.JRibbonBand; +import org.pushingpixels.flamingo.api.ribbon.JRibbonComponent; +import org.pushingpixels.flamingo.api.ribbon.RibbonApplicationMenu; +import org.pushingpixels.flamingo.api.ribbon.RibbonApplicationMenuEntryFooter; +import org.pushingpixels.flamingo.api.ribbon.RibbonApplicationMenuEntryPrimary; +import org.pushingpixels.flamingo.api.ribbon.RibbonElementPriority; +import org.pushingpixels.flamingo.api.ribbon.RibbonTask; +import org.pushingpixels.flamingo.api.ribbon.resize.BaseRibbonBandResizePolicy; +import org.pushingpixels.flamingo.api.ribbon.resize.CoreRibbonResizePolicies; +import org.pushingpixels.flamingo.api.ribbon.resize.IconRibbonBandResizePolicy; +import org.pushingpixels.flamingo.internal.ui.ribbon.AbstractBandControlPanel; +import org.pushingpixels.flamingo.internal.ui.ribbon.appmenu.JRibbonApplicationMenuButton; /** * * @author Jindra */ -public class MainFrame extends AppFrame implements ActionListener, TreeSelectionListener, Freed { +public class MainFrame extends AppRibbonFrame implements ActionListener, TreeSelectionListener, Freed { private SWF swf; public ABCPanel abcPanel; @@ -220,9 +247,9 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection JSplitPane splitPane2; private boolean splitsInited = false; private JPanel detailPanel; - private JTextField filterField = new JTextField(""); + private JTextField filterField = new MyTextField(""); private JPanel searchPanel; - private JCheckBoxMenuItem autoDeobfuscateMenuItem; + private JCheckBox autoDeobfuscateMenuItem; private JPanel displayWithPreview; private JButton textSaveButton; private JButton textEditButton; @@ -231,12 +258,12 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection private JSplitPane previewSplitPane; private JButton imageReplaceButton; private JPanel imageButtonsPanel; - private JCheckBoxMenuItem miInternalViewer; - private JCheckBoxMenuItem miParallelSpeedUp; - private JCheckBoxMenuItem miAssociate; - private JCheckBoxMenuItem miDecompile; - private JCheckBoxMenuItem miCacheDisk; - private JCheckBoxMenuItem miGotoMainClassOnStartup; + private JCheckBox miInternalViewer; + private JCheckBox miParallelSpeedUp; + private JCheckBox miAssociate; + private JCheckBox miDecompile; + private JCheckBox miCacheDisk; + private JCheckBox miGotoMainClassOnStartup; private JLabel fontNameLabel; private JLabel fontIsBoldLabel; private JLabel fontIsItalicLabel; @@ -302,9 +329,197 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection statusLabel.setText(s); } + private String fixCommandTitle(String title) { + if (title.length() > 2) { + if (title.charAt(1) == ' ') { + title = title.charAt(0) + "\u00A0" + title.substring(2); + } + } + return title; + } + + private void assignListener(JCheckBox b, final String command) { + b.setActionCommand(command); + b.addActionListener(this); + } + + private void assignListener(JCommandButton b, final String command) { + final MainFrame t = this; + b.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + t.actionPerformed(new ActionEvent(e.getSource(), 0, command)); + } + }); + } + + @SuppressWarnings("unchecked") public MainFrame(SWF swf) { + super(); + JRibbon rib = getRibbon(); + + JRibbonBand editBand = new JRibbonBand(translate("menu.general"), null); + editBand.setResizePolicies((List) Arrays.asList(new CoreRibbonResizePolicies.Mirror(editBand.getControlPanel()), new IconRibbonBandResizePolicy(editBand.getControlPanel()))); + JCommandButton openCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.open")), View.getResizableIcon("open32")); + assignListener(openCommandButton, "OPEN"); + JCommandButton saveCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.save")), View.getResizableIcon("save32")); + assignListener(saveCommandButton, "SAVE"); + JCommandButton saveasCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveas")), View.getResizableIcon("saveas32")); + assignListener(saveasCommandButton, "SAVEAS"); + + + + editBand.addCommandButton(openCommandButton, RibbonElementPriority.TOP); + editBand.addCommandButton(saveCommandButton, RibbonElementPriority.TOP); + editBand.addCommandButton(saveasCommandButton, RibbonElementPriority.TOP); + + + JRibbonBand exportBand = new JRibbonBand(translate("menu.export"), null); + exportBand.setResizePolicies((List) Arrays.asList(new CoreRibbonResizePolicies.Mirror(exportBand.getControlPanel()), new IconRibbonBandResizePolicy(exportBand.getControlPanel()))); + JCommandButton exportFlaCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.export.fla")), View.getResizableIcon("exportfla32")); + assignListener(exportFlaCommandButton, "EXPORTFLA"); + JCommandButton exportAllCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.export.all")), View.getResizableIcon("export16")); + assignListener(exportAllCommandButton, "EXPORT"); + JCommandButton exportSelectionCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.export.selection")), View.getResizableIcon("exportsel16")); + assignListener(exportSelectionCommandButton, "EXPORTSEL"); + + exportBand.addCommandButton(exportFlaCommandButton, RibbonElementPriority.TOP); + exportBand.addCommandButton(exportAllCommandButton, RibbonElementPriority.MEDIUM); + exportBand.addCommandButton(exportSelectionCommandButton, RibbonElementPriority.MEDIUM); + + RibbonTask fileTask = new RibbonTask(translate("menu.file"), editBand, exportBand); + //----------------------------------------- TOOLS ----------------------------------- + JRibbonBand toolsBand = new JRibbonBand(translate("menu.tools"), null); + toolsBand.setResizePolicies((List) Arrays.asList(new CoreRibbonResizePolicies.Mirror(toolsBand.getControlPanel()), new IconRibbonBandResizePolicy(toolsBand.getControlPanel()))); + + JCommandButton searchCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.searchas")), View.getResizableIcon("search32")); + assignListener(searchCommandButton, "SEARCHAS"); + JCommandButton proxyCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.proxy")), View.getResizableIcon("proxy32")); + assignListener(proxyCommandButton, "SHOWPROXY"); + JCommandButton gotoDocumentClassCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.gotodocumentclass")), View.getResizableIcon("gotomainclass32")); + assignListener(gotoDocumentClassCommandButton, "GOTODOCUMENTCLASS"); + + toolsBand.addCommandButton(searchCommandButton, RibbonElementPriority.TOP); + toolsBand.addCommandButton(proxyCommandButton, RibbonElementPriority.TOP); + toolsBand.addCommandButton(gotoDocumentClassCommandButton, RibbonElementPriority.TOP); + + JRibbonBand deobfuscationBand = new JRibbonBand(translate("menu.tools.deobfuscation"), null); + deobfuscationBand.setResizePolicies((List) Arrays.asList(new CoreRibbonResizePolicies.Mirror(deobfuscationBand.getControlPanel()), new IconRibbonBandResizePolicy(deobfuscationBand.getControlPanel()))); + + JCommandButton deobfuscationCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.deobfuscation.pcode")), View.getResizableIcon("deobfuscate32")); + assignListener(deobfuscationCommandButton, "DEOBFUSCATE"); + JCommandButton globalrenameCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.deobfuscation.globalrename")), View.getResizableIcon("rename16")); + assignListener(globalrenameCommandButton, "RENAMEONEIDENTIFIER"); + JCommandButton renameinvalidCommandButton = new JCommandButton(fixCommandTitle(translate("menu.tools.deobfuscation.renameinvalid")), View.getResizableIcon("renameall16")); + assignListener(renameinvalidCommandButton, "RENAMEIDENTIFIERS"); + + deobfuscationBand.addCommandButton(deobfuscationCommandButton, RibbonElementPriority.TOP); + deobfuscationBand.addCommandButton(globalrenameCommandButton, RibbonElementPriority.MEDIUM); + deobfuscationBand.addCommandButton(renameinvalidCommandButton, RibbonElementPriority.MEDIUM); + + RibbonTask toolsTask = new RibbonTask(translate("menu.tools"), toolsBand, deobfuscationBand); + + + //----------------------------------------- SETTINGS ----------------------------------- + + + JRibbonBand settingsBand = new JRibbonBand(translate("menu.settings"), null); + settingsBand.setResizePolicies((List) Arrays.asList(new CoreRibbonResizePolicies.Mirror(settingsBand.getControlPanel()), new IconRibbonBandResizePolicy(settingsBand.getControlPanel()))); + + autoDeobfuscateMenuItem = new JCheckBox(translate("menu.settings.autodeobfuscation")); + //assignListener(autoDeobfuscateMenuItem,"AUTODEOBFUSCATE"); + + miInternalViewer = new JCheckBox(translate("menu.settings.internalflashviewer")); + //assignListener(miInternalViewer,"INTERNALVIEWERSWITCH"); + miParallelSpeedUp = new JCheckBox(translate("menu.settings.parallelspeedup")); + //assignListener(miParallelSpeedUp,"PARALLELSPEEDUP"); + miDecompile = new JCheckBox(translate("menu.settings.disabledecompilation")); + //assignListener(miDecompile,"DISABLEDECOMPILATION"); + miAssociate = new JCheckBox(translate("menu.settings.addtocontextmenu")); + //assignListener(miAssociate,"ASSOCIATE"); + miCacheDisk = new JCheckBox(translate("menu.settings.cacheOnDisk")); + //assignListener(miCacheDisk,"CACHEONDISK"); + miGotoMainClassOnStartup = new JCheckBox(translate("menu.settings.gotoMainClassOnStartup")); + //assignListener(miGotoMainClassOnStartup,"GOTODOCUMENTCLASSONSTARTUP"); + + + settingsBand.addRibbonComponent(new JRibbonComponent(autoDeobfuscateMenuItem)); + settingsBand.addRibbonComponent(new JRibbonComponent(miInternalViewer)); + settingsBand.addRibbonComponent(new JRibbonComponent(miParallelSpeedUp)); + settingsBand.addRibbonComponent(new JRibbonComponent(miDecompile)); + settingsBand.addRibbonComponent(new JRibbonComponent(miAssociate)); + settingsBand.addRibbonComponent(new JRibbonComponent(miCacheDisk)); + settingsBand.addRibbonComponent(new JRibbonComponent(miGotoMainClassOnStartup)); + + JRibbonBand languageBand = new JRibbonBand(translate("menu.language"), null); + languageBand.setResizePolicies((List) Arrays.asList(new BaseRibbonBandResizePolicy(languageBand.getControlPanel()) { + @Override + public int getPreferredWidth(int i, int i1) { + return 105; + } + + @Override + public void install(int i, int i1) { + } + }, new IconRibbonBandResizePolicy(languageBand.getControlPanel()))); + JCommandButton setLanguageCommandButton = new JCommandButton(fixCommandTitle(translate("menu.settings.language")), View.getResizableIcon("setlanguage32")); + assignListener(setLanguageCommandButton, "SETLANGUAGE"); + languageBand.addCommandButton(setLanguageCommandButton, RibbonElementPriority.TOP); + RibbonTask settingsTask = new RibbonTask(translate("menu.settings"), settingsBand, languageBand); + + + //----------------------------------------- HELP ----------------------------------- + + JRibbonBand helpBand = new JRibbonBand(translate("menu.help"), null); + helpBand.setResizePolicies((List) Arrays.asList(new CoreRibbonResizePolicies.Mirror(helpBand.getControlPanel()), new IconRibbonBandResizePolicy(helpBand.getControlPanel()))); + + JCommandButton checkForUpdatesCommandButton = new JCommandButton(fixCommandTitle(translate("menu.help.checkupdates")), View.getResizableIcon("update16")); + assignListener(checkForUpdatesCommandButton, "CHECKUPDATES"); + JCommandButton helpUsUpdatesCommandButton = new JCommandButton(fixCommandTitle(translate("menu.help.helpus")), View.getResizableIcon("donate32")); + assignListener(helpUsUpdatesCommandButton, "HELPUS"); + JCommandButton homepageCommandButton = new JCommandButton(fixCommandTitle(translate("menu.help.homepage")), View.getResizableIcon("homepage16")); + assignListener(homepageCommandButton, "HOMEPAGE"); + JCommandButton aboutCommandButton = new JCommandButton(fixCommandTitle(translate("menu.help.about")), View.getResizableIcon("about32")); + assignListener(aboutCommandButton, "ABOUT"); + + helpBand.addCommandButton(aboutCommandButton, RibbonElementPriority.TOP); + helpBand.addCommandButton(checkForUpdatesCommandButton, RibbonElementPriority.MEDIUM); + helpBand.addCommandButton(homepageCommandButton, RibbonElementPriority.MEDIUM); + helpBand.addCommandButton(helpUsUpdatesCommandButton, RibbonElementPriority.TOP); + RibbonTask helpTask = new RibbonTask(translate("menu.help"), helpBand); + + + rib.addTask(fileTask); + rib.addTask(toolsTask); + rib.addTask(settingsTask); + rib.addTask(helpTask); + + + RibbonApplicationMenu mainMenu = new RibbonApplicationMenu(); + RibbonApplicationMenuEntryPrimary exportFlaMenu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon("exportfla32"), translate("menu.file.export.fla"), new ActionRedirector(this, "EXPORTFLA"), CommandButtonKind.ACTION_ONLY); + RibbonApplicationMenuEntryPrimary exportAllMenu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon("export32"), translate("menu.file.export.all"), new ActionRedirector(this, "EXPORTSEL"), CommandButtonKind.ACTION_ONLY); + RibbonApplicationMenuEntryPrimary exportSelMenu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon("exportsel32"), translate("menu.file.export.selection"), new ActionRedirector(this, "EXPORTSEL"), CommandButtonKind.ACTION_ONLY); + RibbonApplicationMenuEntryPrimary checkUpdatesMenu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon("update32"), translate("menu.help.checkupdates"), new ActionRedirector(this, "CHECKUPDATES"), CommandButtonKind.ACTION_ONLY); + RibbonApplicationMenuEntryPrimary aboutMenu = new RibbonApplicationMenuEntryPrimary(View.getResizableIcon("about32"), translate("menu.help.about"), new ActionRedirector(this, "ABOUT"), CommandButtonKind.ACTION_ONLY); + // + + RibbonApplicationMenuEntryFooter exitMenu = new RibbonApplicationMenuEntryFooter(View.getResizableIcon("exit32"), translate("menu.file.exit"), new ActionRedirector(this, "EXIT")); + + mainMenu.addMenuEntry(exportFlaMenu); + mainMenu.addMenuEntry(exportAllMenu); + mainMenu.addMenuEntry(exportSelMenu); + mainMenu.addMenuSeparator(); + mainMenu.addMenuEntry(checkUpdatesMenu); + mainMenu.addMenuEntry(aboutMenu); + mainMenu.addFooterEntry(exitMenu); + mainMenu.addMenuSeparator(); + /*ResizableIcon ic = View.getResizableIcon("icon_round256"); + setApplicationIcon(ic);*/ + rib.setApplicationMenu(mainMenu); + int w = (Integer) Configuration.getConfig("gui.window.width", 1000); + int h = (Integer) Configuration.getConfig("gui.window.height", 700); Dimension dim = java.awt.Toolkit.getDefaultToolkit().getScreenSize(); if (w > dim.width) { @@ -359,7 +574,7 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection Main.exit(); } }); - setTitle(Main.applicationVerName + (Configuration.DISPLAY_FILENAME ? " - " + Main.getFileTitle() : "")); + setTitle(Main.applicationVerName + ((swf != null && Configuration.DISPLAY_FILENAME) ? " - " + Main.getFileTitle() : "")); JMenuBar menuBar = new JMenuBar(); @@ -418,8 +633,8 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection miDeobfuscation.setActionCommand("DEOBFUSCATE"); miDeobfuscation.addActionListener(this); - autoDeobfuscateMenuItem = new JCheckBoxMenuItem(translate("menu.settings.autodeobfuscation")); - autoDeobfuscateMenuItem.setState((Boolean) Configuration.getConfig("autoDeobfuscate", true)); + //autoDeobfuscateMenuItem = new JCheckBoxMenuItem(translate("menu.settings.autodeobfuscation")); + autoDeobfuscateMenuItem.setSelected((Boolean) Configuration.getConfig("autoDeobfuscate", true)); autoDeobfuscateMenuItem.addActionListener(this); autoDeobfuscateMenuItem.setActionCommand("AUTODEOBFUSCATE"); @@ -448,7 +663,7 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection menuTools.add(miSearchScript); - miInternalViewer = new JCheckBoxMenuItem(translate("menu.settings.internalflashviewer")); + //miInternalViewer = new JCheckBox(translate("menu.settings.internalflashviewer")); miInternalViewer.setSelected((Boolean) Configuration.getConfig("internalFlashViewer", (Boolean) (flashPanel == null))); if (flashPanel == null) { miInternalViewer.setSelected(true); @@ -457,7 +672,7 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection miInternalViewer.setActionCommand("INTERNALVIEWERSWITCH"); miInternalViewer.addActionListener(this); - miParallelSpeedUp = new JCheckBoxMenuItem(translate("menu.settings.parallelspeedup")); + //miParallelSpeedUp = new JCheckBox(translate("menu.settings.parallelspeedup")); miParallelSpeedUp.setSelected((Boolean) Configuration.getConfig("paralelSpeedUp", Boolean.TRUE)); miParallelSpeedUp.setActionCommand("PARALLELSPEEDUP"); miParallelSpeedUp.addActionListener(this); @@ -473,46 +688,46 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection miGotoDocumentClass.addActionListener(this); menuBar.add(menuTools); - miDecompile = new JCheckBoxMenuItem(translate("menu.settings.disabledecompilation")); + //miDecompile = new JCheckBox(translate("menu.settings.disabledecompilation")); miDecompile.setSelected(!(Boolean) Configuration.getConfig("decompile", Boolean.TRUE)); miDecompile.setActionCommand("DISABLEDECOMPILATION"); miDecompile.addActionListener(this); - miCacheDisk = new JCheckBoxMenuItem(translate("menu.settings.cacheOnDisk")); + //miCacheDisk = new JCheckBox(translate("menu.settings.cacheOnDisk")); miCacheDisk.setSelected((Boolean) Configuration.getConfig("cacheOnDisk", Boolean.TRUE)); miCacheDisk.setActionCommand("CACHEONDISK"); miCacheDisk.addActionListener(this); - miGotoMainClassOnStartup = new JCheckBoxMenuItem(translate("menu.settings.gotoMainClassOnStartup")); + // miGotoMainClassOnStartup = new JCheckBox(translate("menu.settings.gotoMainClassOnStartup")); miGotoMainClassOnStartup.setSelected((Boolean) Configuration.getConfig("gotoMainClassOnStartup", Boolean.FALSE)); miGotoMainClassOnStartup.setActionCommand("GOTODOCUMENTCLASSONSTARTUP"); miGotoMainClassOnStartup.addActionListener(this); - JMenu menuSettings = new JMenu(translate("menu.settings")); - menuSettings.add(autoDeobfuscateMenuItem); - menuSettings.add(miInternalViewer); - menuSettings.add(miParallelSpeedUp); - menuSettings.add(miDecompile); - menuSettings.add(miCacheDisk); - menuSettings.add(miGotoMainClassOnStartup); + /*JMenu menuSettings = new JMenu(translate("menu.settings")); + menuSettings.add(autoDeobfuscateMenuItem); + menuSettings.add(miInternalViewer); + menuSettings.add(miParallelSpeedUp); + menuSettings.add(miDecompile); + menuSettings.add(miCacheDisk); + menuSettings.add(miGotoMainClassOnStartup);*/ - miAssociate = new JCheckBoxMenuItem(translate("menu.settings.addtocontextmenu")); + // miAssociate = new JCheckBox(translate("menu.settings.addtocontextmenu")); miAssociate.setActionCommand("ASSOCIATE"); miAssociate.addActionListener(this); - miAssociate.setState(Main.isAddedToContextMenu()); + miAssociate.setSelected(Main.isAddedToContextMenu()); JMenuItem miLanguage = new JMenuItem(translate("menu.settings.language")); miLanguage.setActionCommand("SETLANGUAGE"); miLanguage.addActionListener(this); - if (Platform.isWindows()) { - menuSettings.add(miAssociate); - } - menuSettings.add(miLanguage); + /* if (Platform.isWindows()) { + menuSettings.add(miAssociate); + } + menuSettings.add(miLanguage); - menuBar.add(menuSettings); + menuBar.add(menuSettings);*/ JMenu menuHelp = new JMenu(translate("menu.help")); JMenuItem miAbout = new JMenuItem(translate("menu.help.about")); miAbout.setIcon(View.getIcon("about16")); @@ -542,16 +757,17 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection menuHelp.add(miAbout); menuBar.add(menuHelp); - setJMenuBar(menuBar); + //setJMenuBar(menuBar); List objs = new ArrayList<>(); - objs.addAll(swf.tags); - + if (swf != null) { + objs.addAll(swf.tags); + } this.swf = swf; java.awt.Container cnt = getContentPane(); cnt.setLayout(new BorderLayout()); - + cnt.add(getRibbon(), BorderLayout.NORTH); detailPanel = new JPanel(); detailPanel.setLayout(new CardLayout()); @@ -569,13 +785,44 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection detailPanel.add(abcPanel.tabbedPane, DETAILCARDAS3NAVIGATOR); menuTools.add(miGotoDocumentClass); } else { + gotoDocumentClassCommandButton.setEnabled(false); actionPanel = new ActionPanel(); - miDeobfuscation.setEnabled(false); + deobfuscationCommandButton.setEnabled(false); + //miDeobfuscation.setEnabled(false); } + if (swf == null) { + renameinvalidCommandButton.setEnabled(false); + globalrenameCommandButton.setEnabled(false); + saveCommandButton.setEnabled(false); + saveasCommandButton.setEnabled(false); + exportAllCommandButton.setEnabled(false); + exportAllMenu.setEnabled(false); + exportFlaCommandButton.setEnabled(false); + exportFlaMenu.setEnabled(false); + exportSelectionCommandButton.setEnabled(false); + exportSelMenu.setEnabled(false); + deobfuscationCommandButton.setEnabled(false); + searchCommandButton.setEnabled(false); + } - tagTree = new JTree(new TagTreeModel(createTagList(objs, null), new SWFRoot((new File(Main.file)).getName()))); + UIManager.getDefaults().put("TreeUI", BasicTreeUI.class.getName()); + if (swf == null) { + tagTree = new JTree((TreeModel) null); + } else { + tagTree = new JTree(new TagTreeModel(createTagList(objs, null), new SWFRoot((new File(Main.file)).getName()))); + } tagTree.addTreeSelectionListener(this); + tagTree.setBackground(Color.white); + tagTree.setUI(new BasicTreeUI() { + @Override + public void paint(Graphics g, JComponent c) { + setHashColor(Color.gray); + super.paint(g, c); + } + }); + + DragSource dragSource = DragSource.getDefaultDragSource(); dragSource.createDefaultDragGestureRecognizer(tagTree, DnDConstants.ACTION_COPY_OR_MOVE, new DragGestureListener() { @@ -724,7 +971,12 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection String tos = value.toString(); int sw = getFontMetrics(getFont()).stringWidth(tos); - setPreferredSize(new Dimension(18 + sw, 32)); + setPreferredSize(new Dimension(18 + sw, getPreferredSize().height)); + setUI(new BasicLabelUI()); + setOpaque(false); + //setBackground(Color.green); + setBackgroundNonSelectionColor(Color.white); + //setBackgroundSelectionColor(Color.ORANGE); return this; } }; @@ -755,14 +1007,18 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection loadingPanel.setVisible(false); cnt.add(statusPanel, BorderLayout.SOUTH); - for (Tag t : swf.tags) { - if (t instanceof JPEGTablesTag) { - jtt = (JPEGTablesTag) t; + if (swf != null) { + for (Tag t : swf.tags) { + if (t instanceof JPEGTablesTag) { + jtt = (JPEGTablesTag) t; + } } } characters = new HashMap<>(); List list2 = new ArrayList<>(); - list2.addAll(swf.tags); + if (swf != null) { + list2.addAll(swf.tags); + } parseCharacters(list2); JPanel textTopPanel = new JPanel(new BorderLayout()); textValue = new LineMarkedEditorPane(); @@ -889,8 +1145,8 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection JPanel fontAddCharsPanel = new JPanel(new FlowLayout()); fontAddCharsPanel.add(new JLabel(translate("font.characters.add"))); - fontAddCharactersField = new JTextField(); - fontAddCharactersField.setPreferredSize(new Dimension(100, 25)); + fontAddCharactersField = new MyTextField(); + fontAddCharactersField.setPreferredSize(new Dimension(150, fontAddCharactersField.getPreferredSize().height)); fontAddCharsPanel.add(fontAddCharactersField); JButton fontAddCharsButton = new JButton(translate("button.ok")); fontAddCharsButton.setActionCommand("FONTADDCHARS"); @@ -939,13 +1195,13 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection previewSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT); previewSplitPane.setDividerLocation(300); JPanel pan = new JPanel(new BorderLayout()); - JLabel prevLabel = new JLabel(translate("swfpreview")); + JLabel prevLabel = new HeaderLabel(translate("swfpreview")); prevLabel.setHorizontalAlignment(SwingConstants.CENTER); - prevLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //prevLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); - JLabel paramsLabel = new JLabel(translate("parameters")); + JLabel paramsLabel = new HeaderLabel(translate("parameters")); paramsLabel.setHorizontalAlignment(SwingConstants.CENTER); - paramsLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //paramsLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); pan.add(prevLabel, BorderLayout.NORTH); pan.add(leftComponent, BorderLayout.CENTER); previewSplitPane.setLeftComponent(pan); @@ -980,9 +1236,9 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection previewImagePanel = new ImagePanel(); previewPanel.add(previewImagePanel, BorderLayout.CENTER); - JLabel prevIntLabel = new JLabel(translate("swfpreview.internal")); + JLabel prevIntLabel = new HeaderLabel(translate("swfpreview.internal")); prevIntLabel.setHorizontalAlignment(SwingConstants.CENTER); - prevIntLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //prevIntLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); previewPanel.add(prevIntLabel, BorderLayout.NORTH); shapesCard.add(previewPanel, BorderLayout.CENTER); displayPanel.add(shapesCard, CARDDRAWPREVIEWPANEL); @@ -1050,8 +1306,45 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection splitPane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, splitPane2, displayPanel); + if (swf == null) { + JPanel welcomePanel = new JPanel(); + welcomePanel.setLayout(new BoxLayout(welcomePanel, BoxLayout.Y_AXIS)); + JLabel welcomeToLabel = new JLabel(translate("startup.welcometo")); + welcomeToLabel.setFont(welcomeToLabel.getFont().deriveFont(40)); + welcomeToLabel.setAlignmentX(0.5f); + JPanel appNamePanel = new JPanel(new FlowLayout()); + JLabel jpLabel = new JLabel("JPEXS "); + jpLabel.setAlignmentX(0.5f); + jpLabel.setForeground(new Color(0, 0, 160)); + jpLabel.setFont(new Font("Tahoma", Font.BOLD, 50)); + jpLabel.setHorizontalAlignment(SwingConstants.CENTER); + appNamePanel.add(jpLabel); - cnt.add(splitPane1, BorderLayout.CENTER); + JLabel ffLabel = new JLabel("Free Flash "); + ffLabel.setAlignmentX(0.5f); + ffLabel.setFont(new Font("Tahoma", Font.BOLD, 50)); + ffLabel.setHorizontalAlignment(SwingConstants.CENTER); + appNamePanel.add(ffLabel); + + JLabel decLabel = new JLabel("Decompiler"); + decLabel.setAlignmentX(0.5f); + decLabel.setForeground(Color.red); + decLabel.setFont(new Font("Tahoma", Font.BOLD, 50)); + decLabel.setHorizontalAlignment(SwingConstants.CENTER); + appNamePanel.add(decLabel); + appNamePanel.setAlignmentX(0.5f); + welcomePanel.add(Box.createGlue()); + welcomePanel.add(welcomeToLabel); + welcomePanel.add(appNamePanel); + JLabel startLabel = new JLabel(translate("startup.selectopen")); + startLabel.setAlignmentX(0.5f); + startLabel.setFont(startLabel.getFont().deriveFont(30)); + welcomePanel.add(startLabel); + welcomePanel.add(Box.createGlue()); + cnt.add(welcomePanel, BorderLayout.CENTER); + } else { + cnt.add(splitPane1, BorderLayout.CENTER); + } //splitPane1.setDividerLocation(0.5); splitPane1.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { @@ -1128,6 +1421,8 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection public void close() throws SecurityException { } }); + + //pack(); } public void enableDrop(boolean value) { @@ -1161,6 +1456,19 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection } } + private static void getApplicationMenuButtons(Component comp, List ret) { + if (comp instanceof JRibbonApplicationMenuButton) { + ret.add((JRibbonApplicationMenuButton) comp); + return; + } + if (comp instanceof java.awt.Container) { + java.awt.Container cont = (java.awt.Container) comp; + for (int i = 0; i < cont.getComponentCount(); i++) { + getApplicationMenuButtons(cont.getComponent(i), ret); + } + } + } + @Override public void setVisible(boolean b) { super.setVisible(b); @@ -1172,9 +1480,71 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection actionPanel.initSplits(); } + final MainFrame t = this; + SwingUtilities.invokeLater(new Runnable() { @Override public void run() { + List mbuttons = new ArrayList<>(); + getApplicationMenuButtons(t, mbuttons); + + for (final JRibbonApplicationMenuButton mbutton : mbuttons) { + mbutton.setIcon(View.getResizableIcon("buttonicon_256")); + mbutton.setDisplayState(new CommandButtonDisplayState( + "My Ribbon Application Menu Button", mbutton.getSize().width) { + @Override + public org.pushingpixels.flamingo.api.common.CommandButtonLayoutManager createLayoutManager( + org.pushingpixels.flamingo.api.common.AbstractCommandButton commandButton) { + return new CommandButtonLayoutManager() { + @Override + public int getPreferredIconSize() { + return mbutton.getSize().width; + } + + @Override + public CommandButtonLayoutManager.CommandButtonLayoutInfo getLayoutInfo( + AbstractCommandButton commandButton, Graphics g) { + CommandButtonLayoutManager.CommandButtonLayoutInfo result = new CommandButtonLayoutManager.CommandButtonLayoutInfo(); + result.actionClickArea = new Rectangle(0, 0, 0, 0); + result.popupClickArea = new Rectangle(0, 0, commandButton + .getWidth(), commandButton.getHeight()); + result.popupActionRect = new Rectangle(0, 0, 0, 0); + ResizableIcon icon = commandButton.getIcon(); + icon.setDimension(new Dimension(commandButton.getWidth(), commandButton.getHeight())); + result.iconRect = new Rectangle( + 0, + 0, + commandButton.getWidth(), commandButton.getHeight()); + result.isTextInActionArea = false; + return result; + } + + @Override + public Dimension getPreferredSize( + AbstractCommandButton commandButton) { + return new Dimension(40, 40); + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + } + + @Override + public Point getKeyTipAnchorCenterPoint( + AbstractCommandButton commandButton) { + // dead center + return new Point(commandButton.getWidth() / 2, + commandButton.getHeight() / 2); + } + }; + } + }); + + MyRibbonApplicationMenuButtonUI mui = (MyRibbonApplicationMenuButtonUI) mbutton.getUI(); + mui.setHoverIcon(View.getResizableIcon("buttonicon_hover_256")); + mui.setNormalIcon(View.getResizableIcon("buttonicon_256")); + mui.setClickIcon(View.getResizableIcon("buttonicon_down_256")); + } splitPane1.setDividerLocation((Integer) Configuration.getConfig("gui.splitPane1.dividerLocation", getWidth() / 3)); int confDivLoc = (Integer) Configuration.getConfig("gui.splitPane2.dividerLocation", splitPane2.getHeight() * 3 / 5); if (confDivLoc > splitPane2.getHeight() - 10) { //In older releases, divider location was saved when detailPanel was invisible too @@ -1494,6 +1864,9 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection public TagNode getASTagNode(JTree tree) { TreeModel tm = tree.getModel(); + if (tm == null) { + return null; + } Object root = tm.getRoot(); for (int i = 0; i < tm.getChildCount(root); i++) { Object node = tm.getChild(root, i); @@ -1740,6 +2113,9 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection } public void gotoDocumentClass() { + if (swf == null) { + return; + } String documentClass = null; loopdc: for (Tag t : swf.tags) { @@ -1813,16 +2189,16 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection doFilter(); break; case "ASSOCIATE": - if (miAssociate.getState() == Main.isAddedToContextMenu()) { + if (miAssociate.isSelected() == Main.isAddedToContextMenu()) { return; } - Main.addToContextMenu(miAssociate.getState()); + Main.addToContextMenu(miAssociate.isSelected()); //Update checkbox menuitem accordingly (User can cancel rights elevation) new Timer().schedule(new TimerTask() { @Override public void run() { - miAssociate.setState(Main.isAddedToContextMenu()); + miAssociate.setSelected(Main.isAddedToContextMenu()); } }, 500); //It takes some time registry change to apply break; @@ -1964,8 +2340,8 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection break; case "AUTODEOBFUSCATE": - if (JOptionPane.showConfirmDialog(this, translate("message.confirm.autodeobfuscate") + "\r\n" + (autoDeobfuscateMenuItem.getState() ? translate("message.confirm.on") : translate("message.confirm.off")), translate("message.confirm"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) { - Configuration.setConfig("autoDeobfuscate", autoDeobfuscateMenuItem.getState()); + if (JOptionPane.showConfirmDialog(this, translate("message.confirm.autodeobfuscate") + "\r\n" + (autoDeobfuscateMenuItem.isSelected() ? translate("message.confirm.on") : translate("message.confirm.off")), translate("message.confirm"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) { + Configuration.setConfig("autoDeobfuscate", autoDeobfuscateMenuItem.isSelected()); clearCache(); if (abcPanel != null) { abcPanel.reload(); @@ -1973,7 +2349,7 @@ public class MainFrame extends AppFrame implements ActionListener, TreeSelection reload(true); doFilter(); } else { - autoDeobfuscateMenuItem.setState(!autoDeobfuscateMenuItem.getState()); + autoDeobfuscateMenuItem.setSelected(!autoDeobfuscateMenuItem.isSelected()); } break; case "EXIT": diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyFormattedTextField.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyFormattedTextField.java new file mode 100644 index 000000000..c72e4e651 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyFormattedTextField.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.text.Format; +import javax.swing.JFormattedTextField; + +/** + * + * @author JPEXS + */ +public class MyFormattedTextField extends JFormattedTextField { + + public MyFormattedTextField(Format format) { + super(format); + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuButtonUI.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuButtonUI.java new file mode 100644 index 000000000..2b0f923fb --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuButtonUI.java @@ -0,0 +1,287 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.awt.*; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; +import org.pushingpixels.flamingo.api.common.icon.ImageWrapperResizableIcon; +import org.pushingpixels.flamingo.api.common.icon.ResizableIcon; +import org.pushingpixels.flamingo.api.common.model.PopupButtonModel; +import org.pushingpixels.flamingo.internal.ui.ribbon.appmenu.BasicRibbonApplicationMenuButtonUI; +import org.pushingpixels.flamingo.internal.ui.ribbon.appmenu.JRibbonApplicationMenuButton; +import org.pushingpixels.lafwidget.LafWidgetUtilities; +import org.pushingpixels.lafwidget.animation.effects.GhostPaintingUtils; +import org.pushingpixels.lafwidget.animation.effects.GhostingListener; +import org.pushingpixels.substance.api.painter.border.SubstanceBorderPainter; +import org.pushingpixels.substance.api.painter.fill.SubstanceFillPainter; +import org.pushingpixels.substance.flamingo.common.ui.ActionPopupTransitionAwareUI; +import org.pushingpixels.substance.flamingo.utils.*; +import org.pushingpixels.substance.internal.animation.StateTransitionTracker; +import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities; + +/** + * UI for {@link JRibbonApplicationMenuButton} components in Substance + * look and feel. + * + * @author Kirill Grouchnikov + */ +/** + * + * @author JPEXS + */ +public class MyRibbonApplicationMenuButtonUI extends BasicRibbonApplicationMenuButtonUI implements + ActionPopupTransitionAwareUI { + + private ImageWrapperResizableIcon hoverIcon = null; + private ImageWrapperResizableIcon clickIcon = null; + private ImageWrapperResizableIcon normalIcon = null; + + public void setNormalIcon(ImageWrapperResizableIcon normalIcon) { + this.normalIcon = normalIcon; + } + + public ImageWrapperResizableIcon getHoverIcon() { + return hoverIcon; + } + + public ImageWrapperResizableIcon getClickIcon() { + return clickIcon; + } + + public ImageWrapperResizableIcon getNormalIcon() { + return normalIcon; + } + + public void setHoverIcon(ImageWrapperResizableIcon hoverIcon) { + this.hoverIcon = hoverIcon; + } + + public void setClickIcon(ImageWrapperResizableIcon clickIcon) { + this.clickIcon = clickIcon; + } + /** + * Model change listener for ghost image effects. + */ + private GhostingListener substanceModelChangeListener; + /** + * Tracker for visual state transitions. + */ + protected CommandButtonVisualStateTracker substanceVisualStateTracker; + + public static ComponentUI createUI(JComponent c) { + return new MyRibbonApplicationMenuButtonUI(); + } + + /* + * (non-Javadoc) + * + * @see org.jvnet.flamingo.common.ui.BasicCommandButtonUI#installListeners() + */ + @Override + protected void installListeners() { + super.installListeners(); + + this.substanceVisualStateTracker = new CommandButtonVisualStateTracker(); + this.substanceVisualStateTracker.installListeners(this.commandButton); + + this.substanceModelChangeListener = new GhostingListener( + this.commandButton, this.commandButton.getActionModel()); + this.substanceModelChangeListener.registerListeners(); + } + + /* + * (non-Javadoc) + * + * @see + * org.jvnet.flamingo.common.ui.BasicCommandButtonUI#uninstallListeners() + */ + @Override + protected void uninstallListeners() { + this.substanceVisualStateTracker.uninstallListeners(this.commandButton); + this.substanceVisualStateTracker = null; + + this.substanceModelChangeListener.unregisterListeners(); + this.substanceModelChangeListener = null; + + super.uninstallListeners(); + } + + /* + * (non-Javadoc) + * + * @see javax.swing.plaf.basic.BasicButtonUI#paint(java.awt.Graphics, + * javax.swing.JComponent) + */ + @Override + public void paint(Graphics g, JComponent c) { + JRibbonApplicationMenuButton b = (JRibbonApplicationMenuButton) c; + + if (hoverIcon != null) { + hoverIcon.setPreferredSize(b.getSize()); + } + if (clickIcon != null) { + clickIcon.setPreferredSize(b.getSize()); + } + if (normalIcon != null) { + normalIcon.setPreferredSize(b.getSize()); + } + + this.layoutInfo = this.layoutManager.getLayoutInfo(this.commandButton, + g); + commandButton.putClientProperty("icon.bounds", layoutInfo.iconRect); + + Graphics2D g2d = (Graphics2D) g.create(); + SubstanceFillPainter fillPainter = SubstanceCoreUtilities + .getFillPainter(commandButton); + SubstanceBorderPainter borderPainter = SubstanceCoreUtilities + .getBorderPainter(commandButton); + BufferedImage fullAlphaBackground = RibbonApplicationMenuButtonBackgroundDelegate + .getFullAlphaBackground(b, fillPainter, borderPainter, + commandButton.getWidth(), commandButton.getHeight()); + g2d.drawImage(fullAlphaBackground, 0, 0, null); + + // Paint the icon + ResizableIcon icon = getCurrentIcon(b); + /*if(icon instanceof ImageWrapperResizableIcon){ + ImageWrapperResizableIcon iw=(ImageWrapperResizableIcon)icon; + iw.setPreferredSize(b.getSize()); + iw.setDimension(b.getSize()); + }*/ + + + if (icon != null) { + int iconWidth = icon.getIconWidth(); + int iconHeight = icon.getIconHeight(); + Rectangle iconRect = new Rectangle((c.getWidth() - iconWidth) / 2, + (c.getHeight() - iconHeight) / 2, iconWidth, iconHeight); + paintButtonIcon(g2d, iconRect); + } + + g2d.dispose(); + } + + private ResizableIcon getCurrentIcon(JRibbonApplicationMenuButton button) { + PopupButtonModel mod = button.getPopupModel(); + if (mod.isPopupShowing()) { + if (clickIcon != null) { + return clickIcon; + } + } + if (mod.isRollover()) { + if (hoverIcon != null) { + return hoverIcon; + } + } + if (normalIcon != null) { + return normalIcon; + } + return button.getIcon(); + } + + /* + * (non-Javadoc) + * + * @see + * org.jvnet.flamingo.common.ui.BasicCommandButtonUI#paintButtonIcon(java + * .awt.Graphics, java.awt.Rectangle) + */ + @Override + protected void paintButtonIcon(Graphics g, Rectangle iconRect) { + Icon regular = this.applicationMenuButton.isEnabled() ? getCurrentIcon(this.applicationMenuButton) + : this.applicationMenuButton.getDisabledIcon(); + if (regular == null) { + return; + } + boolean useThemed = SubstanceCoreUtilities + .useThemedDefaultIcon(this.applicationMenuButton); + + if (regular != null) { + Graphics2D g2d = (Graphics2D) g.create(); + + GhostPaintingUtils.paintGhostIcon(g2d, this.applicationMenuButton, + regular, iconRect); + g2d.setComposite(LafWidgetUtilities.getAlphaComposite( + this.applicationMenuButton, g)); + + if (!useThemed) { + regular.paintIcon(this.applicationMenuButton, g2d, iconRect.x, + iconRect.y); + } else { + CommandButtonBackgroundDelegate.paintThemedCommandButtonIcon( + g2d, iconRect, this.applicationMenuButton, regular, + this.applicationMenuButton.getPopupModel(), + this.substanceVisualStateTracker + .getPopupStateTransitionTracker()); + } + g2d.dispose(); + } + } + + /* + * (non-Javadoc) + * + * @see + * org.jvnet.flamingo.ribbon.ui.appmenu.BasicRibbonApplicationMenuButtonUI + * #update(java.awt.Graphics, javax.swing.JComponent) + */ + @Override + public void update(Graphics g, JComponent c) { + this.paint(g, c); + } + + /* + * (non-Javadoc) + * + * @see + * org.jvnet.substance.SubstanceButtonUI#contains(javax.swing.JComponent, + * int, int) + */ + @Override + public boolean contains(JComponent c, int x, int y) { + // allow clicking anywhere in the area (around the button + // round outline as well) to activate the button. + return (x >= 0) && (x < c.getWidth()) && (y >= 0) + && (y < c.getHeight()); + } + + @Override + public StateTransitionTracker getActionTransitionTracker() { + return this.substanceVisualStateTracker + .getActionStateTransitionTracker(); + } + + @Override + public StateTransitionTracker getPopupTransitionTracker() { + return this.substanceVisualStateTracker + .getPopupStateTransitionTracker(); + } + + @Override + public StateTransitionTracker getTransitionTracker() { + return this.substanceVisualStateTracker + .getPopupStateTransitionTracker(); + } + + @Override + public boolean isInside(MouseEvent me) { + return true; + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java new file mode 100644 index 000000000..f00808c19 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyRibbonApplicationMenuPopupPanelUI.java @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.awt.BasicStroke; +import java.awt.Component; +import java.awt.Container; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.RenderingHints; +import javax.swing.CellRendererPane; +import javax.swing.JComponent; +import javax.swing.border.Border; +import javax.swing.border.CompoundBorder; +import javax.swing.plaf.ComponentUI; +import org.pushingpixels.flamingo.internal.ui.ribbon.appmenu.BasicRibbonApplicationMenuPopupPanelUI; +import org.pushingpixels.flamingo.internal.ui.ribbon.appmenu.JRibbonApplicationMenuButton; +import org.pushingpixels.substance.api.ColorSchemeAssociationKind; +import org.pushingpixels.substance.api.ComponentState; +import org.pushingpixels.substance.api.SubstanceColorScheme; +import org.pushingpixels.substance.internal.painter.HighlightPainterUtils; +import org.pushingpixels.substance.internal.utils.SubstanceColorSchemeUtilities; +import org.pushingpixels.substance.internal.utils.SubstanceSizeUtils; +import org.pushingpixels.substance.internal.utils.border.SubstanceBorder; + +/** + * + * @author JPEXS + */ +public class MyRibbonApplicationMenuPopupPanelUI extends BasicRibbonApplicationMenuPopupPanelUI { + + public static ComponentUI createUI(JComponent c) { + return new MyRibbonApplicationMenuPopupPanelUI(); + } + + @Override + protected void installComponents() { + super.installComponents(); + Border newBorder = new CompoundBorder(new SubstanceBorder(new Insets(2, + 2, 2, 2)), new Border() { + @Override + public boolean isBorderOpaque() { + return true; + } + + @Override + public Insets getBorderInsets(Component c) { + return new Insets(18, 0, 0, 0); + } + + @Override + public void paintBorder(Component c, Graphics g, int x, int y, + int width, int height) { + SubstanceColorScheme bgFillScheme = SubstanceColorSchemeUtilities + .getColorScheme(c, + ColorSchemeAssociationKind.HIGHLIGHT, + ComponentState.ENABLED); + SubstanceColorScheme bgBorderScheme = SubstanceColorSchemeUtilities + .getColorScheme(c, + ColorSchemeAssociationKind.HIGHLIGHT_BORDER, + ComponentState.ENABLED); + HighlightPainterUtils.paintHighlight(g, null, c, new Rectangle( + x, y, width, height), 0.0f, null, bgFillScheme, + bgBorderScheme); + + // draw the application menu button + JRibbonApplicationMenuButton rendererButton = new JRibbonApplicationMenuButton( + applicationMenuPopupPanel.getAppMenuButton() + .getRibbon()); + + JRibbonApplicationMenuButton appMenuButton = applicationMenuPopupPanel + .getAppMenuButton(); + rendererButton.applyComponentOrientation(appMenuButton + .getComponentOrientation()); + + rendererButton.setPopupKeyTip(appMenuButton.getPopupKeyTip()); + rendererButton.getPopupModel().setPopupShowing(true); + rendererButton.setDisplayState(appMenuButton.getDisplayState()); + rendererButton.setIcon(((MyRibbonApplicationMenuButtonUI) appMenuButton.getUI()).getClickIcon()); + + rendererButton.getPopupModel().setRollover(false); + rendererButton.getPopupModel().setPressed(true); + rendererButton.getPopupModel().setArmed(true); + + + CellRendererPane buttonRendererPane = new CellRendererPane(); + Point buttonLoc = appMenuButton.getLocationOnScreen(); + Point panelLoc = c.getLocationOnScreen(); + + buttonRendererPane.setBounds(panelLoc.x - buttonLoc.x, + panelLoc.y - buttonLoc.y, appMenuButton.getWidth(), + appMenuButton.getHeight()); + + buttonRendererPane.paintComponent(g, rendererButton, + (Container) c, -panelLoc.x + buttonLoc.x, -panelLoc.y + + buttonLoc.y, appMenuButton.getWidth(), + appMenuButton.getHeight(), true); + /*g.setColor(Color.red); + g.fillRect(0, 0, width,height);*/ + } + }); + this.applicationMenuPopupPanel.setBorder(newBorder); + + this.panelLevel2.setBorder(new Border() { + @Override + public Insets getBorderInsets(Component c) { + boolean ltr = c.getComponentOrientation().isLeftToRight(); + return new Insets(0, ltr ? 1 : 0, 0, ltr ? 0 : 1); + } + + @Override + public boolean isBorderOpaque() { + return true; + } + + @Override + public void paintBorder(Component c, Graphics g, int x, int y, + int width, int height) { + int componentFontSize = SubstanceSizeUtils + .getComponentFontSize(null); + int borderDelta = (int) Math.floor(SubstanceSizeUtils + .getBorderStrokeWidth(componentFontSize) / 2.0); + float borderThickness = SubstanceSizeUtils + .getBorderStrokeWidth(componentFontSize); + + Graphics2D g2d = (Graphics2D) g.create(); + SubstanceColorScheme scheme = SubstanceColorSchemeUtilities + .getColorScheme(applicationMenuPopupPanel, + ColorSchemeAssociationKind.BORDER, + ComponentState.ENABLED); + g2d.setColor(scheme.getMidColor()); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, + RenderingHints.VALUE_STROKE_NORMALIZE); + int joinKind = BasicStroke.JOIN_ROUND; + int capKind = BasicStroke.CAP_BUTT; + g2d.setStroke(new BasicStroke(borderThickness, capKind, + joinKind)); + + boolean ltr = applicationMenuPopupPanel + .getComponentOrientation().isLeftToRight(); + int lineX = ltr ? borderDelta : c.getWidth() - borderDelta - 1; + g2d.drawLine(lineX, borderDelta, lineX, height - 1 - 2 + * borderDelta); + + g2d.dispose(); + } + }); + this.mainPanel.setBorder(new SubstanceBorder()); + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyTextField.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyTextField.java new file mode 100644 index 000000000..c3609a8ff --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyTextField.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import javax.swing.JTextField; + +/** + * + * @author JPEXS + */ +public class MyTextField extends JTextField { + + public MyTextField() { + this(""); + } + + public MyTextField(String text) { + super(text); + } +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyTree.java new file mode 100644 index 000000000..5b9f41587 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyTree.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.awt.Color; +import javax.swing.JTree; +import javax.swing.tree.TreeModel; + +/** + * + * @author JPEXS + */ +public class MyTree extends JTree { + + public MyTree() { + setUI(new MyTreeUI()); + setBackground(Color.white); + } + + public MyTree(TreeModel newModel) { + super(newModel); + setUI(new MyTreeUI()); + setBackground(Color.white); + } + private boolean overrideIsEnabled = false; + + public void setOverrideIsEnable(boolean b) { + overrideIsEnabled = true; + } + + public boolean isOverrideIsEnable(boolean b) { + return overrideIsEnabled; + } + + @Override + public boolean isEnabled() { + if (overrideIsEnabled) { + return false; + } + return super.isEnabled(); + } + /* + @Override + public void paint(Graphics g) { + g.setColor(Color.white); + g.fillRect(0, 0, getWidth(), getHeight()); + super.paint(g); + }*/ +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MyTreeUI.java b/trunk/src/com/jpexs/decompiler/flash/gui/MyTreeUI.java new file mode 100644 index 000000000..1eaa81611 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MyTreeUI.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2013 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.gui; + +import java.awt.Graphics; +import java.awt.Insets; +import java.awt.Rectangle; +import java.lang.reflect.Field; +import javax.swing.tree.TreePath; +import org.pushingpixels.substance.internal.ui.SubstanceTreeUI; + +/** + * + * @author JPEXS + */ +class MyTreeUI extends SubstanceTreeUI { + + @Override + protected void paintHorizontalPartOfLeg(Graphics g, Rectangle clipBounds, + Insets insets, Rectangle bounds, TreePath path, int row, + boolean isExpanded, boolean hasBeenExpanded, boolean isLeaf) { + System.out.println(""); + if (this.tree instanceof MyTree) { + Field f = null; + Boolean v = false; + try { + f = SubstanceTreeUI.class.getDeclaredField("inside"); + f.setAccessible(true); + v = (Boolean) f.get(this); + f.set(this, Boolean.TRUE); + ((MyTree) this.tree).setOverrideIsEnable(true); + } catch (Throwable t) { + //want to default back to substanceUI if this fails. + } + + super.paintHorizontalPartOfLeg(g, bounds, insets, bounds, path, row, isLeaf, isLeaf, isLeaf); + try { + f.set(this, v); + ((MyTree) this.tree).setOverrideIsEnable(true); + } catch (Throwable t) { + //see above + } + } + } +//repeat for Vertical +} diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java index fa5ebb929..babcbe10d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/SWFPreviwPanel.java @@ -28,7 +28,6 @@ import java.util.TimerTask; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; -import javax.swing.border.BevelBorder; /** * @@ -49,9 +48,9 @@ public class SWFPreviwPanel extends JPanel { add(buffering, BorderLayout.SOUTH); buffering.setHorizontalAlignment(JLabel.CENTER); buffering.setVisible(false); - JLabel prevLabel = new JLabel("SWF preview (Internal viewer)"); + JLabel prevLabel = new HeaderLabel(translate("swfpreview.internal")); prevLabel.setHorizontalAlignment(SwingConstants.CENTER); - prevLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //prevLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); add(prevLabel, BorderLayout.NORTH); } private SWF swf; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SearchDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/SearchDialog.java index 876b949da..5be8fccaf 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/SearchDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/SearchDialog.java @@ -38,7 +38,7 @@ import javax.swing.JTextField; */ public class SearchDialog extends AppDialog implements ActionListener { - public JTextField searchField = new JTextField(); + public JTextField searchField = new MyTextField(); public JCheckBox ignoreCaseCheckBox = new JCheckBox(translate("checkbox.ignorecase")); public JCheckBox regexpCheckBox = new JCheckBox(translate("checkbox.regexp")); public boolean result = false; @@ -58,7 +58,7 @@ public class SearchDialog extends AppDialog implements ActionListener { panButtons.add(okButton); panButtons.add(cancelButton); JPanel panField = new JPanel(new FlowLayout()); - searchField.setPreferredSize(new Dimension(250, 25)); + searchField.setPreferredSize(new Dimension(250, searchField.getPreferredSize().height)); panField.add(new JLabel(translate("label.searchtext"))); panField.add(searchField); cnt.add(panField); @@ -69,9 +69,11 @@ public class SearchDialog extends AppDialog implements ActionListener { cnt.add(panButtons); getRootPane().setDefaultButton(okButton); View.centerScreen(this); - View.setWindowIcon(this); + //View.setWindowIcon(this); + setIconImage(View.loadImage("search16")); setTitle(translate("dialog.title")); setModalityType(ModalityType.APPLICATION_MODAL); + pack(); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java index f413a2482..a2657f63e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/SelectLanguageDialog.java @@ -92,6 +92,7 @@ public class SelectLanguageDialog extends AppDialog implements ActionListener { View.setWindowIcon(this); View.centerScreen(this); setTitle("Select language"); + pack(); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/View.java b/trunk/src/com/jpexs/decompiler/flash/gui/View.java index fd16bf4c2..61de7a46c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/View.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/View.java @@ -20,7 +20,10 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.awt.event.WindowEvent; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; @@ -29,8 +32,13 @@ import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JRootPane; import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; +import org.pushingpixels.flamingo.api.common.icon.ImageWrapperResizableIcon; +import org.pushingpixels.substance.api.SubstanceConstants; +import org.pushingpixels.substance.api.SubstanceLookAndFeel; +import org.pushingpixels.substance.api.skin.SubstanceOfficeBlue2007LookAndFeel; /** * Contains methods for GUI @@ -43,14 +51,51 @@ public class View { * Sets windows Look and Feel */ public static void setLookAndFeel() { + +//if(true)return; + //System.setProperty("peacock.appButtonSize", "32"); + /*try { + UIManager.setLookAndFeel("org.fife.plaf.OfficeXP.OfficeXPLookAndFeel"); + } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException ignored) { + ignored.printStackTrace(); + }*/ + /*try { + + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + + } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException ignored) { + }*/ + try { - UIManager.setLookAndFeel( - UIManager.getSystemLookAndFeelClassName()); - } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException ignored) { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + UIManager.setLookAndFeel(new SubstanceOfficeBlue2007LookAndFeel()); + UIManager.put(SubstanceLookAndFeel.COLORIZATION_FACTOR, 1.0); + UIManager.put("Tree.expandedIcon", getIcon("expand16")); + UIManager.put("Tree.collapsedIcon", getIcon("collapse16")); + + UIManager.put("RibbonApplicationMenuPopupPanelUI", MyRibbonApplicationMenuPopupPanelUI.class.getName()); + UIManager.put("RibbonApplicationMenuButtonUI", MyRibbonApplicationMenuButtonUI.class.getName()); + //UIManager.put(SubstanceLookAndFeel.USE_THEMED_DEFAULT_ICONS,Boolean.TRUE); + //UIManager.put("InternalFrame.icon",View.getIcon("icon16")); + //UIManager.getDefaults().put("TreeUI", BasicTreeUI.class.getName() ); + } catch (UnsupportedLookAndFeelException ex) { + Logger.getLogger(View.class.getName()).log(Level.SEVERE, null, ex); + } + } + }); + } catch (InterruptedException | InvocationTargetException ex) { + Logger.getLogger(View.class.getName()).log(Level.SEVERE, null, ex); } + UIManager.put(SubstanceLookAndFeel.TABBED_PANE_CONTENT_BORDER_KIND, SubstanceConstants.TabContentPaneBorderKind.SINGLE_FULL); + + + JFrame.setDefaultLookAndFeelDecorated(true); JDialog.setDefaultLookAndFeelDecorated(true); } @@ -76,6 +121,7 @@ public class View { images.add(loadImage("icon16")); images.add(loadImage("icon32")); images.add(loadImage("icon48")); + images.add(loadImage("icon256")); f.setIconImages(images); } @@ -110,4 +156,20 @@ public class View { escapeStroke, dispatchWindowClosingActionMapKey); root.getActionMap().put(dispatchWindowClosingActionMapKey, dispatchClosing); } + + public static ImageWrapperResizableIcon getResizableIcon(String resource) { + return ImageWrapperResizableIcon.getIcon(View.class.getResource("/com/jpexs/decompiler/flash/gui/graphics/" + resource + ".png"), new Dimension(256, 256)); + } + + public static void execInEventDispatch(Runnable r) { + if (SwingUtilities.isEventDispatchThread()) { + r.run(); + } else { + try { + SwingUtilities.invokeAndWait(r); + } catch ( InterruptedException | InvocationTargetException ex) { + Logger.getLogger(View.class.getName()).log(Level.SEVERE, null, ex); + } + } + } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java index ca553f4bc..b7cb5544a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java @@ -23,7 +23,9 @@ import com.jpexs.decompiler.flash.abc.ClassPath; import com.jpexs.decompiler.flash.abc.ScriptPack; import static com.jpexs.decompiler.flash.gui.AppStrings.translate; import com.jpexs.decompiler.flash.gui.Freed; +import com.jpexs.decompiler.flash.gui.HeaderLabel; import com.jpexs.decompiler.flash.gui.Main; +import com.jpexs.decompiler.flash.gui.MyTextField; import com.jpexs.decompiler.flash.gui.TagTreeModel; import com.jpexs.decompiler.flash.gui.View; import com.jpexs.decompiler.flash.gui.abc.tablemodels.DecimalTableModel; @@ -51,7 +53,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; import javax.swing.*; -import javax.swing.border.BevelBorder; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.table.*; @@ -74,10 +75,10 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Fr //public JSplitPane splitPaneTreeNavVSDecompiledDetail; private JTable constantTable; public JComboBox constantTypeList; - public JLabel asmLabel = new JLabel(translate("panel.disassembled")); - public JLabel decLabel = new JLabel(translate("panel.decompiled")); + public JLabel asmLabel = new HeaderLabel(translate("panel.disassembled")); + public JLabel decLabel = new HeaderLabel(translate("panel.decompiled")); public DetailPanel detailPanel; - public JTextField filterField = new JTextField(); + public JTextField filterField = new MyTextField(); public JPanel navPanel; public JTabbedPane tabbedPane; public JPanel searchPanel; @@ -285,7 +286,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Fr panB.add(decPanel, BorderLayout.CENTER); panB.add(decLabel, BorderLayout.NORTH); decLabel.setHorizontalAlignment(SwingConstants.CENTER); - decLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //decLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panB, detailPanel); splitPane.setResizeWeight(0.5); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java index fb4737cfa..e5c842684 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ASMSourceEditorPane.java @@ -22,10 +22,10 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph; import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; -import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.flash.gui.GraphFrame; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DeobfuscationDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DeobfuscationDialog.java index 357211a36..e516e42c1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DeobfuscationDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DeobfuscationDialog.java @@ -21,12 +21,15 @@ import com.jpexs.decompiler.flash.gui.View; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Hashtable; +import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.JSlider; /** @@ -45,17 +48,18 @@ public class DeobfuscationDialog extends AppDialog implements ActionListener { @SuppressWarnings("unchecked") public DeobfuscationDialog() { setDefaultCloseOperation(HIDE_ON_CLOSE); - setSize(new Dimension(300, 270)); + setSize(new Dimension(330, 270)); setTitle(translate("dialog.title")); Container cp = getContentPane(); - cp.setLayout(null); + cp.setLayout(new BoxLayout(cp, BoxLayout.Y_AXIS)); codeProcessingLevel = new JSlider(JSlider.VERTICAL, 1, 3, 3); codeProcessingLevel.setMajorTickSpacing(1); codeProcessingLevel.setPaintTicks(true); codeProcessingLevel.setMinorTickSpacing(1); codeProcessingLevel.setSnapToTicks(true); JLabel lab1 = new JLabel(translate("deobfuscation.level")); - lab1.setBounds(30, 0, getWidth() - 60, 25); + //lab1.setBounds(30, 0, getWidth() - 60, 25); + lab1.setAlignmentX(0.5f); cp.add(lab1); Hashtable labelTable = new Hashtable(); //labelTable.put(new Integer(LEVEL_NONE), new JLabel("None")); @@ -67,14 +71,15 @@ public class DeobfuscationDialog extends AppDialog implements ActionListener { codeProcessingLevel.setPaintLabels(true); codeProcessingLevel.setAlignmentX(Component.CENTER_ALIGNMENT); - codeProcessingLevel.setSize(300, 200); + //codeProcessingLevel.setSize(300, 200); - codeProcessingLevel.setBounds(30, 25, getWidth() - 60, 125); - + //codeProcessingLevel.setBounds(30, 25, getWidth() - 60, 125); + codeProcessingLevel.setAlignmentX(0.5f); add(codeProcessingLevel); - processAllCheckbox.setBounds(50, 150, getWidth() - 100, 25); + //processAllCheckbox.setBounds(50, 150, getWidth() - 100, 25); + processAllCheckbox.setAlignmentX(0.5f); add(processAllCheckbox); processAllCheckbox.setSelected(true); @@ -85,13 +90,17 @@ public class DeobfuscationDialog extends AppDialog implements ActionListener { JButton okButton = new JButton(translate("button.ok")); okButton.addActionListener(this); okButton.setActionCommand("OK"); - okButton.setBounds(50, 200, 75, 25); - cancelButton.setBounds(145, 200, 75, 25); - cp.add(okButton); - cp.add(cancelButton); + + JPanel buttonsPanel = new JPanel(new FlowLayout()); + buttonsPanel.add(okButton); + buttonsPanel.add(cancelButton); + buttonsPanel.setAlignmentX(0.5f); + cp.add(buttonsPanel); + setModal(true); View.centerScreen(this); - View.setWindowIcon(this); + //View.setWindowIcon(this); + setIconImage(View.loadImage("deobfuscate16")); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java index 57d538bc2..512799672 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui.abc; import com.jpexs.decompiler.flash.abc.types.traits.Trait; import static com.jpexs.decompiler.flash.gui.AppStrings.translate; +import com.jpexs.decompiler.flash.gui.HeaderLabel; import com.jpexs.decompiler.flash.gui.View; import com.jpexs.decompiler.flash.helpers.Helper; import java.awt.BorderLayout; @@ -99,9 +100,9 @@ public class DetailPanel extends JPanel implements ActionListener { selectedCard = UNSUPPORTED_TRAIT_CARD; layout.show(innerPanel, UNSUPPORTED_TRAIT_CARD); buttonsPanel.setVisible(false); - selectedLabel = new JLabel(""); + selectedLabel = new HeaderLabel(""); selectedLabel.setText(selectedCard); - selectedLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //selectedLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); selectedLabel.setHorizontalAlignment(SwingConstants.CENTER); JPanel topPanel = new JPanel(new BorderLayout()); topPanel.add(selectedLabel, BorderLayout.NORTH); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodBodyParamsPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodBodyParamsPanel.java index c4405092c..181722129 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodBodyParamsPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/MethodBodyParamsPanel.java @@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui.abc; import com.jpexs.decompiler.flash.abc.types.MethodBody; import static com.jpexs.decompiler.flash.gui.AppStrings.translate; +import com.jpexs.decompiler.flash.gui.MyFormattedTextField; import java.awt.Color; import java.awt.Dimension; import java.text.NumberFormat; @@ -49,10 +50,10 @@ public class MethodBodyParamsPanel extends JPanel implements ChangeListener { this.abcPanel = abcPanel; JComponent cmps[][] = new JComponent[][]{ - {maxStackLabel = new JLabel(translate("abc.detail.body.params.maxstack"), SwingConstants.RIGHT), maxStackField = new JFormattedTextField(NumberFormat.getNumberInstance())}, - {localCountLabel = new JLabel(translate("abc.detail.body.params.localregcount"), SwingConstants.RIGHT), localCountField = new JFormattedTextField(NumberFormat.getNumberInstance())}, - {initScopeDepthLabel = new JLabel(translate("abc.detail.body.params.minscope"), SwingConstants.RIGHT), initScopeDepthField = new JFormattedTextField(NumberFormat.getNumberInstance())}, - {maxScopeDepthLabel = new JLabel(translate("abc.detail.body.params.maxscope"), SwingConstants.RIGHT), maxScopeDepthField = new JFormattedTextField(NumberFormat.getNumberInstance())} + {maxStackLabel = new JLabel(translate("abc.detail.body.params.maxstack"), SwingConstants.RIGHT), maxStackField = new MyFormattedTextField(NumberFormat.getNumberInstance())}, + {localCountLabel = new JLabel(translate("abc.detail.body.params.localregcount"), SwingConstants.RIGHT), localCountField = new MyFormattedTextField(NumberFormat.getNumberInstance())}, + {initScopeDepthLabel = new JLabel(translate("abc.detail.body.params.minscope"), SwingConstants.RIGHT), initScopeDepthField = new MyFormattedTextField(NumberFormat.getNumberInstance())}, + {maxScopeDepthLabel = new JLabel(translate("abc.detail.body.params.maxscope"), SwingConstants.RIGHT), maxScopeDepthField = new MyFormattedTextField(NumberFormat.getNumberInstance())} }; @@ -64,11 +65,14 @@ public class MethodBodyParamsPanel extends JPanel implements ChangeListener { } } + int top = 0; for (int i = 0; i < cmps.length; i++) { - cmps[i][0].setBounds(10, 30 * i, maxw, 25); - cmps[i][1].setBounds(10 + maxw + 10, 30 * i, 75, 25); + + cmps[i][0].setBounds(10, top, maxw, cmps[i][1].getPreferredSize().height); + cmps[i][1].setBounds(10 + maxw + 10, top, 75, cmps[i][1].getPreferredSize().height); add(cmps[i][0]); add(cmps[i][1]); + top += cmps[i][1].getPreferredSize().height; } add(autoFillCheckBox); @@ -76,9 +80,9 @@ public class MethodBodyParamsPanel extends JPanel implements ChangeListener { experimentalLabel.setForeground(Color.red); - autoFillCheckBox.setLocation(0, 30 * 5); + autoFillCheckBox.setLocation(0, top); autoFillCheckBox.setSize(autoFillCheckBox.getPreferredSize()); - experimentalLabel.setLocation(20 + autoFillCheckBox.getWidth(), 30 * 5); + experimentalLabel.setLocation(20 + autoFillCheckBox.getWidth(), top); experimentalLabel.setSize(experimentalLabel.getPreferredSize()); add(experimentalLabel); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java index c030db3f6..f86703565 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TraitsList.java @@ -18,6 +18,10 @@ package com.jpexs.decompiler.flash.gui.abc; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.tags.ABCContainerTag; +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; import java.util.List; import javax.swing.DefaultListModel; import javax.swing.JList; @@ -47,6 +51,8 @@ public class TraitsList extends JList implements ListSelectionListener { addListSelectionListener(this); this.abcPanel = abcPanel; setCellRenderer(new IconListRenderer()); + //setUI(new BasicListUI()); + setBackground(Color.white); } @SuppressWarnings("unchecked") @@ -83,4 +89,11 @@ public class TraitsList extends JList implements ListSelectionListener { abcPanel.decompiledTextArea.gotoTrait(sel == null ? -1 : sel.getGlobalTraitId()); } + + @Override + public void paint(Graphics g) { + Graphics2D g2d = (Graphics2D) g; + g2d.setComposite(AlphaComposite.SrcOver); + super.paint(g); + } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java index 2cc90537f..9db27026c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java @@ -25,6 +25,7 @@ import com.jpexs.decompiler.flash.gui.AppFrame; import com.jpexs.decompiler.flash.gui.View; import com.jpexs.decompiler.flash.tags.ABCContainerTag; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Container; import java.awt.FlowLayout; import java.awt.event.ActionEvent; @@ -57,6 +58,7 @@ public class UsageFrame extends AppFrame implements ActionListener, MouseListene usageListModel.addElement(u); } usageList = new JList(usageListModel); + usageList.setBackground(Color.white); gotoButton.setActionCommand("GOTO"); gotoButton.addActionListener(this); cancelButton.setActionCommand("CANCEL"); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java index 8962a7b6e..a7027b643 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java @@ -27,10 +27,9 @@ import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser; import com.jpexs.decompiler.flash.action.parser.script.ActionScriptParser; import com.jpexs.decompiler.flash.action.swf4.ActionPush; import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; -import com.jpexs.decompiler.graph.Graph; -import com.jpexs.decompiler.graph.GraphTargetItem; import static com.jpexs.decompiler.flash.gui.AppStrings.translate; import com.jpexs.decompiler.flash.gui.GraphFrame; +import com.jpexs.decompiler.flash.gui.HeaderLabel; import com.jpexs.decompiler.flash.gui.Main; import com.jpexs.decompiler.flash.gui.TagTreeModel; import com.jpexs.decompiler.flash.gui.View; @@ -40,6 +39,8 @@ import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.Tag; import com.jpexs.decompiler.flash.tags.base.ASMSource; +import com.jpexs.decompiler.graph.Graph; +import com.jpexs.decompiler.graph.GraphTargetItem; import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.Font; @@ -68,7 +69,6 @@ import javax.swing.JSplitPane; import javax.swing.JToggleButton; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.border.BevelBorder; import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; import javax.swing.tree.TreePath; @@ -89,8 +89,8 @@ public class ActionPanel extends JPanel implements ActionListener { public JButton saveDecompiledButton = new JButton(translate("button.save"), View.getIcon("save16")); public JButton cancelDecompiledButton = new JButton(translate("button.cancel"), View.getIcon("cancel16")); public JToggleButton hexButton; - public JLabel asmLabel = new JLabel(translate("panel.disassembled")); - public JLabel decLabel = new JLabel(translate("panel.decompiled")); + public JLabel asmLabel = new HeaderLabel(translate("panel.disassembled")); + public JLabel decLabel = new HeaderLabel(translate("panel.decompiled")); public List decompiledHilights = new ArrayList<>(); public List disassembledHilights = new ArrayList<>(); public String lastDisasm = ""; @@ -389,7 +389,7 @@ public class ActionPanel extends JPanel implements ActionListener { JPanel panB = new JPanel(); panB.setLayout(new BorderLayout()); asmLabel.setHorizontalAlignment(SwingConstants.CENTER); - asmLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //asmLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); panB.add(asmLabel, BorderLayout.NORTH); panB.add(panCode, BorderLayout.CENTER); @@ -452,7 +452,7 @@ public class ActionPanel extends JPanel implements ActionListener { panA.add(decLabel, BorderLayout.NORTH); panA.add(decButtonsPan, BorderLayout.SOUTH); decLabel.setHorizontalAlignment(SwingConstants.CENTER); - decLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + //decLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/about32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/about32.png new file mode 100644 index 000000000..93c67f2bf Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/about32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_256.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_256.png new file mode 100644 index 000000000..7081c49c4 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_256.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_down_256.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_down_256.png new file mode 100644 index 000000000..e19ec235e Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_down_256.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_hover_256.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_hover_256.png new file mode 100644 index 000000000..359ff7fcb Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/buttonicon_hover_256.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/collapse16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/collapse16.png new file mode 100644 index 000000000..ebc4c1a88 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/collapse16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate16.png index 2d5fb90ec..e24982b06 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate16.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate32.png new file mode 100644 index 000000000..d483c825f Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscate32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/donate32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/donate32.png new file mode 100644 index 000000000..fa7092c58 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/donate32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/expand16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/expand16.png index abcd93689..4c7412b3a 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/expand16.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/expand16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/export32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/export32.png new file mode 100644 index 000000000..d8b9f2cff Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/export32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportfla32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportfla32.png new file mode 100644 index 000000000..648b1d073 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportfla32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel16.png index 4e021666f..acd54a7ac 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel16.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel32.png new file mode 100644 index 000000000..2a01d8d22 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exportsel32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/gotomainclass16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/gotomainclass16.png new file mode 100644 index 000000000..80fe1ed0c Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/gotomainclass16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/gotomainclass32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/gotomainclass32.png new file mode 100644 index 000000000..c3bfa3250 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/gotomainclass32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage16.png index fed62219f..ae82ec20e 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage16.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage32.png new file mode 100644 index 000000000..38a1029ce Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/homepage32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png index c2cd4d0e4..83a00ff08 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png index 67422d30a..e671c5cca 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png index 16ddcfdff..21788e287 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png index 4dd361b1b..2e0833837 100644 Binary files a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/rename16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/rename16.png new file mode 100644 index 000000000..d6e771471 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/rename16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/renameall16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/renameall16.png new file mode 100644 index 000000000..0b2f09270 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/renameall16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/save32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/save32.png new file mode 100644 index 000000000..3a9dcf37e Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/save32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveas32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveas32.png new file mode 100644 index 000000000..915e280c5 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveas32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/search32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/search32.png new file mode 100644 index 000000000..1d6852224 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/search32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/setlanguage16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/setlanguage16.png new file mode 100644 index 000000000..7bc9233ea Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/setlanguage16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/setlanguage32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/setlanguage32.png new file mode 100644 index 000000000..dd65538d7 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/setlanguage32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/update32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/update32.png new file mode 100644 index 000000000..663e246ba Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/update32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog.properties index d47ff7a0c..a39026dd5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog.properties +++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog.properties @@ -17,6 +17,7 @@ version = version by = by button.ok = OK dialog.title = About +contributors = Contributors: #In the translation, replace "english" with target language name translation.author.label = Author of english translation: #In the translation, insert your name here diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog_cs.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog_cs.properties index 06db9e1cf..ae8d2eb9a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog_cs.properties +++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/AboutDialog_cs.properties @@ -17,5 +17,6 @@ version = verze by = autor: button.ok = OK dialog.title = O aplikaci +contributors = P\u0159isp\u011bvatel\u00e9: translation.author.label = Autor \u010desk\u00e9ho p\u0159ekladu: translation.author = JPEXS diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties index 6f8116478..7fbb11356 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties +++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties @@ -324,4 +324,11 @@ button.abort = Abort button.retry = Retry button.ignore = Ignore -font.source = Source Font: \ No newline at end of file +font.source = Source Font: + +menu.export = Export +menu.general = General +menu.language = Language + +startup.welcometo = Welcome to +startup.selectopen = Click open icon on the top panel or drag SWF file to this window to start. \ No newline at end of file diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties index 5f9c0021e..9fd147710 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties +++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties @@ -322,4 +322,11 @@ button.abort = P\u0159eru\u0161it button.retry = Znovu button.ignore = Ignorovat -font.source = Zdrojov\u00e9 p\u00edsmo: \ No newline at end of file +font.source = Zdrojov\u00e9 p\u00edsmo: + +menu.export = Export +menu.general = Hlavn\u00ed +menu.language = Jazyk + +startup.welcometo = V\u00edtejte v programu +startup.selectopen = Pro za\u010d\u00e1tek klikn\u011bte na otev\u0159\u00edt v horn\u00edm panelu nebo p\u0159et\u00e1hn\u011bte SWF soubor p\u0159\u00edmo do tohoto okna. \ No newline at end of file diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java index 1abf7b608..c2276f18e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java @@ -93,7 +93,7 @@ public class ProxyFrame extends AppFrame implements ActionListener, CatchedListe cnt.add(new JScrollPane(swfList), BorderLayout.CENTER); - portField.setPreferredSize(new Dimension(60, 22)); + portField.setPreferredSize(new Dimension(80, portField.getPreferredSize().height)); JPanel buttonsPanel = new JPanel(); buttonsPanel.setLayout(new FlowLayout()); buttonsPanel.add(new JLabel(translate("port"))); diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java index 6e765d8db..305fb6101 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java index 9893a5d2d..a52c9a663 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java index 57c8ac0ab..662c759ca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java index d28b4c734..36116777f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import java.awt.image.BufferedImage; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java index 514057410..e3e133e0c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import java.awt.image.BufferedImage; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java index abb8c918a..958facb59 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import java.awt.image.BufferedImage; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java index 331d8cead..6f41519f7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.types.ALPHABITMAPDATA; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java index a3ae37d10..0728840d9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.types.BITMAPDATA; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java index 03bde5588..d8a598eb0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.ImageTag; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java index 5d9a98fa7..d8d1ffb0e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java @@ -21,7 +21,6 @@ import com.jpexs.decompiler.flash.Layer; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import com.jpexs.decompiler.flash.helpers.Cache; import com.jpexs.decompiler.flash.tags.base.BoundedTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java index 994a707d2..e3731c138 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.CXFORM; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java index a04706c41..7c77f4413 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import com.jpexs.decompiler.flash.types.SOUNDINFO; import java.io.ByteArrayInputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java index ebd8ec904..570dd9c07 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java @@ -23,7 +23,6 @@ import com.jpexs.decompiler.flash.ReReadableInputStream; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.helpers.Cache; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java index 041ee76ed..3f0cacb81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.BoundedTag; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import com.jpexs.decompiler.flash.tags.base.TextTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java index 73879cd8d..328321a05 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.FontTag; import com.jpexs.decompiler.flash.types.KERNINGRECORD; import com.jpexs.decompiler.flash.types.LANGCODE; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java index 2fa17dfe4..85baff216 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import com.jpexs.decompiler.flash.tags.base.FontTag; import com.jpexs.decompiler.flash.types.KERNINGRECORD; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java index 6826d4755..1065ecb81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java index d6033d7ee..3aeb5b0b0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.ZONERECORD; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java index 5c022160e..dfc2a22ae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.LANGCODE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java index 032603c84..490deed8c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java index 2f051d535..fb9462ae4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.FontTag; import com.jpexs.decompiler.flash.types.SHAPE; import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java index a3b4ac3a9..8af42ead0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.BoundedTag; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import com.jpexs.decompiler.flash.tags.base.DrawableTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java index e89bc00e0..e63dfaf96 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.BoundedTag; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import com.jpexs.decompiler.flash.tags.base.DrawableTag; @@ -249,7 +249,7 @@ public class DefineMorphShapeTag extends CharacterTag implements BoundedTag, Mor cer.anchorDeltaY = cer1.anchorDeltaY + (cer2.anchorDeltaY - cer1.anchorDeltaY) * frame / 65535; finalRecords.add(cer); } - return SHAPERECORD.shapeToImage(tags, 1, fillStyles, lineStyles, finalRecords); + return SHAPERECORD.shapeToImage(tags, 3, fillStyles, lineStyles, finalRecords); } @Override diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java index a3ee2b2e2..6783bfac2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.RECT; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java index a2c895416..99324574f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java index 38cc599da..b54f50d27 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java index e47ee01f1..c413e8085 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java @@ -20,7 +20,6 @@ import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import com.jpexs.decompiler.flash.helpers.Cache; import com.jpexs.decompiler.flash.tags.base.BoundedTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index 5df815eaa..c761b502d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.base.BoundedTag; import com.jpexs.decompiler.flash.tags.base.CharacterTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java index 8cc5843e4..5a84869c0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.base.BoundedTag; import com.jpexs.decompiler.flash.tags.base.CharacterTag; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java index 6a87d65b8..33015de07 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java index bc66155d7..b1c812a94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCDefineTag.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import java.io.*; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java index e544557a9..121724a08 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java @@ -17,8 +17,8 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; -import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.abc.ABC; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import java.io.*; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java index a36843019..43f744a19 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.DisassemblyListener; import com.jpexs.decompiler.flash.ReReadableInputStream; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.tags.base.ASMSource; import java.io.ByteArrayInputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java index bf98ae485..b2b1bbd5b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java @@ -19,9 +19,9 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.DisassemblyListener; import com.jpexs.decompiler.flash.ReReadableInputStream; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.tags.base.ASMSource; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java index bca754d0c..b06f672d3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java index c9d566085..2d69a8250 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java index 6243b118a..81e6edc43 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java index e9558b47f..b6f752ae0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java index ef40bc51f..931c9e803 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java index cbad6064e..671787c0c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.ImportTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java index 1fc1992e2..55b1a3e8d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.ImportTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java index 99fb40293..6d090d890 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java index 0e13f20c3..2d690773c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java @@ -17,9 +17,9 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import com.jpexs.decompiler.flash.tags.base.CharacterIdTag; import com.jpexs.decompiler.flash.tags.base.Container; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java index 969d40c69..97a4e8443 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java @@ -18,9 +18,9 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.Configuration; import com.jpexs.decompiler.flash.EndOfStreamException; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.abc.CopyOutputStream; import com.jpexs.decompiler.flash.tags.base.CharacterIdTag; import com.jpexs.decompiler.flash.tags.base.Container; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java index 83d9f46d3..d2551aa85 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterIdTag; import com.jpexs.decompiler.flash.tags.base.PlaceObjectTypeTag; import com.jpexs.decompiler.flash.types.CLIPACTIONS; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java index a82d69357..dd1c9f7e0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java index 399fa5f5e..cbec3f6b1 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterIdTag; import com.jpexs.decompiler.flash.tags.base.RemoveTag; import java.io.ByteArrayInputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java index e5e554deb..6d42e6249 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java index c1523dd52..171d8aa31 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.RGB; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java index 8c922a59b..40cfdb5ce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java index a0697cb93..2e52badfb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag; import java.io.ByteArrayInputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java index 1e2b69ff8..3a500d53c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.base.CharacterTag; import com.jpexs.decompiler.flash.tags.base.SoundStreamHeadTypeTag; import java.io.ByteArrayInputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java index 1981f6600..2ebf3508c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.SOUNDINFO; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java index 39f89d4e7..4930846ec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.types.SOUNDINFO; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java index 5beaec8ae..e25fa3bac 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java b/trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java index d87bfd432..b2a2e0e9b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java index 00f3febcc..06742f373 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java @@ -16,9 +16,9 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import com.jpexs.decompiler.flash.SWF; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index b1355a19c..cc5ef3ea8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -21,7 +21,6 @@ import com.jpexs.decompiler.flash.RetryTask; import com.jpexs.decompiler.flash.RunnableIOEx; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; -import com.jpexs.decompiler.graph.Graph; import com.jpexs.decompiler.flash.helpers.Helper; import com.jpexs.decompiler.flash.helpers.Highlighting; import com.jpexs.decompiler.flash.tags.CSMTextSettingsTag; @@ -91,6 +90,7 @@ import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord; import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord; import com.jpexs.decompiler.flash.types.sound.MP3FRAME; +import com.jpexs.decompiler.graph.Graph; import java.awt.Font; import java.awt.GraphicsEnvironment; import java.awt.Point; @@ -98,7 +98,6 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; diff --git a/trunk/src/com/jpexs/decompiler/graph/Block.java b/trunk/src/com/jpexs/decompiler/graph/Block.java index c329347fc..f6454c402 100644 --- a/trunk/src/com/jpexs/decompiler/graph/Block.java +++ b/trunk/src/com/jpexs/decompiler/graph/Block.java @@ -17,7 +17,6 @@ package com.jpexs.decompiler.graph; import com.jpexs.decompiler.graph.model.ContinueItem; -import java.io.Serializable; import java.util.List; public interface Block { diff --git a/trunk/src/com/jpexs/decompiler/graph/Graph.java b/trunk/src/com/jpexs/decompiler/graph/Graph.java index a4af0b41e..8520d61f5 100644 --- a/trunk/src/com/jpexs/decompiler/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/graph/Graph.java @@ -16,26 +16,26 @@ */ package com.jpexs.decompiler.graph; -import com.jpexs.decompiler.graph.model.ExitItem; -import com.jpexs.decompiler.graph.model.OrItem; -import com.jpexs.decompiler.graph.model.LogicalOpItem; -import com.jpexs.decompiler.graph.model.ContinueItem; -import com.jpexs.decompiler.graph.model.IfItem; -import com.jpexs.decompiler.graph.model.AndItem; -import com.jpexs.decompiler.graph.model.LoopItem; -import com.jpexs.decompiler.graph.model.DoWhileItem; -import com.jpexs.decompiler.graph.model.IntegerValueItem; -import com.jpexs.decompiler.graph.model.SwitchItem; -import com.jpexs.decompiler.graph.model.UniversalLoopItem; -import com.jpexs.decompiler.graph.model.TernarOpItem; -import com.jpexs.decompiler.graph.model.NotItem; -import com.jpexs.decompiler.graph.model.BreakItem; -import com.jpexs.decompiler.graph.model.WhileItem; -import com.jpexs.decompiler.graph.model.ScriptEndItem; -import com.jpexs.decompiler.graph.model.ForItem; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.ecma.EcmaScript; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.model.AndItem; +import com.jpexs.decompiler.graph.model.BreakItem; +import com.jpexs.decompiler.graph.model.ContinueItem; +import com.jpexs.decompiler.graph.model.DoWhileItem; +import com.jpexs.decompiler.graph.model.ExitItem; +import com.jpexs.decompiler.graph.model.ForItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.IntegerValueItem; +import com.jpexs.decompiler.graph.model.LogicalOpItem; +import com.jpexs.decompiler.graph.model.LoopItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.OrItem; +import com.jpexs.decompiler.graph.model.ScriptEndItem; +import com.jpexs.decompiler.graph.model.SwitchItem; +import com.jpexs.decompiler.graph.model.TernarOpItem; +import com.jpexs.decompiler.graph.model.UniversalLoopItem; +import com.jpexs.decompiler.graph.model.WhileItem; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java index f08013df8..1c3811183 100644 --- a/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/graph/GraphTargetItem.java @@ -16,8 +16,8 @@ */ package com.jpexs.decompiler.graph; -import com.jpexs.decompiler.graph.model.BinaryOp; import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.graph.model.BinaryOp; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java b/trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java index 3416faf37..f73533028 100644 --- a/trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java +++ b/trunk/src/com/jpexs/decompiler/graph/SourceGenerator.java @@ -16,19 +16,19 @@ */ package com.jpexs.decompiler.graph; -import com.jpexs.decompiler.graph.model.OrItem; -import com.jpexs.decompiler.graph.model.DuplicateItem; -import com.jpexs.decompiler.graph.model.ContinueItem; -import com.jpexs.decompiler.graph.model.IfItem; import com.jpexs.decompiler.graph.model.AndItem; +import com.jpexs.decompiler.graph.model.BreakItem; import com.jpexs.decompiler.graph.model.CommaExpressionItem; +import com.jpexs.decompiler.graph.model.ContinueItem; import com.jpexs.decompiler.graph.model.DoWhileItem; +import com.jpexs.decompiler.graph.model.DuplicateItem; +import com.jpexs.decompiler.graph.model.ForItem; +import com.jpexs.decompiler.graph.model.IfItem; +import com.jpexs.decompiler.graph.model.NotItem; +import com.jpexs.decompiler.graph.model.OrItem; import com.jpexs.decompiler.graph.model.SwitchItem; import com.jpexs.decompiler.graph.model.TernarOpItem; -import com.jpexs.decompiler.graph.model.NotItem; -import com.jpexs.decompiler.graph.model.BreakItem; import com.jpexs.decompiler.graph.model.WhileItem; -import com.jpexs.decompiler.graph.model.ForItem; import java.util.List; /**