From 24a6b82a9441191157cd3bb1e20ef46e2871a548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Tue, 25 Dec 2012 10:27:57 +0100 Subject: [PATCH] organizing imports --- trunk/src/com/jpexs/asdec/Main.java | 8 +- trunk/src/com/jpexs/asdec/SWFInputStream.java | 165 ++---------------- .../src/com/jpexs/asdec/SWFOutputStream.java | 25 +-- trunk/src/com/jpexs/asdec/abc/ABC.java | 40 +---- .../com/jpexs/asdec/abc/ABCInputStream.java | 1 - .../com/jpexs/asdec/abc/ABCOutputStream.java | 7 +- .../com/jpexs/asdec/abc/avm2/AVM2Code.java | 2 - .../jpexs/asdec/abc/avm2/ConstantPool.java | 1 - .../asdec/abc/avm2/UnknownJumpException.java | 1 - .../jpexs/asdec/abc/avm2/flowgraph/Graph.java | 6 +- .../avm2/instructions/AVM2Instruction.java | 3 +- .../abc/avm2/instructions/IfTypeIns.java | 5 +- .../instructions/InstructionDefinition.java | 7 +- .../abc/avm2/instructions/SetTypeIns.java | 6 +- .../avm2/instructions/arithmetic/AddIIns.java | 5 +- .../avm2/instructions/arithmetic/AddIns.java | 5 +- .../arithmetic/DecrementIIns.java | 5 +- .../instructions/arithmetic/DecrementIns.java | 5 +- .../instructions/arithmetic/DivideIns.java | 5 +- .../arithmetic/IncrementIIns.java | 5 +- .../instructions/arithmetic/IncrementIns.java | 5 +- .../instructions/arithmetic/ModuloIns.java | 5 +- .../instructions/arithmetic/MultiplyIIns.java | 6 +- .../instructions/arithmetic/MultiplyIns.java | 6 +- .../instructions/arithmetic/NegateIIns.java | 6 +- .../instructions/arithmetic/NegateIns.java | 6 +- .../avm2/instructions/arithmetic/NotIns.java | 6 +- .../instructions/arithmetic/SubtractIIns.java | 6 +- .../instructions/arithmetic/SubtractIns.java | 6 +- .../avm2/instructions/bitwise/BitAndIns.java | 6 +- .../avm2/instructions/bitwise/BitNotIns.java | 6 +- .../avm2/instructions/bitwise/BitOrIns.java | 6 +- .../avm2/instructions/bitwise/BitXorIns.java | 6 +- .../avm2/instructions/bitwise/LShiftIns.java | 6 +- .../avm2/instructions/bitwise/RShiftIns.java | 6 +- .../avm2/instructions/bitwise/URShiftIns.java | 6 +- .../instructions/comparsion/EqualsIns.java | 6 +- .../comparsion/GreaterEqualsIns.java | 6 +- .../comparsion/GreaterThanIns.java | 6 +- .../comparsion/LessEqualsIns.java | 6 +- .../instructions/comparsion/LessThanIns.java | 6 +- .../comparsion/StrictEqualsIns.java | 6 +- .../construction/ConstructIns.java | 8 +- .../construction/ConstructPropIns.java | 8 +- .../construction/ConstructSuperIns.java | 8 +- .../construction/NewActivationIns.java | 6 +- .../construction/NewArrayIns.java | 8 +- .../construction/NewCatchIns.java | 8 +- .../construction/NewClassIns.java | 8 +- .../construction/NewFunctionIns.java | 8 +- .../construction/NewObjectIns.java | 8 +- .../avm2/instructions/debug/DebugFileIns.java | 2 +- .../abc/avm2/instructions/debug/DebugIns.java | 2 +- .../avm2/instructions/debug/DebugLineIns.java | 2 +- .../avm2/instructions/executing/CallIns.java | 8 +- .../instructions/executing/CallMethodIns.java | 8 +- .../executing/CallPropLexIns.java | 6 +- .../executing/CallPropVoidIns.java | 8 +- .../executing/CallPropertyIns.java | 8 +- .../instructions/executing/CallStaticIns.java | 8 +- .../instructions/executing/CallSuperIns.java | 8 +- .../executing/CallSuperVoidIns.java | 8 +- .../abc/avm2/instructions/jumps/IfEqIns.java | 8 +- .../avm2/instructions/jumps/IfFalseIns.java | 8 +- .../abc/avm2/instructions/jumps/IfGeIns.java | 8 +- .../abc/avm2/instructions/jumps/IfGtIns.java | 8 +- .../abc/avm2/instructions/jumps/IfLeIns.java | 8 +- .../abc/avm2/instructions/jumps/IfLtIns.java | 8 +- .../abc/avm2/instructions/jumps/IfNGeIns.java | 8 +- .../abc/avm2/instructions/jumps/IfNGtIns.java | 8 +- .../abc/avm2/instructions/jumps/IfNLeIns.java | 8 +- .../abc/avm2/instructions/jumps/IfNLtIns.java | 8 +- .../abc/avm2/instructions/jumps/IfNeIns.java | 8 +- .../instructions/jumps/IfStrictEqIns.java | 8 +- .../instructions/jumps/IfStrictNeIns.java | 8 +- .../avm2/instructions/jumps/IfTrueIns.java | 8 +- .../abc/avm2/instructions/jumps/JumpIns.java | 6 +- .../instructions/jumps/LookupSwitchIns.java | 8 +- .../instructions/localregs/DecLocalIIns.java | 6 +- .../instructions/localregs/DecLocalIns.java | 6 +- .../instructions/localregs/GetLocal0Ins.java | 6 +- .../instructions/localregs/GetLocal1Ins.java | 6 +- .../instructions/localregs/GetLocal2Ins.java | 6 +- .../instructions/localregs/GetLocal3Ins.java | 6 +- .../instructions/localregs/GetLocalIns.java | 8 +- .../instructions/localregs/IncLocalIIns.java | 6 +- .../instructions/localregs/IncLocalIns.java | 6 +- .../avm2/instructions/localregs/KillIns.java | 6 +- .../instructions/localregs/SetLocal0Ins.java | 6 +- .../instructions/localregs/SetLocal1Ins.java | 6 +- .../instructions/localregs/SetLocal2Ins.java | 6 +- .../instructions/localregs/SetLocal3Ins.java | 6 +- .../instructions/localregs/SetLocalIns.java | 8 +- .../instructions/other/DeletePropertyIns.java | 8 +- .../instructions/other/FindPropertyIns.java | 8 +- .../other/FindPropertyStrictIns.java | 8 +- .../instructions/other/GetDescendantsIns.java | 8 +- .../instructions/other/GetGlobalScopeIns.java | 6 +- .../instructions/other/GetGlobalSlotIns.java | 8 +- .../avm2/instructions/other/GetLexIns.java | 8 +- .../instructions/other/GetPropertyIns.java | 8 +- .../instructions/other/GetScopeObjectIns.java | 8 +- .../avm2/instructions/other/GetSlotIns.java | 8 +- .../avm2/instructions/other/GetSuperIns.java | 8 +- .../avm2/instructions/other/HasNext2Ins.java | 6 +- .../avm2/instructions/other/HasNextIns.java | 6 +- .../abc/avm2/instructions/other/InIns.java | 6 +- .../instructions/other/InitPropertyIns.java | 8 +- .../avm2/instructions/other/NextNameIns.java | 6 +- .../avm2/instructions/other/NextValueIns.java | 6 +- .../instructions/other/ReturnValueIns.java | 6 +- .../instructions/other/ReturnVoidIns.java | 6 +- .../instructions/other/SetGlobalSlotIns.java | 8 +- .../instructions/other/SetPropertyIns.java | 8 +- .../avm2/instructions/other/SetSlotIns.java | 8 +- .../avm2/instructions/other/SetSuperIns.java | 8 +- .../abc/avm2/instructions/other/ThrowIns.java | 6 +- .../abc/avm2/instructions/stack/DupIns.java | 6 +- .../abc/avm2/instructions/stack/PopIns.java | 13 +- .../avm2/instructions/stack/PopScopeIns.java | 6 +- .../avm2/instructions/stack/PushByteIns.java | 8 +- .../instructions/stack/PushDoubleIns.java | 8 +- .../avm2/instructions/stack/PushFalseIns.java | 6 +- .../avm2/instructions/stack/PushIntIns.java | 8 +- .../instructions/stack/PushNamespaceIns.java | 8 +- .../avm2/instructions/stack/PushNanIns.java | 6 +- .../avm2/instructions/stack/PushNullIns.java | 6 +- .../avm2/instructions/stack/PushScopeIns.java | 6 +- .../avm2/instructions/stack/PushShortIns.java | 8 +- .../instructions/stack/PushStringIns.java | 8 +- .../avm2/instructions/stack/PushTrueIns.java | 6 +- .../avm2/instructions/stack/PushUIntIns.java | 8 +- .../instructions/stack/PushUndefinedIns.java | 6 +- .../avm2/instructions/stack/PushWithIns.java | 6 +- .../abc/avm2/instructions/stack/SwapIns.java | 6 +- .../avm2/instructions/types/ApplyTypeIns.java | 10 +- .../avm2/instructions/types/AsTypeIns.java | 8 +- .../instructions/types/AsTypeLateIns.java | 6 +- .../avm2/instructions/types/CoerceAIns.java | 6 +- .../avm2/instructions/types/CoerceIns.java | 8 +- .../avm2/instructions/types/CoerceSIns.java | 6 +- .../avm2/instructions/types/ConvertBIns.java | 6 +- .../avm2/instructions/types/ConvertDIns.java | 6 +- .../avm2/instructions/types/ConvertIIns.java | 6 +- .../avm2/instructions/types/ConvertOIns.java | 6 +- .../avm2/instructions/types/ConvertSIns.java | 6 +- .../avm2/instructions/types/ConvertUIns.java | 6 +- .../instructions/types/InstanceOfIns.java | 6 +- .../avm2/instructions/types/IsTypeIns.java | 8 +- .../instructions/types/IsTypeLateIns.java | 6 +- .../avm2/instructions/types/TypeOfIns.java | 6 +- .../avm2/instructions/xml/CheckFilterIns.java | 6 +- .../abc/avm2/instructions/xml/DXNSIns.java | 3 +- .../avm2/instructions/xml/DXNSLateIns.java | 6 +- .../avm2/instructions/xml/EscXAttrIns.java | 6 +- .../avm2/instructions/xml/EscXElemIns.java | 6 +- .../asdec/abc/avm2/parser/ASM3Parser.java | 1 - .../abc/avm2/treemodel/ApplyTypeTreeItem.java | 3 +- .../abc/avm2/treemodel/BooleanTreeItem.java | 3 +- .../abc/avm2/treemodel/BreakTreeItem.java | 3 +- .../avm2/treemodel/CallMethodTreeItem.java | 4 +- .../avm2/treemodel/CallPropertyTreeItem.java | 4 +- .../avm2/treemodel/CallStaticTreeItem.java | 4 +- .../abc/avm2/treemodel/CallSuperTreeItem.java | 4 +- .../abc/avm2/treemodel/CallTreeItem.java | 4 +- .../abc/avm2/treemodel/ClassTreeItem.java | 3 +- .../abc/avm2/treemodel/CoerceTreeItem.java | 3 +- .../avm2/treemodel/ConstructPropTreeItem.java | 4 +- .../treemodel/ConstructSuperTreeItem.java | 4 +- .../abc/avm2/treemodel/ConstructTreeItem.java | 4 +- .../abc/avm2/treemodel/ContinueTreeItem.java | 3 +- .../abc/avm2/treemodel/ConvertTreeItem.java | 3 +- .../abc/avm2/treemodel/DecLocalTreeItem.java | 4 +- .../abc/avm2/treemodel/DecrementTreeItem.java | 3 +- .../avm2/treemodel/FindPropertyTreeItem.java | 3 +- .../avm2/treemodel/FloatValueTreeItem.java | 3 +- .../avm2/treemodel/FullMultinameTreeItem.java | 4 +- .../treemodel/GetDescendantsTreeItem.java | 3 +- .../abc/avm2/treemodel/GetLexTreeItem.java | 3 +- .../avm2/treemodel/GetPropertyTreeItem.java | 3 +- .../abc/avm2/treemodel/GetSlotTreeItem.java | 3 +- .../abc/avm2/treemodel/GetSuperTreeItem.java | 3 +- .../asdec/abc/avm2/treemodel/InTreeItem.java | 3 +- .../abc/avm2/treemodel/IncLocalTreeItem.java | 4 +- .../abc/avm2/treemodel/IncrementTreeItem.java | 3 +- .../avm2/treemodel/InitPropertyTreeItem.java | 3 +- .../avm2/treemodel/IntegerValueTreeItem.java | 3 +- .../abc/avm2/treemodel/LocalRegTreeItem.java | 4 +- .../abc/avm2/treemodel/NameSpaceTreeItem.java | 3 +- .../abc/avm2/treemodel/NameValuePair.java | 3 +- .../asdec/abc/avm2/treemodel/NanTreeItem.java | 3 +- .../avm2/treemodel/NewActivationTreeItem.java | 3 +- .../abc/avm2/treemodel/NewArrayTreeItem.java | 4 +- .../avm2/treemodel/NewFunctionTreeItem.java | 3 +- .../abc/avm2/treemodel/NewObjectTreeItem.java | 4 +- .../abc/avm2/treemodel/NullTreeItem.java | 3 +- .../avm2/treemodel/PostDecrementTreeItem.java | 3 +- .../avm2/treemodel/PostIncrementTreeItem.java | 3 +- .../avm2/treemodel/ReturnValueTreeItem.java | 3 +- .../avm2/treemodel/ReturnVoidTreeItem.java | 3 +- .../avm2/treemodel/SetGlobalSlotTreeItem.java | 3 +- .../abc/avm2/treemodel/SetLocalTreeItem.java | 3 +- .../avm2/treemodel/SetPropertyTreeItem.java | 3 +- .../abc/avm2/treemodel/SetSlotTreeItem.java | 3 +- .../abc/avm2/treemodel/SetSuperTreeItem.java | 3 +- .../abc/avm2/treemodel/StringTreeItem.java | 3 +- .../abc/avm2/treemodel/ThisTreeItem.java | 3 +- .../abc/avm2/treemodel/ThrowTreeItem.java | 3 +- .../asdec/abc/avm2/treemodel/TreeItem.java | 3 +- .../abc/avm2/treemodel/UndefinedTreeItem.java | 3 +- .../abc/avm2/treemodel/UnparsedTreeItem.java | 3 +- .../abc/avm2/treemodel/WithTreeItem.java | 4 +- .../abc/avm2/treemodel/clauses/Block.java | 1 - .../treemodel/clauses/DoWhileTreeItem.java | 4 +- .../treemodel/clauses/ExceptionTreeItem.java | 3 +- .../treemodel/clauses/ForEachInTreeItem.java | 11 +- .../avm2/treemodel/clauses/ForInTreeItem.java | 11 +- .../avm2/treemodel/clauses/ForTreeItem.java | 4 +- .../avm2/treemodel/clauses/IfTreeItem.java | 4 +- .../treemodel/clauses/SwitchTreeItem.java | 4 +- .../treemodel/clauses/TernarOpTreeItem.java | 3 +- .../avm2/treemodel/clauses/TryTreeItem.java | 4 +- .../avm2/treemodel/clauses/WhileTreeItem.java | 4 +- .../operations/BinaryOpTreeItem.java | 3 +- .../operations/DeletePropertyTreeItem.java | 3 +- .../treemodel/operations/UnaryOpTreeItem.java | 3 +- .../jpexs/asdec/abc/gui/ABCComboBoxModel.java | 5 +- .../asdec/abc/gui/ASMSourceEditorPane.java | 4 +- .../jpexs/asdec/abc/gui/ClassesListTree.java | 6 +- .../asdec/abc/gui/ClassesListTreeModel.java | 5 - .../asdec/abc/gui/ConstantsListModel.java | 3 +- .../asdec/abc/gui/DecompiledEditorPane.java | 1 - .../com/jpexs/asdec/abc/gui/DetailPanel.java | 9 +- .../abc/gui/DialogMissingSymbolHandler.java | 3 +- .../com/jpexs/asdec/abc/gui/GraphFrame.java | 6 +- .../jpexs/asdec/abc/gui/IconListRenderer.java | 2 +- .../com/jpexs/asdec/abc/gui/MainFrame.java | 17 +- .../asdec/abc/gui/MethodBodyParamsPanel.java | 8 +- .../jpexs/asdec/abc/gui/MethodInfoPanel.java | 7 +- .../abc/gui/SlotConstTraitDetailPanel.java | 8 +- .../com/jpexs/asdec/abc/gui/TraitsList.java | 4 +- .../jpexs/asdec/abc/gui/TraitsListModel.java | 3 +- .../com/jpexs/asdec/abc/gui/UsageFrame.java | 12 +- .../gui/tablemodels/DecimalTableModel.java | 1 - .../abc/gui/tablemodels/DoubleTableModel.java | 1 - .../abc/gui/tablemodels/IntTableModel.java | 1 - .../gui/tablemodels/MultinameTableModel.java | 1 - .../tablemodels/NamespaceSetTableModel.java | 1 - .../gui/tablemodels/NamespaceTableModel.java | 1 - .../abc/gui/tablemodels/StringTableModel.java | 1 - .../abc/gui/tablemodels/UIntTableModel.java | 1 - .../abc/methodinfo_parser/ParseException.java | 2 - .../com/jpexs/asdec/abc/types/MethodBody.java | 1 - .../com/jpexs/asdec/abc/types/ScriptInfo.java | 1 - .../jpexs/asdec/abc/types/traits/Trait.java | 1 - .../asdec/abc/types/traits/TraitClass.java | 1 - .../asdec/abc/types/traits/TraitFunction.java | 1 - trunk/src/com/jpexs/asdec/action/Action.java | 7 +- .../asdec/action/UnknownJumpException.java | 1 - .../com/jpexs/asdec/action/gui/MainFrame.java | 21 ++- .../jpexs/asdec/action/gui/TagTreeModel.java | 5 +- .../jpexs/asdec/action/parser/ASMParser.java | 1 - .../jpexs/asdec/action/parser/FlasmLexer.java | 2 +- .../jpexs/asdec/action/swf3/ActionGetURL.java | 1 - .../asdec/action/swf3/ActionGoToLabel.java | 1 - .../asdec/action/swf3/ActionGotoFrame.java | 1 - .../asdec/action/swf3/ActionNextFrame.java | 1 - .../jpexs/asdec/action/swf3/ActionPlay.java | 1 - .../asdec/action/swf3/ActionPrevFrame.java | 1 - .../asdec/action/swf3/ActionSetTarget.java | 1 - .../jpexs/asdec/action/swf3/ActionStop.java | 1 - .../asdec/action/swf3/ActionStopSounds.java | 1 - .../action/swf3/ActionToggleQuality.java | 1 - .../asdec/action/swf3/ActionWaitForFrame.java | 1 - .../jpexs/asdec/action/swf4/ActionAdd.java | 1 - .../jpexs/asdec/action/swf4/ActionAnd.java | 1 - .../asdec/action/swf4/ActionAsciiToChar.java | 1 - .../jpexs/asdec/action/swf4/ActionCall.java | 1 - .../asdec/action/swf4/ActionCharToAscii.java | 1 - .../asdec/action/swf4/ActionCloneSprite.java | 1 - .../jpexs/asdec/action/swf4/ActionDivide.java | 1 - .../asdec/action/swf4/ActionEndDrag.java | 1 - .../jpexs/asdec/action/swf4/ActionEquals.java | 1 - .../asdec/action/swf4/ActionGetProperty.java | 1 - .../asdec/action/swf4/ActionGetTime.java | 1 - .../asdec/action/swf4/ActionGetURL2.java | 1 - .../asdec/action/swf4/ActionGetVariable.java | 1 - .../asdec/action/swf4/ActionGotoFrame2.java | 1 - .../com/jpexs/asdec/action/swf4/ActionIf.java | 1 - .../jpexs/asdec/action/swf4/ActionJump.java | 1 - .../jpexs/asdec/action/swf4/ActionLess.java | 1 - .../action/swf4/ActionMBAsciiToChar.java | 1 - .../action/swf4/ActionMBCharToAscii.java | 1 - .../action/swf4/ActionMBStringExtract.java | 1 - .../action/swf4/ActionMBStringLength.java | 1 - .../asdec/action/swf4/ActionMultiply.java | 1 - .../jpexs/asdec/action/swf4/ActionNot.java | 1 - .../com/jpexs/asdec/action/swf4/ActionOr.java | 1 - .../jpexs/asdec/action/swf4/ActionPop.java | 1 - .../jpexs/asdec/action/swf4/ActionPush.java | 1 - .../asdec/action/swf4/ActionRandomNumber.java | 1 - .../asdec/action/swf4/ActionRemoveSprite.java | 1 - .../asdec/action/swf4/ActionSetProperty.java | 1 - .../asdec/action/swf4/ActionSetTarget2.java | 1 - .../asdec/action/swf4/ActionSetVariable.java | 1 - .../asdec/action/swf4/ActionStartDrag.java | 1 - .../asdec/action/swf4/ActionStringAdd.java | 1 - .../asdec/action/swf4/ActionStringEquals.java | 1 - .../action/swf4/ActionStringExtract.java | 1 - .../asdec/action/swf4/ActionStringLength.java | 1 - .../asdec/action/swf4/ActionStringLess.java | 1 - .../asdec/action/swf4/ActionSubtract.java | 1 - .../asdec/action/swf4/ActionToInteger.java | 1 - .../jpexs/asdec/action/swf4/ActionTrace.java | 1 - .../action/swf4/ActionWaitForFrame2.java | 1 - .../asdec/action/swf4/ConstantIndex.java | 1 - .../jpexs/asdec/action/swf5/ActionAdd2.java | 1 - .../jpexs/asdec/action/swf5/ActionBitAnd.java | 1 - .../asdec/action/swf5/ActionBitLShift.java | 1 - .../jpexs/asdec/action/swf5/ActionBitOr.java | 1 - .../asdec/action/swf5/ActionBitRShift.java | 1 - .../asdec/action/swf5/ActionBitURShift.java | 1 - .../jpexs/asdec/action/swf5/ActionBitXor.java | 1 - .../asdec/action/swf5/ActionCallFunction.java | 1 - .../asdec/action/swf5/ActionCallMethod.java | 1 - .../asdec/action/swf5/ActionConstantPool.java | 1 - .../asdec/action/swf5/ActionDecrement.java | 1 - .../action/swf5/ActionDefineFunction.java | 1 - .../asdec/action/swf5/ActionDefineLocal.java | 1 - .../asdec/action/swf5/ActionDefineLocal2.java | 1 - .../jpexs/asdec/action/swf5/ActionDelete.java | 1 - .../asdec/action/swf5/ActionDelete2.java | 1 - .../asdec/action/swf5/ActionEnumerate.java | 1 - .../asdec/action/swf5/ActionEquals2.java | 1 - .../asdec/action/swf5/ActionGetMember.java | 1 - .../asdec/action/swf5/ActionIncrement.java | 1 - .../asdec/action/swf5/ActionInitArray.java | 1 - .../asdec/action/swf5/ActionInitObject.java | 1 - .../jpexs/asdec/action/swf5/ActionLess2.java | 1 - .../jpexs/asdec/action/swf5/ActionModulo.java | 1 - .../asdec/action/swf5/ActionNewMethod.java | 1 - .../asdec/action/swf5/ActionNewObject.java | 1 - .../action/swf5/ActionPushDuplicate.java | 1 - .../jpexs/asdec/action/swf5/ActionReturn.java | 1 - .../asdec/action/swf5/ActionSetMember.java | 1 - .../asdec/action/swf5/ActionStackSwap.java | 1 - .../action/swf5/ActionStoreRegister.java | 1 - .../asdec/action/swf5/ActionTargetPath.java | 1 - .../asdec/action/swf5/ActionToNumber.java | 1 - .../asdec/action/swf5/ActionToString.java | 1 - .../jpexs/asdec/action/swf5/ActionTypeOf.java | 1 - .../jpexs/asdec/action/swf5/ActionWith.java | 2 - .../asdec/action/swf6/ActionEnumerate2.java | 1 - .../asdec/action/swf6/ActionGreater.java | 1 - .../asdec/action/swf6/ActionInstanceOf.java | 1 - .../asdec/action/swf6/ActionStrictEquals.java | 1 - .../action/swf6/ActionStringGreater.java | 1 - .../jpexs/asdec/action/swf7/ActionCastOp.java | 1 - .../action/swf7/ActionDefineFunction2.java | 1 - .../asdec/action/swf7/ActionExtends.java | 1 - .../asdec/action/swf7/ActionImplementsOp.java | 1 - .../jpexs/asdec/action/swf7/ActionThrow.java | 1 - .../jpexs/asdec/action/swf7/ActionTry.java | 1 - .../treemodel/CallFunctionTreeItem.java | 1 - .../action/treemodel/DirectValueTreeItem.java | 1 - .../action/treemodel/FunctionTreeItem.java | 1 - .../treemodel/ImplementsOpTreeItem.java | 1 - .../action/treemodel/InitArrayTreeItem.java | 1 - .../action/treemodel/InitObjectTreeItem.java | 1 - .../action/treemodel/NewMethodTreeItem.java | 1 - .../action/treemodel/NewObjectTreeItem.java | 1 - .../asdec/action/treemodel/clauses/Block.java | 1 - .../treemodel/clauses/DoWhileTreeItem.java | 1 - .../treemodel/clauses/ForEachTreeItem.java | 1 - .../treemodel/clauses/ForInTreeItem.java | 2 - .../action/treemodel/clauses/ForTreeItem.java | 1 - .../action/treemodel/clauses/IfTreeItem.java | 1 - .../treemodel/clauses/SwitchTreeItem.java | 1 - .../action/treemodel/clauses/TryTreeItem.java | 1 - .../treemodel/clauses/WhileTreeItem.java | 1 - .../treemodel/clauses/WithTreeItem.java | 1 - .../src/com/jpexs/asdec/gui/AboutDialog.java | 6 +- trunk/src/com/jpexs/asdec/gui/LinkLabel.java | 2 - .../com/jpexs/asdec/gui/LoadingDialog.java | 8 +- .../src/com/jpexs/asdec/gui/LoadingPanel.java | 6 +- trunk/src/com/jpexs/asdec/gui/ModeFrame.java | 9 +- trunk/src/com/jpexs/asdec/gui/View.java | 3 +- .../com/jpexs/asdec/gui/proxy/ProxyFrame.java | 3 +- .../jpexs/asdec/gui/proxy/SWFListModel.java | 7 +- trunk/src/com/jpexs/asdec/tags/ASMSource.java | 1 - .../jpexs/asdec/tags/DefineButton2Tag.java | 1 - .../com/jpexs/asdec/tags/DefineButtonTag.java | 1 - .../com/jpexs/asdec/tags/DefineFontName.java | 3 +- .../jpexs/asdec/tags/DefineScalingGrid.java | 5 +- .../com/jpexs/asdec/tags/DefineSpriteTag.java | 1 - trunk/src/com/jpexs/asdec/tags/DoABCTag.java | 1 - .../src/com/jpexs/asdec/tags/DoActionTag.java | 1 - .../com/jpexs/asdec/tags/DoInitActionTag.java | 7 +- .../com/jpexs/asdec/tags/ExportAssetsTag.java | 1 - .../com/jpexs/asdec/tags/FileAttributes.java | 3 +- .../src/com/jpexs/asdec/tags/FrameLabel.java | 3 +- .../com/jpexs/asdec/tags/PlaceObject2Tag.java | 1 - .../com/jpexs/asdec/tags/PlaceObject3Tag.java | 1 - .../src/com/jpexs/asdec/tags/ProductInfo.java | 3 +- .../com/jpexs/asdec/tags/RemoveObject2.java | 3 +- .../com/jpexs/asdec/tags/ScriptLimits.java | 3 +- .../src/com/jpexs/asdec/tags/SymbolClass.java | 3 +- .../jpexs/asdec/types/BUTTONCONDACTION.java | 1 - .../com/jpexs/asdec/types/BUTTONRECORD.java | 1 - .../jpexs/asdec/types/CLIPACTIONRECORD.java | 1 - 410 files changed, 710 insertions(+), 1128 deletions(-) diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/asdec/Main.java index 7e6380d11..ab59b4221 100644 --- a/trunk/src/com/jpexs/asdec/Main.java +++ b/trunk/src/com/jpexs/asdec/Main.java @@ -26,9 +26,6 @@ import com.jpexs.asdec.gui.View; import com.jpexs.asdec.gui.proxy.ProxyFrame; import com.jpexs.asdec.tags.DoABCTag; import com.jpexs.asdec.tags.Tag; - -import javax.swing.*; -import javax.swing.filechooser.FileFilter; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -39,6 +36,11 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.SwingWorker; +import javax.swing.filechooser.FileFilter; /** diff --git a/trunk/src/com/jpexs/asdec/SWFInputStream.java b/trunk/src/com/jpexs/asdec/SWFInputStream.java index 4a028c5bd..8c0e61217 100644 --- a/trunk/src/com/jpexs/asdec/SWFInputStream.java +++ b/trunk/src/com/jpexs/asdec/SWFInputStream.java @@ -17,6 +17,16 @@ package com.jpexs.asdec; +import com.jpexs.asdec.action.Action; +import com.jpexs.asdec.action.swf3.*; +import com.jpexs.asdec.action.swf4.*; +import com.jpexs.asdec.action.swf5.*; +import com.jpexs.asdec.action.swf6.*; +import com.jpexs.asdec.action.swf7.*; +import com.jpexs.asdec.helpers.Helper; +import com.jpexs.asdec.tags.*; +import com.jpexs.asdec.types.*; +import com.jpexs.asdec.types.filters.*; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -25,161 +35,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Stack; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.swf3.ActionGetURL; -import com.jpexs.asdec.action.swf3.ActionGoToLabel; -import com.jpexs.asdec.action.swf3.ActionGotoFrame; -import com.jpexs.asdec.action.swf3.ActionNextFrame; -import com.jpexs.asdec.action.swf3.ActionPlay; -import com.jpexs.asdec.action.swf3.ActionPrevFrame; -import com.jpexs.asdec.action.swf3.ActionSetTarget; -import com.jpexs.asdec.action.swf3.ActionStop; -import com.jpexs.asdec.action.swf3.ActionStopSounds; -import com.jpexs.asdec.action.swf3.ActionToggleQuality; -import com.jpexs.asdec.action.swf3.ActionWaitForFrame; -import com.jpexs.asdec.action.swf4.ActionAdd; -import com.jpexs.asdec.action.swf4.ActionAnd; -import com.jpexs.asdec.action.swf4.ActionAsciiToChar; -import com.jpexs.asdec.action.swf4.ActionCall; -import com.jpexs.asdec.action.swf4.ActionCharToAscii; -import com.jpexs.asdec.action.swf4.ActionCloneSprite; -import com.jpexs.asdec.action.swf4.ActionDivide; -import com.jpexs.asdec.action.swf4.ActionEndDrag; -import com.jpexs.asdec.action.swf4.ActionEquals; -import com.jpexs.asdec.action.swf4.ActionGetProperty; -import com.jpexs.asdec.action.swf4.ActionGetTime; -import com.jpexs.asdec.action.swf4.ActionGetURL2; -import com.jpexs.asdec.action.swf4.ActionGetVariable; -import com.jpexs.asdec.action.swf4.ActionGotoFrame2; -import com.jpexs.asdec.action.swf4.ActionIf; -import com.jpexs.asdec.action.swf4.ActionJump; -import com.jpexs.asdec.action.swf4.ActionLess; -import com.jpexs.asdec.action.swf4.ActionMBAsciiToChar; -import com.jpexs.asdec.action.swf4.ActionMBCharToAscii; -import com.jpexs.asdec.action.swf4.ActionMBStringExtract; -import com.jpexs.asdec.action.swf4.ActionMBStringLength; -import com.jpexs.asdec.action.swf4.ActionMultiply; -import com.jpexs.asdec.action.swf4.ActionNot; -import com.jpexs.asdec.action.swf4.ActionOr; -import com.jpexs.asdec.action.swf4.ActionPop; -import com.jpexs.asdec.action.swf4.ActionPush; -import com.jpexs.asdec.action.swf4.ActionRandomNumber; -import com.jpexs.asdec.action.swf4.ActionRemoveSprite; -import com.jpexs.asdec.action.swf4.ActionSetProperty; -import com.jpexs.asdec.action.swf4.ActionSetTarget2; -import com.jpexs.asdec.action.swf4.ActionSetVariable; -import com.jpexs.asdec.action.swf4.ActionStartDrag; -import com.jpexs.asdec.action.swf4.ActionStringAdd; -import com.jpexs.asdec.action.swf4.ActionStringEquals; -import com.jpexs.asdec.action.swf4.ActionStringExtract; -import com.jpexs.asdec.action.swf4.ActionStringLength; -import com.jpexs.asdec.action.swf4.ActionStringLess; -import com.jpexs.asdec.action.swf4.ActionSubtract; -import com.jpexs.asdec.action.swf4.ActionToInteger; -import com.jpexs.asdec.action.swf4.ActionTrace; -import com.jpexs.asdec.action.swf4.ActionWaitForFrame2; -import com.jpexs.asdec.action.swf5.ActionAdd2; -import com.jpexs.asdec.action.swf5.ActionBitAnd; -import com.jpexs.asdec.action.swf5.ActionBitLShift; -import com.jpexs.asdec.action.swf5.ActionBitOr; -import com.jpexs.asdec.action.swf5.ActionBitRShift; -import com.jpexs.asdec.action.swf5.ActionBitURShift; -import com.jpexs.asdec.action.swf5.ActionBitXor; -import com.jpexs.asdec.action.swf5.ActionCallFunction; -import com.jpexs.asdec.action.swf5.ActionCallMethod; -import com.jpexs.asdec.action.swf5.ActionConstantPool; -import com.jpexs.asdec.action.swf5.ActionDecrement; -import com.jpexs.asdec.action.swf5.ActionDefineFunction; -import com.jpexs.asdec.action.swf5.ActionDefineLocal; -import com.jpexs.asdec.action.swf5.ActionDefineLocal2; -import com.jpexs.asdec.action.swf5.ActionDelete; -import com.jpexs.asdec.action.swf5.ActionDelete2; -import com.jpexs.asdec.action.swf5.ActionEnumerate; -import com.jpexs.asdec.action.swf5.ActionEquals2; -import com.jpexs.asdec.action.swf5.ActionGetMember; -import com.jpexs.asdec.action.swf5.ActionIncrement; -import com.jpexs.asdec.action.swf5.ActionInitArray; -import com.jpexs.asdec.action.swf5.ActionInitObject; -import com.jpexs.asdec.action.swf5.ActionLess2; -import com.jpexs.asdec.action.swf5.ActionModulo; -import com.jpexs.asdec.action.swf5.ActionNewMethod; -import com.jpexs.asdec.action.swf5.ActionNewObject; -import com.jpexs.asdec.action.swf5.ActionPushDuplicate; -import com.jpexs.asdec.action.swf5.ActionReturn; -import com.jpexs.asdec.action.swf5.ActionSetMember; -import com.jpexs.asdec.action.swf5.ActionStackSwap; -import com.jpexs.asdec.action.swf5.ActionStoreRegister; -import com.jpexs.asdec.action.swf5.ActionTargetPath; -import com.jpexs.asdec.action.swf5.ActionToNumber; -import com.jpexs.asdec.action.swf5.ActionToString; -import com.jpexs.asdec.action.swf5.ActionTypeOf; -import com.jpexs.asdec.action.swf5.ActionWith; -import com.jpexs.asdec.action.swf6.ActionEnumerate2; -import com.jpexs.asdec.action.swf6.ActionGreater; -import com.jpexs.asdec.action.swf6.ActionInstanceOf; -import com.jpexs.asdec.action.swf6.ActionStrictEquals; -import com.jpexs.asdec.action.swf6.ActionStringGreater; -import com.jpexs.asdec.action.swf7.ActionCastOp; -import com.jpexs.asdec.action.swf7.ActionDefineFunction2; -import com.jpexs.asdec.action.swf7.ActionExtends; -import com.jpexs.asdec.action.swf7.ActionImplementsOp; -import com.jpexs.asdec.action.swf7.ActionThrow; -import com.jpexs.asdec.action.swf7.ActionTry; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.tags.DefineBinaryData; -import com.jpexs.asdec.tags.DefineBits; -import com.jpexs.asdec.tags.DefineBitsJPEG2; -import com.jpexs.asdec.tags.DefineBitsJPEG3; -import com.jpexs.asdec.tags.DefineBitsLossless; -import com.jpexs.asdec.tags.DefineBitsLossless2; -import com.jpexs.asdec.tags.DefineButton2Tag; -import com.jpexs.asdec.tags.DefineButtonTag; -import com.jpexs.asdec.tags.DefineFont3; -import com.jpexs.asdec.tags.DefineFont4; -import com.jpexs.asdec.tags.DefineFontAlignZones; -import com.jpexs.asdec.tags.DefineFontName; -import com.jpexs.asdec.tags.DefineScalingGrid; -import com.jpexs.asdec.tags.DefineShape; -import com.jpexs.asdec.tags.DefineShape2; -import com.jpexs.asdec.tags.DefineShape3; -import com.jpexs.asdec.tags.DefineShape4; -import com.jpexs.asdec.tags.DefineSpriteTag; -import com.jpexs.asdec.tags.DoABCTag; -import com.jpexs.asdec.tags.DoActionTag; -import com.jpexs.asdec.tags.DoInitActionTag; -import com.jpexs.asdec.tags.ExportAssetsTag; -import com.jpexs.asdec.tags.FileAttributes; -import com.jpexs.asdec.tags.FrameLabel; -import com.jpexs.asdec.tags.JPEGTables; -import com.jpexs.asdec.tags.Metadata; -import com.jpexs.asdec.tags.PlaceObject2Tag; -import com.jpexs.asdec.tags.PlaceObject3Tag; -import com.jpexs.asdec.tags.ProductInfo; -import com.jpexs.asdec.tags.RemoveObject2; -import com.jpexs.asdec.tags.ScriptLimits; -import com.jpexs.asdec.tags.SetBackgroundColor; -import com.jpexs.asdec.tags.ShowFrameTag; -import com.jpexs.asdec.tags.SymbolClass; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.types.BUTTONCONDACTION; -import com.jpexs.asdec.types.BUTTONRECORD; -import com.jpexs.asdec.types.CLIPACTIONRECORD; -import com.jpexs.asdec.types.CLIPACTIONS; -import com.jpexs.asdec.types.CLIPEVENTFLAGS; -import com.jpexs.asdec.types.CXFORMWITHALPHA; -import com.jpexs.asdec.types.MATRIX; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.RGBA; -import com.jpexs.asdec.types.filters.BEVELFILTER; -import com.jpexs.asdec.types.filters.BLURFILTER; -import com.jpexs.asdec.types.filters.COLORMATRIXFILTER; -import com.jpexs.asdec.types.filters.CONVOLUTIONFILTER; -import com.jpexs.asdec.types.filters.DROPSHADOWFILTER; -import com.jpexs.asdec.types.filters.FILTER; -import com.jpexs.asdec.types.filters.GLOWFILTER; -import com.jpexs.asdec.types.filters.GRADIENTBEVELFILTER; -import com.jpexs.asdec.types.filters.GRADIENTGLOWFILTER; - /** * Class for reading data from SWF file * diff --git a/trunk/src/com/jpexs/asdec/SWFOutputStream.java b/trunk/src/com/jpexs/asdec/SWFOutputStream.java index b797c033b..872483e66 100644 --- a/trunk/src/com/jpexs/asdec/SWFOutputStream.java +++ b/trunk/src/com/jpexs/asdec/SWFOutputStream.java @@ -17,33 +17,14 @@ package com.jpexs.asdec; +import com.jpexs.asdec.tags.Tag; +import com.jpexs.asdec.types.*; +import com.jpexs.asdec.types.filters.*; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.List; -import com.jpexs.asdec.abc.NotSameException; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.types.BUTTONCONDACTION; -import com.jpexs.asdec.types.BUTTONRECORD; -import com.jpexs.asdec.types.CLIPACTIONRECORD; -import com.jpexs.asdec.types.CLIPACTIONS; -import com.jpexs.asdec.types.CLIPEVENTFLAGS; -import com.jpexs.asdec.types.CXFORMWITHALPHA; -import com.jpexs.asdec.types.MATRIX; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.RGBA; -import com.jpexs.asdec.types.filters.BEVELFILTER; -import com.jpexs.asdec.types.filters.BLURFILTER; -import com.jpexs.asdec.types.filters.COLORMATRIXFILTER; -import com.jpexs.asdec.types.filters.CONVOLUTIONFILTER; -import com.jpexs.asdec.types.filters.DROPSHADOWFILTER; -import com.jpexs.asdec.types.filters.FILTER; -import com.jpexs.asdec.types.filters.GLOWFILTER; -import com.jpexs.asdec.types.filters.GRADIENTBEVELFILTER; -import com.jpexs.asdec.types.filters.GRADIENTGLOWFILTER; - /** * Class for writing data into SWF file * diff --git a/trunk/src/com/jpexs/asdec/abc/ABC.java b/trunk/src/com/jpexs/asdec/abc/ABC.java index cce33468c..9489e1e9c 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABC.java +++ b/trunk/src/com/jpexs/asdec/abc/ABC.java @@ -17,19 +17,6 @@ package com.jpexs.asdec.abc; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JOptionPane; - import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; @@ -38,35 +25,18 @@ import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.InitPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.ABCException; -import com.jpexs.asdec.abc.types.ClassInfo; -import com.jpexs.asdec.abc.types.Decimal; -import com.jpexs.asdec.abc.types.InstanceInfo; -import com.jpexs.asdec.abc.types.MetadataInfo; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.Namespace; -import com.jpexs.asdec.abc.types.NamespaceSet; -import com.jpexs.asdec.abc.types.ScriptInfo; +import com.jpexs.asdec.abc.types.*; import com.jpexs.asdec.abc.types.traits.Trait; import com.jpexs.asdec.abc.types.traits.TraitMethodGetterSetter; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.abc.usages.ClassNameMultinameUsage; -import com.jpexs.asdec.abc.usages.ConstVarNameMultinameUsage; -import com.jpexs.asdec.abc.usages.ConstVarTypeMultinameUsage; -import com.jpexs.asdec.abc.usages.ExtendsMultinameUsage; -import com.jpexs.asdec.abc.usages.ImplementsMultinameUsage; -import com.jpexs.asdec.abc.usages.MethodBodyMultinameUsage; -import com.jpexs.asdec.abc.usages.MethodNameMultinameUsage; -import com.jpexs.asdec.abc.usages.MethodParamsMultinameUsage; -import com.jpexs.asdec.abc.usages.MethodReturnTypeMultinameUsage; -import com.jpexs.asdec.abc.usages.MultinameUsage; -import com.jpexs.asdec.abc.usages.TypeNameMultinameUsage; +import com.jpexs.asdec.abc.usages.*; import com.jpexs.asdec.helpers.Helper; import com.jpexs.asdec.helpers.Highlighting; +import java.io.*; +import java.util.ArrayList; import java.util.LinkedList; +import java.util.List; import java.util.regex.Pattern; public class ABC { diff --git a/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java b/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java index 7335913be..bb72a1bca 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java +++ b/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.abc; import com.jpexs.asdec.abc.types.*; import com.jpexs.asdec.abc.types.traits.*; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/trunk/src/com/jpexs/asdec/abc/ABCOutputStream.java b/trunk/src/com/jpexs/asdec/abc/ABCOutputStream.java index 0ca6d941a..c9369c4fc 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABCOutputStream.java +++ b/trunk/src/com/jpexs/asdec/abc/ABCOutputStream.java @@ -17,13 +17,8 @@ package com.jpexs.asdec.abc; -import com.jpexs.asdec.abc.types.Decimal; -import com.jpexs.asdec.abc.types.InstanceInfo; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.Namespace; +import com.jpexs.asdec.abc.types.*; import com.jpexs.asdec.abc.types.traits.*; - import java.io.IOException; import java.io.OutputStream; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java index 662e113c2..f66f5731f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java @@ -17,7 +17,6 @@ package com.jpexs.asdec.abc.avm2; -import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.ABCInputStream; import com.jpexs.asdec.abc.CopyOutputStream; @@ -51,7 +50,6 @@ import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; import com.jpexs.asdec.helpers.Helper; import com.jpexs.asdec.helpers.Highlighting; - import java.io.*; import java.util.*; import java.util.logging.Level; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java b/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java index 9804416bf..efacde1fe 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.abc.types.Decimal; import com.jpexs.asdec.abc.types.Multiname; import com.jpexs.asdec.abc.types.Namespace; import com.jpexs.asdec.abc.types.NamespaceSet; - import java.io.OutputStream; import java.io.PrintStream; import java.util.Arrays; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java b/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java index e04d22dee..d45968f5d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.avm2; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java index 7cf6a5a6e..95460b080 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/flowgraph/Graph.java @@ -27,11 +27,7 @@ import com.jpexs.asdec.abc.avm2.instructions.localregs.GetLocalTypeIns; import com.jpexs.asdec.abc.avm2.instructions.localregs.SetLocalTypeIns; import com.jpexs.asdec.abc.avm2.instructions.other.ReturnValueIns; import com.jpexs.asdec.abc.avm2.instructions.other.ReturnVoidIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.DupIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.PopIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.PushFalseIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.PushTrueIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.SwapIns; +import com.jpexs.asdec.abc.avm2.instructions.stack.*; import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java index 0932141aa..a445d0f2e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java @@ -18,10 +18,9 @@ package com.jpexs.asdec.abc.avm2.instructions; import com.jpexs.asdec.abc.ABCOutputStream; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java index eba7703ef..b1700325c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java @@ -17,9 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - -import java.util.Stack; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import java.util.Stack; public interface IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java index b968122a4..2779bb536 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; @@ -26,9 +26,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.helpers.Highlighting; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java index 28c096929..d12ff7d84 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java @@ -17,12 +17,12 @@ package com.jpexs.asdec.abc.avm2.instructions; -import com.jpexs.asdec.abc.avm2.ConstantPool; + import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public interface SetTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java index f155b26de..4222a4f54 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java @@ -17,16 +17,15 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.AddTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class AddIIns extends AddIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java index a18f06d59..fbb9dbd40 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.AddTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class AddIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java index 1c0e6e9ff..6cc6f1f6b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.DecrementTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DecrementIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java index bdd1c4562..46b51884f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.DecrementTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DecrementIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java index ecd9834d0..126cca04d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.DivideTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DivideIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java index c5bc5eb0b..9fc785e1a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -25,9 +25,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.IncrementTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IncrementIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java index 7afd6d495..08cc1cc7c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -25,9 +25,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.IncrementTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IncrementIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java index e21a70728..aa8ddde03 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,8 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.ModuloTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import java.util.HashMap; - import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ModuloIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java index 7cf979338..ab7052afa 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.MultiplyTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class MultiplyIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java index 651ba5145..f1045b4bd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.MultiplyTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class MultiplyIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java index 6d14ac0dd..a4f3f9b82 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NegTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NegateIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java index 5036728b5..520bd7091 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NegTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NegateIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java index 3c9ec2d8e..9c09d0fe3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NotTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NotIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java index f8152fcdf..0ca288720 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.SubtractTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SubtractIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java index 839a966ea..b563592a7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.arithmetic; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.SubtractTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SubtractIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java index c287be8fb..4f9d5c610 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.BitAndTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class BitAndIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java index 4b0e41ac9..6dcff83f3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.BitNotTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class BitNotIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java index 77d508016..1036e676b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.BitOrTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class BitOrIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java index 34a41d352..54cc25c49 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.BitXorTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class BitXorIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java index 78c595598..b2a891077 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LShiftTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class LShiftIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java index c9ccbed24..71847241c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.RShiftTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class RShiftIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java index 92e1b892d..94971ac4b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.bitwise; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.URShiftTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class URShiftIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java index 2401d57dd..bb5b6b421 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.comparsion; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.EqTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class EqualsIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java index 31f3ff8f7..9a2b7d486 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.comparsion; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GreaterEqualsIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java index 47c38a54e..3f34146a0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.comparsion; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LtTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GreaterThanIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java index ffbae12e6..358995daa 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.comparsion; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class LessEqualsIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java index 9749b0fd2..3398ffc7e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.comparsion; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GtTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class LessThanIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java index 50521349b..33ed130ff 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.comparsion; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.StrictEqTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class StrictEqualsIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java index 9d42c1d06..ebf5fa843 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConstructTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConstructIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java index d18112867..d0ace4cec 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,10 +27,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.ConstructPropTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConstructPropIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java index 0f1f3eff8..665e2a5e2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConstructSuperTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConstructSuperIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java index cd44d9247..5c6978db9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NewActivationIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java index 2b7110cc8..66a6e2d98 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java @@ -17,18 +17,18 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.NewArrayTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NewArrayIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java index f28474627..9c5111582 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java @@ -17,17 +17,17 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.clauses.ExceptionTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NewCatchIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java index a1e51178d..d25aa9292 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java @@ -17,17 +17,17 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.UnparsedTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NewClassIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java index 6c70e06be..36b7d612d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.helpers.Highlighting; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NewFunctionIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java index 26b7b7944..a1199e27b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.construction; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.NameValuePair; import com.jpexs.asdec.abc.avm2.treemodel.NewObjectTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NewObjectIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java index 909c24453..cbdf77f92 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.debug; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java index 63fdf4108..a4e2a63c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.debug; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java index 79750c150..ebe4a33b2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.debug; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java index c94b372aa..694afc574 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.CallTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java index 3afc46bdd..1d76ad366 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.CallMethodTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallMethodIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java index 29d80c1bc..7b7cb15bd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java @@ -17,17 +17,17 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.CallPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallPropLexIns extends CallPropertyIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java index aa27b640d..f861e97f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,10 +27,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.CallPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallPropVoidIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java index b91c1b438..f6e2a3f99 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,10 +27,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.CallPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallPropertyIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java index b7040d7df..0c93e9f4f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.CallStaticTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallStaticIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java index 904914d22..e80ec999d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,10 +27,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.CallSuperTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallSuperIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java index de6b71c33..ed9f3ca82 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.executing; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,10 +27,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.CallSuperTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CallSuperVoidIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java index 22114783a..3b73e83dc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.EqTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NeqTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfEqIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java index a7242a4af..9383fbe54 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NotTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfFalseIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java index 5083e926d..778a0179e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GeTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LtTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfGeIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java index f8d93fcbe..88daa475a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GtTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfGtIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java index 4e619fbd3..430ad8eca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GtTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfLeIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java index d1d0440b2..6b0b633ac 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GeTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LtTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfLtIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java index 902789cca..3f9706993 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GeTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LtTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfNGeIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java index f1e90c695..59425d54b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GtTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfNGtIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java index a7aeeb7ef..2add2c5d4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GtTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfNLeIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java index 49683e95d..8643d7bb0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.GeTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.LtTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfNLtIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java index 6d5ccb696..34da02f98 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.EqTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NeqTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfNeIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java index 88045875f..bb63e16ff 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.StrictEqTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.StrictNeqTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfStrictEqIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java index 68d209cd9..69c73c933 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.StrictEqTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.StrictNeqTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfStrictNeIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java index 64fd853b1..99e112ec9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.NotTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IfTrueIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java index 108cf2515..12c5f2d34 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class JumpIns extends InstructionDefinition implements IfTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java index 91ca0082c..d9968d1c5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.jumps; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class LookupSwitchIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java index c769f3695..097862fec 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.DecLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DecLocalIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java index c4c413e09..c8bc09eeb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.DecLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DecLocalIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java index b389d1502..51fbeafeb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.ClassTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.ThisTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetLocal0Ins extends InstructionDefinition implements GetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java index ffd80300c..6e59a715c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetLocal1Ins extends InstructionDefinition implements GetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java index 0a2d86f8c..0cff112ba 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetLocal2Ins extends InstructionDefinition implements GetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java index b3953b61f..7bbfae323 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetLocal3Ins extends InstructionDefinition implements GetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java index d46502c28..1c0e85756 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetLocalIns extends InstructionDefinition implements GetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java index 256d4d429..8e04bdb9f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IncLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IncLocalIIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java index f5b6d1593..a99d14afe 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IncLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IncLocalIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java index cda6ff8a3..f740f3ff6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java @@ -17,15 +17,15 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class KillIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java index 9e1457187..86e0e35c7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetLocal0Ins extends InstructionDefinition implements SetTypeIns, SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java index fdeffa995..a20d1dab9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetLocal1Ins extends InstructionDefinition implements SetTypeIns, SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java index a26009824..55a697c89 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetLocal2Ins extends InstructionDefinition implements SetTypeIns, SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java index bb889aec2..ac56f62e4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetLocal3Ins extends InstructionDefinition implements SetTypeIns, SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java index 935ae9ced..f0072f4b1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -29,9 +29,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetLocalIns extends InstructionDefinition implements SetTypeIns, SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java index 0cd568281..9f650a797 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.DeletePropertyTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DeletePropertyIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java index e82640f99..9baafd9c0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FindPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class FindPropertyIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java index 3a4140bb7..47f77077c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FindPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class FindPropertyStrictIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java index d256c84c4..9bcc663fc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.GetDescendantsTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetDescendantsIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java index 10768c820..9dcb0c17f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetGlobalScopeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java index f2b7a2ace..d6271d650 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.clauses.ExceptionTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.abc.types.Multiname; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetGlobalSlotIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java index d9f22f888..b37cffaa5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.GetLexTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.abc.types.Multiname; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetLexIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java index 36f2dee9d..65d128a3f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.GetPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetPropertyIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java index 2f7dffbec..80bb4d565 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetScopeObjectIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java index 777449dd6..c9cdb2c12 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -28,9 +28,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.clauses.ExceptionTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.abc.types.Multiname; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetSlotIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java index e7b3dd5ad..2a3b4dc15 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.GetSuperTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class GetSuperIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java index 2e8c41646..0efa82ccd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.InTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class HasNext2Ins extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java index 8d13a478a..bc70dc98c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.InTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class HasNextIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java index 0a9bcf393..8b5396b67 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.InTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class InIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java index ba1a9d919..a386daba5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.InitPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class InitPropertyIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java index 62b983fb3..a421156f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java @@ -17,15 +17,15 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NextNameIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java index 5f51a9de7..e77a4abdb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java @@ -17,15 +17,15 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class NextValueIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java index c022f102b..cd7a613d1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ReturnValueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ReturnValueIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java index d0c9b8267..a88f46f45 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java @@ -17,15 +17,15 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.avm2.ConstantPool; + import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ReturnVoidTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ReturnVoidIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java index 1f7deff47..ad950c48d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.SetTypeIns; import com.jpexs.asdec.abc.avm2.treemodel.SetGlobalSlotTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetGlobalSlotIns extends InstructionDefinition implements SetTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java index e4719418a..236283f62 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetPropertyTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetPropertyIns extends InstructionDefinition implements SetTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java index d1200a85a..6ff871e5a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -30,9 +30,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.clauses.ExceptionTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.abc.types.Multiname; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetSlotIns extends InstructionDefinition implements SetTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java index 959c4a861..cbd793ac2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.SetSuperTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SetSuperIns extends InstructionDefinition implements SetTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java index 56156444a..c9b7e239a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.ThrowTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ThrowIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java index b5701fa89..58fe28db1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DupIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java index 9609bf201..a6a85a54f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java @@ -17,21 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.asdec.abc.avm2.treemodel.CallMethodTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.CallPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.CallStaticTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.CallSuperTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.CallTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.asdec.abc.avm2.treemodel.*; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PopIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java index 441d73221..4ffa60d50 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,10 +26,10 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.WithTreeItem; import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PopScopeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java index 622cdcd44..63d0940b6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushByteIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java index 0de754524..4689eb192 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.FloatValueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushDoubleIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java index eea68942c..895559381 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushFalseIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java index 4869a9477..e04661f61 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushIntIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java index c3bb0617d..e89ce9c7b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.NameSpaceTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushNamespaceIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java index db3b6db3e..bc69cbc49 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.NanTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushNanIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java index fb4afa21f..d7c2ae4ce 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.NullTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushNullIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java index dff25ded6..0656f94f6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushScopeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java index ea36e93b9..acafa40eb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushShortIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java index ce9fb3714..56e05d77f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.StringTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushStringIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java index b9c329f27..bdc4eaf10 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushTrueIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java index ed1534a11..fd935a2de 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushUIntIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java index 4a0af287f..10dd90329 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.UndefinedTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushUndefinedIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java index b4fbe1b49..bc808be58 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.WithTreeItem; import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class PushWithIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java index 980fb3193..4ede49d25 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.stack; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class SwapIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java index 48a43d50d..60044f7bd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,11 +26,7 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ApplyTypeTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; -import java.util.ArrayList; -import java.util.Collections; - -import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.*; public class ApplyTypeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java index 355470130..d391eb403 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -27,9 +27,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.AsTypeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class AsTypeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java index b642e164a..754062927 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.AsTypeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class AsTypeLateIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java index 01044c292..4f04f73fb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.CoerceTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CoerceAIns extends InstructionDefinition implements CoerceOrConvertTypeIns{ diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java index 90bd5004e..6e2a2acb7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.CoerceTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CoerceIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java index c083bd1fb..92103f4cd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.CoerceTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CoerceSIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java index 3470460da..425e7996a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConvertBIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java index 3df5320b6..d35282aa1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConvertDIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java index d822636b3..de83aa912 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConvertIIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java index 50f96a5e9..8cf9c3e48 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConvertOIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java index 63d4debbf..fa29fd895 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConvertSIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java index 0c52785f9..d75028653 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class ConvertUIns extends InstructionDefinition implements CoerceOrConvertTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java index 2a5ad107e..3d144119e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.InstanceOfTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class InstanceOfIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java index bd95c4dd7..6dc54fce0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; + import com.jpexs.asdec.abc.ABC; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; @@ -26,9 +26,9 @@ import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.IsTypeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IsTypeIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java index 8ddeac516..f465e8e05 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.IsTypeTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class IsTypeLateIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java index 1aa335759..ed92695e5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.operations.TypeOfTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class TypeOfIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java index 3179919b8..806127897 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java @@ -17,16 +17,16 @@ package com.jpexs.asdec.abc.avm2.instructions.xml; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class CheckFilterIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java index e787d5f93..59abb5133 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.abc.avm2.instructions.xml; -import com.jpexs.asdec.abc.avm2.AVM2Code; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; - import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java index d54078e8e..bff373a77 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.xml; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.UnparsedTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class DXNSLateIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java index 7db7a9c54..b37895e1d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.xml; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.UnparsedTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class EscXAttrIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java index f04a5186d..2795749af 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java @@ -17,7 +17,7 @@ package com.jpexs.asdec.abc.avm2.instructions.xml; -import com.jpexs.asdec.abc.ABC; + import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.LocalDataArea; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; @@ -25,9 +25,9 @@ import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.avm2.treemodel.UnparsedTreeItem; import com.jpexs.asdec.abc.types.MethodInfo; - +import java.util.HashMap; import java.util.List; -import java.util.Stack; import java.util.HashMap; +import java.util.Stack; public class EscXElemIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java index 4397118f7..e0a4fe1d1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.types.ABCException; import com.jpexs.asdec.abc.types.MethodBody; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java index a0a63aef7..0a14389c4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java index c754ba2f0..9f622a313 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class BooleanTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java index 2f9fd30e6..09789b70e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class BreakTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java index 338b694e4..56ad05ffa 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java index d85b4dd81..e440e4ecb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java index c76ca3e21..aca465edf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java index 1de1d00fb..5028ec176 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java @@ -17,10 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.helpers.Highlighting; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java index 58fe8b437..fbfcefab4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java index d36f39094..ea908e09b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java @@ -17,7 +17,8 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.ConstantPool; +import java.util.HashMap; public class ClassTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java index fa74488e2..52e007ac6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class CoerceTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java index ca5ac940d..ce6f8ab2f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java index 40ee36b9e..54b72a7d9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java @@ -17,10 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.helpers.Highlighting; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java index 722400b0c..711a8a9c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java index cbee8a02d..fc06d3db8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class ContinueTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java index 491834680..82563edf6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class ConvertTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java index 16d9b8378..b8877806b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import java.util.HashMap; public class DecLocalTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java index 18cdd4e02..d58650376 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class DecrementTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java index 4beca9253..d88a8720c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class FindPropertyTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java index e4acf6dcf..601eb8e88 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class FloatValueTreeItem extends NumberValueTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java index 0149d0646..f8d71769f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.types.Namespace; +import java.util.HashMap; public class FullMultinameTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java index 730cc0908..d8c1fd864 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class GetDescendantsTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java index 15aa95687..d21f38135 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.types.Multiname; +import java.util.HashMap; public class GetLexTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java index b2b07ec27..4c7317699 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class GetPropertyTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java index 1fcdab57c..25cebada0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.types.Multiname; +import java.util.HashMap; public class GetSlotTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java index 23faa0897..55de31131 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.helpers.Highlighting; +import java.util.HashMap; public class GetSuperTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java index 7474963a9..47025bd4c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class InTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java index dfae716ed..3161235d1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import java.util.HashMap; public class IncLocalTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java index ca7130843..eec750192 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class IncrementTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java index ec3ce2fae..57eeebbf2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class InitPropertyTreeItem extends TreeItem implements SetTypeTreeItem{ diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java index 8d8f8db96..0746139ad 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class IntegerValueTreeItem extends NumberValueTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java index 1842860ce..581df3bb3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import java.util.HashMap; public class LocalRegTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java index e10fff729..02077492f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class NameSpaceTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java index 9b15b9102..c8be26894 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java @@ -17,7 +17,8 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.ConstantPool; +import java.util.HashMap; public class NameValuePair extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java index 54b3a2796..1f5718577 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class NanTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java index f9c19272c..6b3c2e4ba 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class NewActivationTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java index 34d372cc4..6fc27d968 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java index 07b912363..d8599e893 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class NewFunctionTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java index 3689a250d..f9481d0df 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java @@ -17,9 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java index c5319e634..186e196e9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class NullTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java index 8f18e3a34..71e458e39 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class PostDecrementTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java index d86819798..101f2fca0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class PostIncrementTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java index 7cfd30bed..953766f28 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class ReturnValueTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java index 739c99205..7ad68b52b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class ReturnVoidTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java index a7c4224b6..42c0baf7c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class SetGlobalSlotTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java index 13c95d921..493395108 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java @@ -17,9 +17,8 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java index ecfb29814..3fcc1aff1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem{ diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java index 3f113942a..060cd7603 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.types.Multiname; +import java.util.HashMap; public class SetSlotTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java index fbf09d4ab..68dac2935 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.helpers.Highlighting; +import java.util.HashMap; public class SetSuperTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java index 25960156a..de3987caf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.helpers.Helper; +import java.util.HashMap; public class StringTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java index aee697eac..6bb7cbf17 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java @@ -17,7 +17,8 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; + import com.jpexs.asdec.abc.avm2.ConstantPool; +import java.util.HashMap; public class ThisTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java index 646efc370..d0d7653cb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class ThrowTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java index 03154f392..4b46b162d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java @@ -17,9 +17,8 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.helpers.Highlighting; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java index c5d18d73d..05914891d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class UndefinedTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java index 3bfe81c01..0da873cb9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java @@ -17,8 +17,9 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import java.util.HashMap; public class UnparsedTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java index 9129809c6..44d94b8bb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java @@ -17,10 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java index af8997cf2..a7ccf4fcc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; - import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java index 8f59ae3b5..4fc0e6d70 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java @@ -17,12 +17,12 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java index 5fddb89cf..c17f44c4b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.ABCException; +import java.util.HashMap; public class ExceptionTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java index 7a2c09c56..ddcd2b740 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java @@ -17,16 +17,11 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.InTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetTypeTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - +import com.jpexs.asdec.abc.avm2.treemodel.*; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForInTreeItem.java index fab98dc5b..3271233f1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForInTreeItem.java @@ -17,16 +17,11 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.InTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetTypeTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - +import com.jpexs.asdec.abc.avm2.treemodel.*; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java index ce38883b3..c66c74fc9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java @@ -17,12 +17,12 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java index 6259227b0..7ce7f67b3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java @@ -17,12 +17,12 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java index d9f98baa4..382abbf7f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java @@ -18,12 +18,12 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java index c9fd79cff..a44248ea8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import java.util.HashMap; public class TernarOpTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java index b4bf0acb2..2c37ee7b9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java @@ -17,12 +17,12 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; import com.jpexs.asdec.abc.types.ABCException; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java index 53c54eefb..5df804cd3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java @@ -17,12 +17,12 @@ package com.jpexs.asdec.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; - import java.util.ArrayList; +import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java index 216369b92..bedc5d3cb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import java.util.HashMap; public abstract class BinaryOpTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java index f015cc407..4ef0e4f84 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java @@ -17,10 +17,11 @@ package com.jpexs.asdec.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import java.util.HashMap; public class DeletePropertyTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java index 7afd3f256..1323ea79c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.ConstantPool; import java.util.HashMap; +import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import java.util.HashMap; public abstract class UnaryOpTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java b/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java index 104edf9ac..643ec511f 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java @@ -18,10 +18,9 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.tags.DoABCTag; - -import javax.swing.*; -import javax.swing.event.ListDataListener; import java.util.List; +import javax.swing.ComboBoxModel; +import javax.swing.event.ListDataListener; public class ABCComboBoxModel implements ComboBoxModel { diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java b/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java index d534202eb..b1c13f3ec 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java @@ -17,18 +17,16 @@ package com.jpexs.asdec.abc.gui; -import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.avm2.flowgraph.Graph; import com.jpexs.asdec.abc.avm2.parser.ASM3Parser; import com.jpexs.asdec.abc.avm2.parser.ParseException; - -import javax.swing.*; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; +import javax.swing.JOptionPane; public class ASMSourceEditorPane extends LineMarkedEditorPane { diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java index 32a1f0747..8fbd7d80d 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java @@ -19,10 +19,8 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.*; +import javax.swing.ImageIcon; +import javax.swing.JTree; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeCellRenderer; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java index 16be563bb..a015a5377 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java @@ -18,14 +18,9 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.regex.Pattern; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java b/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java index 3d6d254ad..6ea7b858e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java @@ -19,8 +19,7 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.helpers.Helper; - -import javax.swing.*; +import javax.swing.ListModel; import javax.swing.event.ListDataListener; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java index a156ab4e3..1d309a66e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.abc.avm2.ConvertException; import com.jpexs.asdec.abc.types.traits.Trait; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; import com.jpexs.asdec.helpers.Highlighting; - import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java index dcfbd29e8..c4613d842 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java @@ -24,15 +24,8 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.SwingConstants; +import javax.swing.*; import javax.swing.border.BevelBorder; -import javax.swing.border.EtchedBorder; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java b/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java index ccc826b56..2d0cb162d 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java @@ -18,8 +18,7 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.abc.avm2.parser.MissingSymbolHandler; - -import javax.swing.*; +import javax.swing.JOptionPane; public class DialogMissingSymbolHandler implements MissingSymbolHandler { diff --git a/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java index 0a698fd5c..8f73a68b7 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java @@ -20,11 +20,7 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.abc.avm2.flowgraph.Graph; import com.jpexs.asdec.abc.avm2.flowgraph.GraphPart; import com.jpexs.asdec.gui.View; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Graphics; +import java.awt.*; import java.util.ArrayList; import java.util.List; import javax.swing.JFrame; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java b/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java index c6e1989b8..507b070e3 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java @@ -17,8 +17,8 @@ package com.jpexs.asdec.abc.gui; +import java.awt.Component; import javax.swing.*; -import java.awt.*; public class IconListRenderer diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java index 095c1ab45..1189bef2a 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/MainFrame.java @@ -20,23 +20,20 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.Configuration; import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.gui.tablemodels.*; import com.jpexs.asdec.gui.LoadingPanel; import com.jpexs.asdec.gui.View; import com.jpexs.asdec.tags.DoABCTag; -import jsyntaxpane.DefaultSyntaxKit; - +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.event.*; +import java.io.IOException; +import java.util.List; import javax.swing.*; import javax.swing.border.BevelBorder; import javax.swing.table.*; -import java.awt.*; -import java.awt.event.*; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import jsyntaxpane.actions.ComboCompletionAction; -import jsyntaxpane.syntaxkits.Flasm3SyntaxKit; +import jsyntaxpane.DefaultSyntaxKit; public class MainFrame extends JFrame implements ActionListener, ItemListener { diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java index 8d48bc1e5..2fa16d2ed 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java @@ -18,17 +18,11 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.avm2.CodeStats; import com.jpexs.asdec.abc.types.MethodBody; import java.awt.Color; import java.awt.Dimension; import java.text.NumberFormat; -import javax.swing.JCheckBox; -import javax.swing.JFormattedTextField; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.SwingConstants; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java index ff07d13fa..71c09d3fe 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java @@ -24,12 +24,7 @@ import com.jpexs.asdec.abc.methodinfo_parser.ParseException; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.helpers.Helper; import java.awt.Dimension; -import javax.swing.BoxLayout; -import javax.swing.JEditorPane; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; +import javax.swing.*; import jsyntaxpane.syntaxkits.Flasm3MethodInfoSyntaxKit; /** diff --git a/trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java index c9a9bd547..7e83de247 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java @@ -24,13 +24,7 @@ import com.jpexs.asdec.abc.types.ValueKind; import com.jpexs.asdec.abc.types.traits.TraitSlotConst; import com.jpexs.asdec.helpers.Helper; import java.awt.BorderLayout; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.JEditorPane; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; +import javax.swing.*; import jsyntaxpane.syntaxkits.Flasm3MethodInfoSyntaxKit; /** diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java b/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java index ea04def97..479fa3a23 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java @@ -19,8 +19,8 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.Main; import com.jpexs.asdec.abc.ABC; - -import javax.swing.*; +import javax.swing.DefaultListModel; +import javax.swing.JList; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java b/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java index 7efa3dc7e..2bed078a7 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java @@ -18,8 +18,7 @@ package com.jpexs.asdec.abc.gui; import com.jpexs.asdec.abc.ABC; - -import javax.swing.*; +import javax.swing.ListModel; import javax.swing.event.ListDataListener; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java b/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java index 0345e5074..fd2f12885 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java @@ -31,18 +31,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.swing.DefaultListModel; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.tree.TreePath; +import javax.swing.*; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java index 66c3aaec2..f5645b6d2 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java index a875e8459..ebb0c72e9 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java index 3d4469133..92712e980 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java index 12def5802..b96285b72 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java index 805329c4e..1531c95c8 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java index 51dae57e8..03c161423 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java index 70eabbb98..a9c064e41 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java index cbb24bec5..5187a6fce 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.gui.tablemodels; import com.jpexs.asdec.abc.ABC; - import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java b/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java index 40d88f2b1..915b0a72b 100644 --- a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java +++ b/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java @@ -17,8 +17,6 @@ package com.jpexs.asdec.abc.methodinfo_parser; -import com.jpexs.asdec.action.parser.*; - public class ParseException extends Exception { public long line; diff --git a/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java b/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java index 9056628e4..ad8688da7 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java +++ b/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.AVM2Code; import com.jpexs.asdec.abc.avm2.CodeStats; import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; import com.jpexs.asdec.abc.types.traits.Traits; import com.jpexs.asdec.helpers.Highlighting; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java b/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java index adcf6e2da..17b629976 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java +++ b/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.types; import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.abc.types.traits.Traits; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java b/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java index 761be3111..bd96aa5c6 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.abc.types.traits; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.types.MethodBody; import com.jpexs.asdec.abc.types.MethodInfo; import com.jpexs.asdec.abc.types.Multiname; import com.jpexs.asdec.abc.types.Namespace; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java index 906f7ac9d..d88994e3e 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.types.traits; import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.helpers.Helper; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java index a84f33541..3db6866d6 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java +++ b/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.abc.types.traits; import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; import com.jpexs.asdec.helpers.Helper; diff --git a/trunk/src/com/jpexs/asdec/action/Action.java b/trunk/src/com/jpexs/asdec/action/Action.java index b1f67458b..1d98c2974 100644 --- a/trunk/src/com/jpexs/asdec/action/Action.java +++ b/trunk/src/com/jpexs/asdec/action/Action.java @@ -35,14 +35,9 @@ import com.jpexs.asdec.action.treemodel.operations.NotTreeItem; import com.jpexs.asdec.action.treemodel.operations.OrTreeItem; import com.jpexs.asdec.helpers.Helper; import com.jpexs.asdec.helpers.Highlighting; - import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.EmptyStackException; -import java.util.HashMap; -import java.util.List; -import java.util.Stack; +import java.util.*; /** * Represents one ACTIONRECORD, diff --git a/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java b/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java index 7f4d90d29..c032c0f97 100644 --- a/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java +++ b/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java index d88b85dc7..056a062f2 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/action/gui/MainFrame.java @@ -25,17 +25,10 @@ import com.jpexs.asdec.gui.View; import com.jpexs.asdec.helpers.Highlighting; import com.jpexs.asdec.tags.ASMSource; import com.jpexs.asdec.tags.Tag; -import java.io.FileNotFoundException; -import java.util.logging.Level; -import java.util.logging.Logger; -import jsyntaxpane.DefaultSyntaxKit; - -import javax.swing.*; -import javax.swing.border.BevelBorder; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.DefaultTreeCellRenderer; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; @@ -45,6 +38,12 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.util.List; +import javax.swing.*; +import javax.swing.border.BevelBorder; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultTreeCellRenderer; +import jsyntaxpane.DefaultSyntaxKit; public class MainFrame extends JFrame implements TreeSelectionListener, ActionListener { diff --git a/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java b/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java index dde282896..39f1b1beb 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java +++ b/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java @@ -18,12 +18,11 @@ package com.jpexs.asdec.action.gui; import com.jpexs.asdec.tags.*; - +import java.util.ArrayList; +import java.util.List; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import java.util.ArrayList; -import java.util.List; public class TagTreeModel implements TreeModel { private String root = ""; diff --git a/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java b/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java index 6bfa5718e..7249134a0 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java +++ b/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.swf4.*; import com.jpexs.asdec.action.swf5.*; import com.jpexs.asdec.action.swf6.*; import com.jpexs.asdec.action.swf7.*; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java b/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java index a81bda50c..d95b3fb5e 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java +++ b/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java @@ -18,9 +18,9 @@ package com.jpexs.asdec.action.parser; import com.jpexs.asdec.action.swf4.ConstantIndex; +import com.jpexs.asdec.action.swf4.Null; import com.jpexs.asdec.action.swf4.RegisterNumber; import com.jpexs.asdec.action.swf4.Undefined; -import com.jpexs.asdec.action.swf4.Null; /** diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java index 5e1f2e701..7272e3d97 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java @@ -27,7 +27,6 @@ import com.jpexs.asdec.action.treemodel.GetURLTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; import java.io.ByteArrayInputStream; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java index 2ebee4db6..779528475 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java @@ -27,7 +27,6 @@ import com.jpexs.asdec.action.treemodel.GotoLabelTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; import java.io.ByteArrayInputStream; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java index b712e8917..8b1dc017b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GotoFrameTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java index 01da875b7..db38c16ef 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java index 0ee441d02..9926a0be9 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java index d768c4d82..4f00d871d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java index a8e98db22..9498f4e1a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java @@ -27,7 +27,6 @@ import com.jpexs.asdec.action.treemodel.SetTargetTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; import java.io.ByteArrayInputStream; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java index 292db5f7b..f8726ac37 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java index 5b803abbc..63c0e1b2e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java index fba1e415d..1187dc0e3 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java b/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java index d8f456338..295141a5f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java +++ b/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.WaitForFrameTreeItem; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java index 3704a38cd..0be6e38bc 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.AddTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java index a939e1edc..e06510098 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.AndTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java index 04b5fbb96..36eb26677 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.AsciiToCharTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java index 3b478b7af..96abc3d78 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.CallTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java index f70004097..de146a345 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.CharToAsciiTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java index ccc946ff9..2805fc338 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.CloneSpriteTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java index e655f2c79..f89f334f9 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.DivideTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java index a66c97b6f..323a4cb7c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java index a3d2e28e7..a262de10e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.EqTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java index f5d3b7e52..66268cf9c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.GetPropertyTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java index cd09f3384..8f27f71ce 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java index 4dd6f479c..652f84fdc 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GetURL2TreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java index d1e03c797..ff8e6ec99 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GetVariableTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java index b3dc88f8e..4af73c780 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GotoFrame2TreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java index 0ffe11220..2c2231f21 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.parser.FlasmLexer; import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java index 7b5a2c54c..068e6e61d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.parser.FlasmLexer; import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java index b029a7a68..072632695 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.LtTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java index af1154f81..66b2946ee 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.MBAsciiToCharTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java index d063b17d6..375f63896 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.MBCharToAsciiTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java index 31e77ef4c..0a32e51af 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.MBStringExtractTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java index 6f2f3909a..d45dacec0 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.MBStringLengthTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java index b5178fcc6..0192ff8bb 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.MultiplyTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java index 3796b795a..22a28e195 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.NotTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java index 97de4b65d..9edbfd4e4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.OrTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java index 3c31d3a13..546a7ad7f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.VoidTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java index 314fb5487..25b8ab2d1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java @@ -27,7 +27,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java index a9aec0a02..f29ba007e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.RandomNumberTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java index 0a6210da5..f5ac98503 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.RemoveSpriteTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java index a801f6352..395001341 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.SetPropertyTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java index 63bba7ffe..24e972ba6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SetTarget2TreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java index 92ebcfe36..812f61844 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SetVariableTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java index bc37e4c65..2cac7ded4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.StartDragTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java index a4c5ea129..0122db09b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.StringAddTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java index d37162c4b..15a58eb81 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.StringEqTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java index 6445920c6..de349453b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.StringExtractTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java index 9a6796659..79e1d8a82 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.StringLengthTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java index bca184596..4c8eccec1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.StringLtTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java index 62c418529..9055b635c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.SubtractTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java index 31f9e4bea..eb910aefd 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ToIntegerTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java index 2b41dedd1..bbb5c13b2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TraceTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java b/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java index 6c07a2bad..43c4e7c8c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.WaitForFrame2TreeItem; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java b/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java index 2a6ae8db2..53ac3a19d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java +++ b/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.action.swf4; import com.jpexs.asdec.Main; import com.jpexs.asdec.helpers.Helper; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java index 5649cf694..92511c34f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.AddTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java index 277c46f40..89f89588f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.BitAndTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java index 617ccae25..1bad63a90 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.LShiftTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java index 3faccf3c3..208738769 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.BitOrTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java index fdd93887f..4f381a077 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.RShiftTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java index 224ebed77..bf0d633d1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.URShiftTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java index 3c6c25455..2d9cf0dc0 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.BitXorTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java index 9ac4ebdde..45137af72 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.CallFunctionTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java index e88d80065..8fdcbba17 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.CallMethodTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java index 2c3ae31a1..c86c58b2e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java @@ -27,7 +27,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.helpers.Helper; import java.io.ByteArrayInputStream; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java index 6aa715eb9..88045024a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DecrementTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java index 637d4974a..183106f28 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.FlasmLexer; import com.jpexs.asdec.action.parser.Label; import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java index 4fdad14fb..599529ad6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DefineLocalTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java index c1ea484d1..6d5d99d56 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DefineLocalTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java index 9391eed8d..a18f2239f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DeleteTreeItem; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java index 93685a3dd..a3d33bf45 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.DeleteTreeItem; import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java index 88ab8850b..ffe50d78d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.EnumerateTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java index dd484fa08..b4c21e986 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.EqTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java index 0319acedf..76cf7251b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.GetMemberTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java index 5c71e2747..f41597de7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.IncrementTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java index 70ddf430e..fe35dbe3b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.InitArrayTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java index e7c3a56c2..ecae20d52 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.InitObjectTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java index 74ffbc98a..598bdd8b9 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.LtTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java index e5e989943..8b4a85acf 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.ModuloTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java index 03757eb61..abbe0a9ba 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.NewMethodTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java index 0ae00d2b7..bb184c942 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.NewObjectTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java index 3f76ff300..1a5503066 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java @@ -20,7 +20,6 @@ package com.jpexs.asdec.action.swf5; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java index 09e39c902..81d5b9cf7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ReturnTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java index dfd1b483f..148f8c1bd 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.SetMemberTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java index c2ff7e492..6ab8bec99 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java @@ -20,7 +20,6 @@ package com.jpexs.asdec.action.swf5; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java index d8077022c..3239e1858 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java @@ -26,7 +26,6 @@ import com.jpexs.asdec.action.swf4.RegisterNumber; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.StoreRegisterTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java index b2e5b79bc..1208bf9fa 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TargetPathTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java index a6187e024..f799ef67b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ToNumberTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java index 662252000..9499a334a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ToStringTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java index 4bc81d8be..d08900bb1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.TypeOfTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java b/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java index 05cbd7807..20d50c03a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java @@ -24,11 +24,9 @@ import com.jpexs.asdec.action.parser.ASMParser; import com.jpexs.asdec.action.parser.FlasmLexer; import com.jpexs.asdec.action.parser.Label; import com.jpexs.asdec.action.parser.ParseException; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.ArrayList; import java.util.List; public class ActionWith extends Action { diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java index c83417cc8..9c65cfcf1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.EnumerateTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java index 4b5cefa15..71e439e4a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.GtTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java index 53f5af9d9..da892a8f5 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.InstanceOfTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java index 6c997208b..27f2895d8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.StrictEqTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java b/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java index 8473cfb22..00b1ac451 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java +++ b/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; import com.jpexs.asdec.action.treemodel.operations.GtTreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java index 66c2f0f27..81c3b98af 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.CastOpTreeItem; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java index 17e378f8c..f36b1c329 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.action.parser.FlasmLexer; import com.jpexs.asdec.action.parser.Label; import com.jpexs.asdec.action.parser.ParseException; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java index 3997a4776..e0d172558 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ExtendsTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java index 7e0bf1828..a50e0dd1f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ImplementsOpTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java index b9468540b..0a5dbe4d2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ThrowTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java b/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java index 1f12dd3fc..dcc176e9c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.parser.*; import com.jpexs.asdec.action.swf4.RegisterNumber; import com.jpexs.asdec.helpers.Helper; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java index 44270c874..6742c9045 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; - import java.util.List; public class CallFunctionTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java index 2c8a1e3e8..da23e5c9d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java @@ -20,7 +20,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.swf4.ConstantIndex; import com.jpexs.asdec.helpers.Helper; - import java.util.List; public class DirectValueTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java index 05f27a5f2..174467af6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; - import java.util.List; public class FunctionTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java index 74ef6d14f..f02d87288 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; - import java.util.List; public class ImplementsOpTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java index 4383370a7..2225bb057 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; - import java.util.List; public class InitArrayTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java index 43fb75156..06c76aac7 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; - import java.util.List; public class InitObjectTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java index 6ecee75a9..1f2b7f749 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.swf4.Undefined; - import java.util.List; public class NewMethodTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java index 9c85db81e..c0afd1a27 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel; import com.jpexs.asdec.action.Action; - import java.util.List; public class NewObjectTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java index 0eb569dfb..e02d02fa8 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.action.treemodel.clauses; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; - import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java index 318b17466..c100ab7cf 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java index 8efeb85af..cdcfbd6d9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.EachTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java index 15b640a3b..dd39ce3a3 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java @@ -20,9 +20,7 @@ package com.jpexs.asdec.action.treemodel.clauses; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; -import com.jpexs.asdec.action.treemodel.EachTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java index 2d98ccb9b..b9b0cf8a6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java index b93d10d04..69deb0cab 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java index f2b21a59d..9c24d66b9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java index 08d39cea6..b4fad70ec 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java @@ -20,7 +20,6 @@ package com.jpexs.asdec.action.treemodel.clauses; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java index 477c2e84c..f7c6b0794 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.ContinueTreeItem; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java index e39e99012..54792d503 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java +++ b/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java @@ -21,7 +21,6 @@ package com.jpexs.asdec.action.treemodel.clauses; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.action.treemodel.ConstantPool; import com.jpexs.asdec.action.treemodel.TreeItem; - import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/gui/AboutDialog.java b/trunk/src/com/jpexs/asdec/gui/AboutDialog.java index 8324b5f53..3422d6149 100644 --- a/trunk/src/com/jpexs/asdec/gui/AboutDialog.java +++ b/trunk/src/com/jpexs/asdec/gui/AboutDialog.java @@ -18,11 +18,7 @@ package com.jpexs.asdec.gui; import com.jpexs.asdec.Main; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; diff --git a/trunk/src/com/jpexs/asdec/gui/LinkLabel.java b/trunk/src/com/jpexs/asdec/gui/LinkLabel.java index ed351c779..e2dd5c453 100644 --- a/trunk/src/com/jpexs/asdec/gui/LinkLabel.java +++ b/trunk/src/com/jpexs/asdec/gui/LinkLabel.java @@ -19,8 +19,6 @@ package com.jpexs.asdec.gui; import java.awt.Cursor; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import javax.swing.JLabel; diff --git a/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java b/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java index 40642a975..4ac581163 100644 --- a/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java +++ b/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java @@ -18,12 +18,14 @@ package com.jpexs.asdec.gui; import com.jpexs.asdec.Main; - -import javax.swing.*; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.ImageObserver; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.SwingConstants; /** * Dialog showing loading of SWF file diff --git a/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java b/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java index 87fde15f8..f1541df75 100644 --- a/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java +++ b/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java @@ -17,8 +17,10 @@ package com.jpexs.asdec.gui; -import javax.swing.*; -import java.awt.*; +import java.awt.Graphics; +import java.awt.Image; +import javax.swing.ImageIcon; +import javax.swing.JPanel; /** * Panel with loading animation diff --git a/trunk/src/com/jpexs/asdec/gui/ModeFrame.java b/trunk/src/com/jpexs/asdec/gui/ModeFrame.java index 9d22a617e..f807ac555 100644 --- a/trunk/src/com/jpexs/asdec/gui/ModeFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/ModeFrame.java @@ -18,13 +18,16 @@ package com.jpexs.asdec.gui; import com.jpexs.asdec.Main; - -import javax.swing.*; -import java.awt.*; +import java.awt.Container; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; /** * Frame with selection on application startServer diff --git a/trunk/src/com/jpexs/asdec/gui/View.java b/trunk/src/com/jpexs/asdec/gui/View.java index f2347d8fe..078fc3c24 100644 --- a/trunk/src/com/jpexs/asdec/gui/View.java +++ b/trunk/src/com/jpexs/asdec/gui/View.java @@ -17,9 +17,10 @@ package com.jpexs.asdec.gui; -import javax.swing.*; import java.awt.*; import java.util.ArrayList; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; /** * Contains methods for GUI diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java index 44142bcfb..9ab85db53 100644 --- a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java @@ -24,8 +24,6 @@ import com.jpexs.proxy.CatchedListener; import com.jpexs.proxy.ReplacedListener; import com.jpexs.proxy.Replacement; import com.jpexs.proxy.Server; - -import javax.swing.*; import java.awt.*; import java.awt.event.*; import java.io.File; @@ -34,6 +32,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Calendar; +import javax.swing.*; /** * Frame with Proxy diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java b/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java index d1cc76d49..0b13580c4 100644 --- a/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java +++ b/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java @@ -18,12 +18,11 @@ package com.jpexs.asdec.gui.proxy; import com.jpexs.proxy.Replacement; - -import javax.swing.*; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; import java.util.ArrayList; import java.util.List; +import javax.swing.ListModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; /** * List mode for list with SWF urls diff --git a/trunk/src/com/jpexs/asdec/tags/ASMSource.java b/trunk/src/com/jpexs/asdec/tags/ASMSource.java index b77871640..9d12b6cb5 100644 --- a/trunk/src/com/jpexs/asdec/tags/ASMSource.java +++ b/trunk/src/com/jpexs/asdec/tags/ASMSource.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.tags; import com.jpexs.asdec.action.Action; - import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java index 9ec9ed55f..b023f52ee 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.CopyOutputStream; import com.jpexs.asdec.types.BUTTONCONDACTION; import com.jpexs.asdec.types.BUTTONRECORD; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java b/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java index 30a628d80..ff29daed0 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.CopyOutputStream; import com.jpexs.asdec.action.Action; import com.jpexs.asdec.types.BUTTONRECORD; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontName.java b/trunk/src/com/jpexs/asdec/tags/DefineFontName.java index 5ad7d59c7..9f86b20b1 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontName.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineFontName.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class DefineFontName extends Tag { private int fontId; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineScalingGrid.java b/trunk/src/com/jpexs/asdec/tags/DefineScalingGrid.java index 300fae95a..302237384 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineScalingGrid.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineScalingGrid.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; -import java.io.ByteArrayInputStream; -import java.io.IOException; - import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.types.RECT; +import java.io.ByteArrayInputStream; +import java.io.IOException; public class DefineScalingGrid extends Tag { diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java index 301a4171f..bbd4c39f8 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java @@ -21,7 +21,6 @@ import com.jpexs.asdec.Main; import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.CopyOutputStream; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java b/trunk/src/com/jpexs/asdec/tags/DoABCTag.java index 37c4bb44a..97f358afb 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoABCTag.java @@ -22,7 +22,6 @@ import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.SWFOutputStream; import com.jpexs.asdec.abc.ABC; import com.jpexs.asdec.abc.CopyOutputStream; - import java.io.*; /** diff --git a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java b/trunk/src/com/jpexs/asdec/tags/DoActionTag.java index ee805ffa4..9f2529567 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoActionTag.java @@ -19,7 +19,6 @@ package com.jpexs.asdec.tags; import com.jpexs.asdec.SWFInputStream; import com.jpexs.asdec.action.Action; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java b/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java index 7aabe5aa2..73f5d3f0f 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java @@ -17,16 +17,15 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; +import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.asdec.action.Action; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; - public class DoInitActionTag extends Tag implements ASMSource { /** * Identifier of Sprite diff --git a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java index e2ab5c9e7..2b7d8e154 100644 --- a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java +++ b/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.tags; import com.jpexs.asdec.SWFInputStream; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/tags/FileAttributes.java b/trunk/src/com/jpexs/asdec/tags/FileAttributes.java index 210a3bb52..a78139e90 100644 --- a/trunk/src/com/jpexs/asdec/tags/FileAttributes.java +++ b/trunk/src/com/jpexs/asdec/tags/FileAttributes.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class FileAttributes extends Tag { private boolean useDirectBlit; diff --git a/trunk/src/com/jpexs/asdec/tags/FrameLabel.java b/trunk/src/com/jpexs/asdec/tags/FrameLabel.java index 95141d414..45142f26f 100644 --- a/trunk/src/com/jpexs/asdec/tags/FrameLabel.java +++ b/trunk/src/com/jpexs/asdec/tags/FrameLabel.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class FrameLabel extends Tag { private String name; diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java index 77809d1da..c0a773f61 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java @@ -24,7 +24,6 @@ import com.jpexs.asdec.abc.CopyOutputStream; import com.jpexs.asdec.types.CLIPACTIONS; import com.jpexs.asdec.types.CXFORMWITHALPHA; import com.jpexs.asdec.types.MATRIX; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java b/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java index 73714e301..b2e3e1ddc 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java @@ -25,7 +25,6 @@ import com.jpexs.asdec.types.CLIPACTIONS; import com.jpexs.asdec.types.CXFORMWITHALPHA; import com.jpexs.asdec.types.MATRIX; import com.jpexs.asdec.types.filters.FILTER; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ProductInfo.java b/trunk/src/com/jpexs/asdec/tags/ProductInfo.java index 6c33711fe..917a571c9 100644 --- a/trunk/src/com/jpexs/asdec/tags/ProductInfo.java +++ b/trunk/src/com/jpexs/asdec/tags/ProductInfo.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class ProductInfo extends Tag { private long productID; diff --git a/trunk/src/com/jpexs/asdec/tags/RemoveObject2.java b/trunk/src/com/jpexs/asdec/tags/RemoveObject2.java index 0b7879be4..1853ee012 100644 --- a/trunk/src/com/jpexs/asdec/tags/RemoveObject2.java +++ b/trunk/src/com/jpexs/asdec/tags/RemoveObject2.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class RemoveObject2 extends Tag { private int depth; diff --git a/trunk/src/com/jpexs/asdec/tags/ScriptLimits.java b/trunk/src/com/jpexs/asdec/tags/ScriptLimits.java index 62ae5c177..a0bbd5157 100644 --- a/trunk/src/com/jpexs/asdec/tags/ScriptLimits.java +++ b/trunk/src/com/jpexs/asdec/tags/ScriptLimits.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class ScriptLimits extends Tag { private int maxRecursionDepth; diff --git a/trunk/src/com/jpexs/asdec/tags/SymbolClass.java b/trunk/src/com/jpexs/asdec/tags/SymbolClass.java index dec3c9cbc..946aad9d9 100644 --- a/trunk/src/com/jpexs/asdec/tags/SymbolClass.java +++ b/trunk/src/com/jpexs/asdec/tags/SymbolClass.java @@ -17,11 +17,10 @@ package com.jpexs.asdec.tags; +import com.jpexs.asdec.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.jpexs.asdec.SWFInputStream; - public class SymbolClass extends Tag { private int tagIDs[]; private String classNames[]; diff --git a/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java index a51bae233..498f3dabd 100644 --- a/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java +++ b/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.tags.ASMSource; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; - import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java b/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java index 5e737dce6..c9f013df8 100644 --- a/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java +++ b/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java @@ -18,7 +18,6 @@ package com.jpexs.asdec.types; import com.jpexs.asdec.types.filters.FILTER; - import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java index 570fcb85a..493de46b0 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java +++ b/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java @@ -23,7 +23,6 @@ import com.jpexs.asdec.tags.ASMSource; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; - import java.util.List; /**