From 6ca95c8e34d2f76ce98ee838d8bffca20ed54066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sun, 17 Feb 2013 18:13:01 +0100 Subject: [PATCH] Project renamed to Free Flash Decompiler. Code moved to new dir. Version changed to 1.3 --- .../com/jpexs/asdec/gui/graphics/icon16.png | Bin 752 -> 0 bytes .../com/jpexs/asdec/gui/graphics/icon256.png | Bin 30280 -> 0 bytes .../com/jpexs/asdec/gui/graphics/icon32.png | Bin 2082 -> 0 bytes .../com/jpexs/asdec/gui/graphics/icon48.png | Bin 3728 -> 0 bytes .../src/com/jpexs/asdec/gui/graphics/logo.png | Bin 11510 -> 0 bytes .../flash}/Configuration.java | 2 +- .../flash}/EventListener.java | 2 +- .../{asdec => decompiler/flash}/Main.java | 46 +++--- .../flash}/PercentListener.java | 2 +- .../flash}/ReReadableInputStream.java | 2 +- .../{asdec => decompiler/flash}/SWF.java | 24 ++-- .../flash}/SWFInputStream.java | 54 ++++--- .../flash}/SWFOutputStream.java | 26 ++-- .../{asdec => decompiler/flash}/abc/ABC.java | 26 ++-- .../flash}/abc/ABCInputStream.java | 6 +- .../flash}/abc/ABCOutputStream.java | 6 +- .../flash}/abc/CopyOutputStream.java | 2 +- .../flash}/abc/NotSameException.java | 4 +- .../flash}/abc/avm2/AVM2Code.java | 111 +++++---------- .../flash}/abc/avm2/CodeStats.java | 4 +- .../flash}/abc/avm2/ConstantPool.java | 10 +- .../flash}/abc/avm2/ConvertException.java | 2 +- .../flash}/abc/avm2/ConvertOutput.java | 4 +- .../flash}/abc/avm2/InstructionStats.java | 4 +- .../abc/avm2/InvalidInstructionArguments.java | 2 +- .../flash}/abc/avm2/LocalDataArea.java | 2 +- .../abc/avm2/UnknownInstructionCode.java | 2 +- .../flash}/abc/avm2/UnknownJumpException.java | 4 +- .../flash}/abc/avm2/graph/AVM2Graph.java | 119 ++++++++-------- .../flash}/abc/avm2/graph/ForException.java | 6 +- .../avm2/instructions/AVM2Instruction.java | 10 +- .../abc/avm2/instructions/IfTypeIns.java | 4 +- .../instructions/InstructionDefinition.java | 20 +-- .../abc/avm2/instructions/SetTypeIns.java | 8 +- .../abc/avm2/instructions/TagInstruction.java | 2 +- .../avm2/instructions/arithmetic/AddIIns.java | 16 +-- .../avm2/instructions/arithmetic/AddIns.java | 20 +-- .../arithmetic/DecrementIIns.java | 20 +-- .../instructions/arithmetic/DecrementIns.java | 20 +-- .../instructions/arithmetic/DivideIns.java | 20 +-- .../arithmetic/IncrementIIns.java | 18 +-- .../instructions/arithmetic/IncrementIns.java | 18 +-- .../instructions/arithmetic/ModuloIns.java | 20 +-- .../instructions/arithmetic/MultiplyIIns.java | 18 +-- .../instructions/arithmetic/MultiplyIns.java | 20 +-- .../instructions/arithmetic/NegateIIns.java | 18 +-- .../instructions/arithmetic/NegateIns.java | 18 +-- .../avm2/instructions/arithmetic/NotIns.java | 18 +-- .../instructions/arithmetic/SubtractIIns.java | 18 +-- .../instructions/arithmetic/SubtractIns.java | 18 +-- .../avm2/instructions/bitwise/BitAndIns.java | 20 +-- .../avm2/instructions/bitwise/BitNotIns.java | 20 +-- .../avm2/instructions/bitwise/BitOrIns.java | 20 +-- .../avm2/instructions/bitwise/BitXorIns.java | 20 +-- .../avm2/instructions/bitwise/LShiftIns.java | 18 +-- .../avm2/instructions/bitwise/RShiftIns.java | 18 +-- .../avm2/instructions/bitwise/URShiftIns.java | 18 +-- .../instructions/comparsion/EqualsIns.java | 20 +-- .../comparsion/GreaterEqualsIns.java | 18 +-- .../comparsion/GreaterThanIns.java | 18 +-- .../comparsion/LessEqualsIns.java | 18 +-- .../instructions/comparsion/LessThanIns.java | 18 +-- .../comparsion/StrictEqualsIns.java | 18 +-- .../construction/ConstructIns.java | 40 +++--- .../construction/ConstructPropIns.java | 26 ++-- .../construction/ConstructSuperIns.java | 22 +-- .../construction/NewActivationIns.java | 18 +-- .../construction/NewArrayIns.java | 20 +-- .../construction/NewCatchIns.java | 20 +-- .../construction/NewClassIns.java | 20 +-- .../construction/NewFunctionIns.java | 24 ++-- .../construction/NewObjectIns.java | 22 +-- .../avm2/instructions/debug/DebugFileIns.java | 6 +- .../abc/avm2/instructions/debug/DebugIns.java | 6 +- .../avm2/instructions/debug/DebugLineIns.java | 6 +- .../avm2/instructions/executing/CallIns.java | 22 +-- .../instructions/executing/CallMethodIns.java | 22 +-- .../executing/CallPropLexIns.java | 18 +-- .../executing/CallPropVoidIns.java | 24 ++-- .../executing/CallPropertyIns.java | 24 ++-- .../instructions/executing/CallStaticIns.java | 22 +-- .../instructions/executing/CallSuperIns.java | 24 ++-- .../executing/CallSuperVoidIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfEqIns.java | 24 ++-- .../avm2/instructions/jumps/IfFalseIns.java | 22 +-- .../abc/avm2/instructions/jumps/IfGeIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfGtIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfLeIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfLtIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfNGeIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfNGtIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfNLeIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfNLtIns.java | 24 ++-- .../abc/avm2/instructions/jumps/IfNeIns.java | 24 ++-- .../instructions/jumps/IfStrictEqIns.java | 24 ++-- .../instructions/jumps/IfStrictNeIns.java | 24 ++-- .../avm2/instructions/jumps/IfTrueIns.java | 22 +-- .../abc/avm2/instructions/jumps/JumpIns.java | 20 +-- .../instructions/jumps/LookupSwitchIns.java | 18 +-- .../instructions/localregs/DecLocalIIns.java | 20 +-- .../instructions/localregs/DecLocalIns.java | 20 +-- .../instructions/localregs/GetLocal0Ins.java | 22 +-- .../instructions/localregs/GetLocal1Ins.java | 20 +-- .../instructions/localregs/GetLocal2Ins.java | 20 +-- .../instructions/localregs/GetLocal3Ins.java | 20 +-- .../instructions/localregs/GetLocalIns.java | 22 +-- .../localregs/GetLocalTypeIns.java | 4 +- .../instructions/localregs/IncLocalIIns.java | 18 +-- .../instructions/localregs/IncLocalIns.java | 18 +-- .../avm2/instructions/localregs/KillIns.java | 16 +-- .../instructions/localregs/SetLocal0Ins.java | 4 +- .../instructions/localregs/SetLocal1Ins.java | 4 +- .../instructions/localregs/SetLocal2Ins.java | 4 +- .../instructions/localregs/SetLocal3Ins.java | 4 +- .../instructions/localregs/SetLocalIns.java | 6 +- .../localregs/SetLocalTypeIns.java | 40 +++--- .../instructions/other/DeletePropertyIns.java | 26 ++-- .../instructions/other/FindPropertyIns.java | 24 ++-- .../other/FindPropertyStrictIns.java | 24 ++-- .../instructions/other/GetDescendantsIns.java | 24 ++-- .../instructions/other/GetGlobalScopeIns.java | 20 +-- .../instructions/other/GetGlobalSlotIns.java | 26 ++-- .../avm2/instructions/other/GetLexIns.java | 22 +-- .../instructions/other/GetPropertyIns.java | 22 +-- .../instructions/other/GetScopeObjectIns.java | 18 +-- .../avm2/instructions/other/GetSlotIns.java | 30 ++-- .../avm2/instructions/other/GetSuperIns.java | 22 +-- .../avm2/instructions/other/HasNext2Ins.java | 20 +-- .../avm2/instructions/other/HasNextIns.java | 18 +-- .../abc/avm2/instructions/other/InIns.java | 18 +-- .../instructions/other/InitPropertyIns.java | 22 +-- .../abc/avm2/instructions/other/LabelIns.java | 4 +- .../avm2/instructions/other/NextNameIns.java | 18 +-- .../avm2/instructions/other/NextValueIns.java | 18 +-- .../abc/avm2/instructions/other/NopIns.java | 4 +- .../instructions/other/ReturnValueIns.java | 18 +-- .../instructions/other/ReturnVoidIns.java | 16 +-- .../instructions/other/SetGlobalSlotIns.java | 24 ++-- .../instructions/other/SetPropertyIns.java | 42 +++--- .../avm2/instructions/other/SetSlotIns.java | 48 +++---- .../avm2/instructions/other/SetSuperIns.java | 26 ++-- .../abc/avm2/instructions/other/ThrowIns.java | 18 +-- .../abc/avm2/instructions/stack/DupIns.java | 18 +-- .../abc/avm2/instructions/stack/PopIns.java | 20 +-- .../avm2/instructions/stack/PopScopeIns.java | 22 +-- .../avm2/instructions/stack/PushByteIns.java | 22 +-- .../instructions/stack/PushDoubleIns.java | 22 +-- .../avm2/instructions/stack/PushFalseIns.java | 20 +-- .../avm2/instructions/stack/PushIntIns.java | 22 +-- .../instructions/stack/PushNamespaceIns.java | 20 +-- .../avm2/instructions/stack/PushNanIns.java | 18 +-- .../avm2/instructions/stack/PushNullIns.java | 18 +-- .../avm2/instructions/stack/PushScopeIns.java | 18 +-- .../avm2/instructions/stack/PushShortIns.java | 22 +-- .../instructions/stack/PushStringIns.java | 22 +-- .../avm2/instructions/stack/PushTrueIns.java | 20 +-- .../avm2/instructions/stack/PushUIntIns.java | 22 +-- .../instructions/stack/PushUndefinedIns.java | 18 +-- .../avm2/instructions/stack/PushWithIns.java | 20 +-- .../abc/avm2/instructions/stack/SwapIns.java | 18 +-- .../avm2/instructions/types/ApplyTypeIns.java | 22 +-- .../avm2/instructions/types/AsTypeIns.java | 24 ++-- .../instructions/types/AsTypeLateIns.java | 20 +-- .../avm2/instructions/types/CoerceAIns.java | 20 +-- .../avm2/instructions/types/CoerceIns.java | 22 +-- .../types/CoerceOrConvertTypeIns.java | 6 +- .../avm2/instructions/types/CoerceSIns.java | 20 +-- .../avm2/instructions/types/ConvertBIns.java | 20 +-- .../avm2/instructions/types/ConvertDIns.java | 20 +-- .../avm2/instructions/types/ConvertIIns.java | 20 +-- .../avm2/instructions/types/ConvertOIns.java | 20 +-- .../avm2/instructions/types/ConvertSIns.java | 20 +-- .../avm2/instructions/types/ConvertUIns.java | 20 +-- .../instructions/types/InstanceOfIns.java | 18 +-- .../avm2/instructions/types/IsTypeIns.java | 22 +-- .../instructions/types/IsTypeLateIns.java | 18 +-- .../avm2/instructions/types/TypeOfIns.java | 18 +-- .../avm2/instructions/xml/CheckFilterIns.java | 20 +-- .../abc/avm2/instructions/xml/DXNSIns.java | 24 ++-- .../avm2/instructions/xml/DXNSLateIns.java | 20 +-- .../avm2/instructions/xml/EscXAttrIns.java | 20 +-- .../avm2/instructions/xml/EscXElemIns.java | 20 +-- .../flash}/abc/avm2/parser/ASM3Parser.java | 14 +- .../flash}/abc/avm2/parser/Flasm3Lexer.java | 4 +- .../abc/avm2/parser/MissingSymbolHandler.java | 2 +- .../abc/avm2}/parser/ParseException.java | 2 +- .../flash}/abc/avm2/parser/ParsedSymbol.java | 2 +- .../flash}/abc/avm2/parser/flasm3.flex | 2 +- .../abc/avm2/treemodel/ApplyTypeTreeItem.java | 6 +- .../abc/avm2/treemodel/BooleanTreeItem.java | 6 +- .../abc/avm2/treemodel/BreakTreeItem.java | 6 +- .../avm2/treemodel/CallMethodTreeItem.java | 6 +- .../avm2/treemodel/CallPropertyTreeItem.java | 6 +- .../avm2/treemodel/CallStaticTreeItem.java | 6 +- .../abc/avm2/treemodel/CallSuperTreeItem.java | 8 +- .../abc/avm2/treemodel/CallTreeItem.java | 6 +- .../abc/avm2/treemodel/ClassTreeItem.java | 6 +- .../abc/avm2/treemodel/CoerceTreeItem.java | 6 +- .../abc/avm2/treemodel/CommentTreeItem.java | 6 +- .../avm2/treemodel/ConstructPropTreeItem.java | 6 +- .../treemodel/ConstructSuperTreeItem.java | 8 +- .../abc/avm2/treemodel/ConstructTreeItem.java | 6 +- .../abc/avm2/treemodel/ContinueTreeItem.java | 6 +- .../abc/avm2/treemodel/ConvertTreeItem.java | 6 +- .../abc/avm2/treemodel/DecLocalTreeItem.java | 6 +- .../abc/avm2/treemodel/DecrementTreeItem.java | 6 +- .../avm2/treemodel/DefaultXMLNamespace.java | 6 +- .../avm2/treemodel/EscapeXAttrTreeItem.java | 6 +- .../avm2/treemodel/EscapeXElemTreeItem.java | 6 +- .../avm2/treemodel/FilteredCheckTreeItem.java | 6 +- .../avm2/treemodel/FindPropertyTreeItem.java | 6 +- .../avm2/treemodel/FloatValueTreeItem.java | 6 +- .../avm2/treemodel/FullMultinameTreeItem.java | 8 +- .../treemodel/GetDescendantsTreeItem.java | 6 +- .../abc/avm2/treemodel/GetLexTreeItem.java | 8 +- .../avm2/treemodel/GetPropertyTreeItem.java | 6 +- .../abc/avm2/treemodel/GetSlotTreeItem.java | 8 +- .../abc/avm2/treemodel/GetSuperTreeItem.java | 8 +- .../abc/avm2/treemodel/HasNextTreeItem.java | 6 +- .../flash}/abc/avm2/treemodel/InTreeItem.java | 6 +- .../abc/avm2/treemodel/IncLocalTreeItem.java | 6 +- .../abc/avm2/treemodel/IncrementTreeItem.java | 6 +- .../avm2/treemodel/InitPropertyTreeItem.java | 8 +- .../avm2/treemodel/IntegerValueTreeItem.java | 6 +- .../abc/avm2/treemodel/LocalRegTreeItem.java | 8 +- .../abc/avm2/treemodel/NameSpaceTreeItem.java | 6 +- .../abc/avm2/treemodel/NameValuePair.java | 4 +- .../abc/avm2/treemodel/NanTreeItem.java | 6 +- .../avm2/treemodel/NewActivationTreeItem.java | 6 +- .../abc/avm2/treemodel/NewArrayTreeItem.java | 6 +- .../avm2/treemodel/NewFunctionTreeItem.java | 6 +- .../abc/avm2/treemodel/NewObjectTreeItem.java | 6 +- .../abc/avm2/treemodel/NextNameTreeItem.java | 6 +- .../abc/avm2/treemodel/NextValueTreeItem.java | 6 +- .../abc/avm2/treemodel/NullTreeItem.java | 6 +- .../avm2/treemodel/NumberValueTreeItem.java | 4 +- .../avm2/treemodel/PostDecrementTreeItem.java | 8 +- .../avm2/treemodel/PostIncrementTreeItem.java | 8 +- .../avm2/treemodel/ReturnValueTreeItem.java | 6 +- .../avm2/treemodel/ReturnVoidTreeItem.java | 6 +- .../avm2/treemodel/SetGlobalSlotTreeItem.java | 6 +- .../abc/avm2/treemodel/SetLocalTreeItem.java | 8 +- .../avm2/treemodel/SetPropertyTreeItem.java | 8 +- .../abc/avm2/treemodel/SetSlotTreeItem.java | 10 +- .../abc/avm2/treemodel/SetSuperTreeItem.java | 8 +- .../abc/avm2/treemodel/SetTypeTreeItem.java | 2 +- .../abc/avm2/treemodel/StringTreeItem.java | 8 +- .../abc/avm2/treemodel/ThisTreeItem.java | 6 +- .../abc/avm2/treemodel/ThrowTreeItem.java | 6 +- .../flash}/abc/avm2/treemodel/TreeItem.java | 8 +- .../abc/avm2/treemodel/UndefinedTreeItem.java | 6 +- .../abc/avm2/treemodel/UnparsedTreeItem.java | 6 +- .../abc/avm2/treemodel/WithEndTreeItem.java | 6 +- .../avm2/treemodel/WithObjectTreeItem.java | 6 +- .../abc/avm2/treemodel/WithTreeItem.java | 6 +- .../abc/avm2/treemodel/XMLTreeItem.java | 6 +- .../treemodel/clauses/AssignmentTreeItem.java | 2 +- .../abc/avm2/treemodel/clauses/Block.java | 4 +- .../clauses/DeclarationTreeItem.java | 14 +- .../treemodel/clauses/DoWhileTreeItem.java | 10 +- .../treemodel/clauses/ExceptionTreeItem.java | 8 +- .../treemodel/clauses/FilterTreeItem.java | 8 +- .../treemodel/clauses/ForEachInTreeItem.java | 8 +- .../avm2/treemodel/clauses/ForInTreeItem.java | 8 +- .../avm2/treemodel/clauses/ForTreeItem.java | 10 +- .../avm2/treemodel/clauses/IfTreeItem.java | 10 +- .../avm2/treemodel/clauses/LoopTreeItem.java | 6 +- .../treemodel/clauses/SwitchTreeItem.java | 14 +- .../treemodel/clauses/TernarOpTreeItem.java | 8 +- .../avm2/treemodel/clauses/TryTreeItem.java | 10 +- .../avm2/treemodel/clauses/WhileTreeItem.java | 10 +- .../treemodel/operations/AddTreeItem.java | 8 +- .../treemodel/operations/AndTreeItem.java | 6 +- .../treemodel/operations/AsTypeTreeItem.java | 6 +- .../operations/BinaryOpTreeItem.java | 8 +- .../treemodel/operations/BitAndTreeItem.java | 6 +- .../treemodel/operations/BitNotTreeItem.java | 6 +- .../treemodel/operations/BitOrTreeItem.java | 6 +- .../treemodel/operations/BitXorTreeItem.java | 6 +- .../operations/DeletePropertyTreeItem.java | 10 +- .../treemodel/operations/DivideTreeItem.java | 6 +- .../avm2/treemodel/operations/EqTreeItem.java | 6 +- .../avm2/treemodel/operations/GeTreeItem.java | 6 +- .../avm2/treemodel/operations/GtTreeItem.java | 6 +- .../avm2/treemodel/operations/InTreeItem.java | 6 +- .../operations/InstanceOfTreeItem.java | 6 +- .../treemodel/operations/IsTypeTreeItem.java | 6 +- .../treemodel/operations/LShiftTreeItem.java | 6 +- .../avm2/treemodel/operations/LeTreeItem.java | 6 +- .../avm2/treemodel/operations/LogicalOp.java | 4 +- .../avm2/treemodel/operations/LtTreeItem.java | 6 +- .../treemodel/operations/ModuloTreeItem.java | 6 +- .../operations/MultiplyTreeItem.java | 6 +- .../treemodel/operations/NegTreeItem.java | 6 +- .../treemodel/operations/NeqTreeItem.java | 6 +- .../treemodel/operations/NotTreeItem.java | 6 +- .../avm2/treemodel/operations/OrTreeItem.java | 6 +- .../operations/PreDecrementTreeItem.java | 8 +- .../operations/PreIncrementTreeItem.java | 6 +- .../treemodel/operations/RShiftTreeItem.java | 6 +- .../operations/StrictEqTreeItem.java | 6 +- .../operations/StrictNeqTreeItem.java | 6 +- .../operations/SubtractTreeItem.java | 6 +- .../treemodel/operations/TypeOfTreeItem.java | 6 +- .../treemodel/operations/URShiftTreeItem.java | 6 +- .../treemodel/operations/UnaryOpTreeItem.java | 8 +- .../flash}/abc/gui/ABCComboBoxModel.java | 4 +- .../flash}/abc/gui/ABCPanel.java | 14 +- .../flash}/abc/gui/ASMSourceEditorPane.java | 16 +-- .../flash}/abc/gui/ClassesListTree.java | 12 +- .../flash}/abc/gui/ClassesListTreeModel.java | 6 +- .../flash}/abc/gui/ConstantsListModel.java | 6 +- .../flash}/abc/gui/DecompiledEditorPane.java | 14 +- .../flash}/abc/gui/DeobfuscationDialog.java | 4 +- .../flash}/abc/gui/DetailPanel.java | 2 +- .../abc/gui/DialogMissingSymbolHandler.java | 4 +- .../flash}/abc/gui/GraphFrame.java | 8 +- .../flash}/abc/gui/GraphTreeFrame.java | 6 +- .../flash}/abc/gui/IconListRenderer.java | 8 +- .../flash}/abc/gui/LineMarkedEditorPane.java | 2 +- .../flash}/abc/gui/MethodBodyParamsPanel.java | 4 +- .../flash}/abc/gui/MethodCodePanel.java | 8 +- .../flash}/abc/gui/MethodInfoPanel.java | 14 +- .../abc/gui/MethodTraitDetailPanel.java | 2 +- .../abc/gui/SlotConstTraitDetailPanel.java | 14 +- .../flash}/abc/gui/TraitDetail.java | 2 +- .../flash}/abc/gui/TraitsList.java | 6 +- .../flash}/abc/gui/TraitsListModel.java | 6 +- .../flash}/abc/gui/Tree.java | 2 +- .../flash}/abc/gui/TreeElement.java | 2 +- .../flash}/abc/gui/TreeLeafScript.java | 4 +- .../flash}/abc/gui/TreeVisitor.java | 2 +- .../flash}/abc/gui/UsageFrame.java | 16 +-- .../flash}/abc/gui/UsageListModel.java | 8 +- .../flash}/abc/gui/graphics/constant.png | Bin .../flash}/abc/gui/graphics/function.png | Bin .../flash}/abc/gui/graphics/variable.png | Bin .../gui/tablemodels/DecimalTableModel.java | 4 +- .../abc/gui/tablemodels/DoubleTableModel.java | 4 +- .../abc/gui/tablemodels/IntTableModel.java | 4 +- .../gui/tablemodels/MultinameTableModel.java | 4 +- .../tablemodels/NamespaceSetTableModel.java | 4 +- .../gui/tablemodels/NamespaceTableModel.java | 4 +- .../abc/gui/tablemodels/StringTableModel.java | 4 +- .../abc/gui/tablemodels/UIntTableModel.java | 4 +- .../methodinfo_parser/MethodInfoLexer.java | 4 +- .../methodinfo_parser/MethodInfoParser.java | 12 +- .../abc/methodinfo_parser/ParseException.java | 2 +- .../abc/methodinfo_parser/ParsedSymbol.java | 2 +- .../abc/methodinfo_parser/methodinfo.flex | 2 +- .../flash}/abc/types/ABCException.java | 10 +- .../flash}/abc/types/ClassInfo.java | 6 +- .../flash}/abc/types/Decimal.java | 2 +- .../flash}/abc/types/InstanceInfo.java | 10 +- .../flash}/abc/types/MetadataInfo.java | 6 +- .../flash}/abc/types/MethodBody.java | 20 +-- .../flash}/abc/types/MethodInfo.java | 10 +- .../flash}/abc/types/Multiname.java | 4 +- .../flash}/abc/types/Namespace.java | 6 +- .../flash}/abc/types/NamespaceSet.java | 4 +- .../flash}/abc/types/ScriptInfo.java | 12 +- .../flash}/abc/types/ValueKind.java | 6 +- .../flash}/abc/types/traits/Trait.java | 12 +- .../flash}/abc/types/traits/TraitClass.java | 42 +++--- .../abc/types/traits/TraitFunction.java | 12 +- .../types/traits/TraitMethodGetterSetter.java | 12 +- .../abc/types/traits/TraitSlotConst.java | 20 +-- .../flash}/abc/types/traits/Traits.java | 8 +- .../abc/usages/ClassNameMultinameUsage.java | 6 +- .../abc/usages/ConstVarMultinameUsage.java | 12 +- .../usages/ConstVarNameMultinameUsage.java | 8 +- .../usages/ConstVarTypeMultinameUsage.java | 8 +- .../abc/usages/ExtendsMultinameUsage.java | 6 +- .../abc/usages/ImplementsMultinameUsage.java | 6 +- .../abc/usages/InsideClassMultinameUsage.java | 6 +- .../abc/usages/MethodBodyMultinameUsage.java | 8 +- .../abc/usages/MethodMultinameUsage.java | 10 +- .../abc/usages/MethodNameMultinameUsage.java | 8 +- .../usages/MethodParamsMultinameUsage.java | 8 +- .../MethodReturnTypeMultinameUsage.java | 8 +- .../flash}/abc/usages/MultinameUsage.java | 6 +- .../abc/usages/TraitMultinameUsage.java | 4 +- .../abc/usages/TypeNameMultinameUsage.java | 6 +- .../flash}/action/Action.java | 32 ++--- .../flash}/action/ActionGraph.java | 52 +++---- .../flash}/action/IgnoredPair.java | 2 +- .../flash}/action/TagNode.java | 32 ++--- .../flash}/action/UnknownJumpException.java | 4 +- .../action/flashlite/ActionFSCommand2.java | 8 +- .../action/flashlite/ActionStrictMode.java | 16 +-- .../flash}/action/gui/ActionPanel.java | 34 ++--- .../flash}/action/gui/TagTreeModel.java | 6 +- .../flash}/action/parser/ASMParser.java | 20 +-- .../flash}/action/parser/FlasmLexer.java | 12 +- .../flash}/action/parser/Label.java | 2 +- .../flash/action}/parser/ParseException.java | 2 +- .../flash}/action/parser/ParsedSymbol.java | 2 +- .../flash}/action/parser/flasm.flex | 10 +- .../flash}/action/special/ActionNop.java | 6 +- .../flash}/action/swf3/ActionGetURL.java | 18 +-- .../flash}/action/swf3/ActionGoToLabel.java | 18 +-- .../flash}/action/swf3/ActionGotoFrame.java | 16 +-- .../flash}/action/swf3/ActionNextFrame.java | 8 +- .../flash}/action/swf3/ActionPlay.java | 8 +- .../flash}/action/swf3/ActionPrevFrame.java | 8 +- .../flash}/action/swf3/ActionSetTarget.java | 18 +-- .../flash}/action/swf3/ActionStop.java | 8 +- .../flash}/action/swf3/ActionStopSounds.java | 8 +- .../action/swf3/ActionToggleQuality.java | 8 +- .../action/swf3/ActionWaitForFrame.java | 16 +-- .../flash}/action/swf4/ActionAdd.java | 8 +- .../flash}/action/swf4/ActionAnd.java | 8 +- .../flash}/action/swf4/ActionAsciiToChar.java | 8 +- .../flash}/action/swf4/ActionCall.java | 8 +- .../flash}/action/swf4/ActionCharToAscii.java | 8 +- .../flash}/action/swf4/ActionCloneSprite.java | 8 +- .../flash}/action/swf4/ActionDivide.java | 8 +- .../flash}/action/swf4/ActionEndDrag.java | 8 +- .../flash}/action/swf4/ActionEquals.java | 8 +- .../flash}/action/swf4/ActionGetProperty.java | 10 +- .../flash}/action/swf4/ActionGetTime.java | 8 +- .../flash}/action/swf4/ActionGetURL2.java | 16 +-- .../flash}/action/swf4/ActionGetVariable.java | 8 +- .../flash}/action/swf4/ActionGotoFrame2.java | 16 +-- .../flash}/action/swf4/ActionIf.java | 14 +- .../flash}/action/swf4/ActionJump.java | 14 +- .../flash}/action/swf4/ActionLess.java | 8 +- .../action/swf4/ActionMBAsciiToChar.java | 8 +- .../action/swf4/ActionMBCharToAscii.java | 8 +- .../action/swf4/ActionMBStringExtract.java | 8 +- .../action/swf4/ActionMBStringLength.java | 8 +- .../flash}/action/swf4/ActionMultiply.java | 8 +- .../flash}/action/swf4/ActionNot.java | 8 +- .../flash}/action/swf4/ActionOr.java | 8 +- .../flash}/action/swf4/ActionPop.java | 10 +- .../flash}/action/swf4/ActionPush.java | 20 +-- .../action/swf4/ActionRandomNumber.java | 8 +- .../action/swf4/ActionRemoveSprite.java | 8 +- .../flash}/action/swf4/ActionSetProperty.java | 10 +- .../flash}/action/swf4/ActionSetTarget2.java | 8 +- .../flash}/action/swf4/ActionSetVariable.java | 8 +- .../flash}/action/swf4/ActionStartDrag.java | 10 +- .../flash}/action/swf4/ActionStringAdd.java | 8 +- .../action/swf4/ActionStringEquals.java | 8 +- .../action/swf4/ActionStringExtract.java | 8 +- .../action/swf4/ActionStringLength.java | 8 +- .../flash}/action/swf4/ActionStringLess.java | 8 +- .../flash}/action/swf4/ActionSubtract.java | 8 +- .../flash}/action/swf4/ActionToInteger.java | 8 +- .../flash}/action/swf4/ActionTrace.java | 8 +- .../action/swf4/ActionWaitForFrame2.java | 16 +-- .../flash}/action/swf4/ConstantIndex.java | 6 +- .../flash}/action/swf4/Null.java | 2 +- .../flash}/action/swf4/RegisterNumber.java | 2 +- .../flash}/action/swf4/Undefined.java | 2 +- .../flash}/action/swf5/ActionAdd2.java | 8 +- .../flash}/action/swf5/ActionBitAnd.java | 8 +- .../flash}/action/swf5/ActionBitLShift.java | 8 +- .../flash}/action/swf5/ActionBitOr.java | 8 +- .../flash}/action/swf5/ActionBitRShift.java | 8 +- .../flash}/action/swf5/ActionBitURShift.java | 8 +- .../flash}/action/swf5/ActionBitXor.java | 8 +- .../action/swf5/ActionCallFunction.java | 8 +- .../flash}/action/swf5/ActionCallMethod.java | 8 +- .../action/swf5/ActionConstantPool.java | 18 +-- .../flash}/action/swf5/ActionDecrement.java | 8 +- .../action/swf5/ActionDefineFunction.java | 26 ++-- .../flash}/action/swf5/ActionDefineLocal.java | 8 +- .../action/swf5/ActionDefineLocal2.java | 8 +- .../flash}/action/swf5/ActionDelete.java | 10 +- .../flash}/action/swf5/ActionDelete2.java | 10 +- .../flash}/action/swf5/ActionEnumerate.java | 8 +- .../flash}/action/swf5/ActionEquals2.java | 8 +- .../flash}/action/swf5/ActionGetMember.java | 8 +- .../flash}/action/swf5/ActionIncrement.java | 8 +- .../flash}/action/swf5/ActionInitArray.java | 8 +- .../flash}/action/swf5/ActionInitObject.java | 8 +- .../flash}/action/swf5/ActionLess2.java | 8 +- .../flash}/action/swf5/ActionModulo.java | 8 +- .../flash}/action/swf5/ActionNewMethod.java | 8 +- .../flash}/action/swf5/ActionNewObject.java | 8 +- .../action/swf5/ActionPushDuplicate.java | 8 +- .../flash}/action/swf5/ActionReturn.java | 8 +- .../flash}/action/swf5/ActionSetMember.java | 8 +- .../flash}/action/swf5/ActionStackSwap.java | 6 +- .../action/swf5/ActionStoreRegister.java | 18 +-- .../flash}/action/swf5/ActionTargetPath.java | 8 +- .../flash}/action/swf5/ActionToNumber.java | 8 +- .../flash}/action/swf5/ActionToString.java | 8 +- .../flash}/action/swf5/ActionTypeOf.java | 8 +- .../flash}/action/swf5/ActionWith.java | 16 +-- .../flash}/action/swf6/ActionEnumerate2.java | 8 +- .../flash}/action/swf6/ActionGreater.java | 8 +- .../flash}/action/swf6/ActionInstanceOf.java | 8 +- .../action/swf6/ActionStrictEquals.java | 8 +- .../action/swf6/ActionStringGreater.java | 8 +- .../flash}/action/swf7/ActionCastOp.java | 8 +- .../action/swf7/ActionDefineFunction2.java | 26 ++-- .../flash}/action/swf7/ActionExtends.java | 8 +- .../action/swf7/ActionImplementsOp.java | 8 +- .../flash}/action/swf7/ActionThrow.java | 8 +- .../flash}/action/swf7/ActionTry.java | 14 +- .../action/treemodel/AsciiToCharTreeItem.java | 8 +- .../action/treemodel/BreakTreeItem.java | 4 +- .../treemodel/CallFunctionTreeItem.java | 8 +- .../action/treemodel/CallMethodTreeItem.java | 10 +- .../flash}/action/treemodel/CallTreeItem.java | 8 +- .../action/treemodel/CastOpTreeItem.java | 8 +- .../action/treemodel/CharToAsciiTreeItem.java | 8 +- .../action/treemodel/CloneSpriteTreeItem.java | 8 +- .../flash}/action/treemodel/ConstantPool.java | 2 +- .../action/treemodel/ContinueTreeItem.java | 4 +- .../action/treemodel/DecrementTreeItem.java | 8 +- .../action/treemodel/DefineLocalTreeItem.java | 8 +- .../action/treemodel/DeleteTreeItem.java | 8 +- .../action/treemodel/DirectValueTreeItem.java | 8 +- .../flash}/action/treemodel/EachTreeItem.java | 8 +- .../action/treemodel/EnumerateTreeItem.java | 8 +- .../action/treemodel/ExtendsTreeItem.java | 8 +- .../action/treemodel/FSCommand2TreeItem.java | 8 +- .../action/treemodel/FunctionTreeItem.java | 8 +- .../action/treemodel/GetMemberTreeItem.java | 8 +- .../action/treemodel/GetPropertyTreeItem.java | 8 +- .../action/treemodel/GetURL2TreeItem.java | 8 +- .../action/treemodel/GetURLTreeItem.java | 6 +- .../action/treemodel/GetVariableTreeItem.java | 8 +- .../action/treemodel/GotoFrame2TreeItem.java | 8 +- .../action/treemodel/GotoFrameTreeItem.java | 4 +- .../action/treemodel/GotoLabelTreeItem.java | 6 +- .../treemodel/ImplementsOpTreeItem.java | 8 +- .../action/treemodel/IncrementTreeItem.java | 8 +- .../action/treemodel/InitArrayTreeItem.java | 8 +- .../action/treemodel/InitObjectTreeItem.java | 8 +- .../treemodel/MBAsciiToCharTreeItem.java | 8 +- .../treemodel/MBCharToAsciiTreeItem.java | 8 +- .../treemodel/MBStringExtractTreeItem.java | 8 +- .../treemodel/MBStringLengthTreeItem.java | 8 +- .../action/treemodel/NewMethodTreeItem.java | 10 +- .../action/treemodel/NewObjectTreeItem.java | 8 +- .../treemodel/RandomNumberTreeItem.java | 8 +- .../treemodel/RemoveSpriteTreeItem.java | 8 +- .../action/treemodel/ReturnTreeItem.java | 8 +- .../action/treemodel/SetMemberTreeItem.java | 8 +- .../action/treemodel/SetPropertyTreeItem.java | 8 +- .../action/treemodel/SetTarget2TreeItem.java | 8 +- .../action/treemodel/SetTargetTreeItem.java | 6 +- .../action/treemodel/SetTypeTreeItem.java | 2 +- .../action/treemodel/SetVariableTreeItem.java | 8 +- .../treemodel/SimpleActionTreeItem.java | 4 +- .../action/treemodel/StartDragTreeItem.java | 8 +- .../treemodel/StoreRegisterTreeItem.java | 10 +- .../action/treemodel/StrictModeTreeItem.java | 4 +- .../treemodel/StringExtractTreeItem.java | 8 +- .../action/treemodel/TargetPathTreeItem.java | 8 +- .../action/treemodel/ThrowTreeItem.java | 8 +- .../action/treemodel/ToIntegerTreeItem.java | 8 +- .../action/treemodel/ToNumberTreeItem.java | 8 +- .../action/treemodel/ToStringTreeItem.java | 8 +- .../action/treemodel/TraceTreeItem.java | 8 +- .../flash}/action/treemodel/TreeItem.java | 12 +- .../action/treemodel/TypeOfTreeItem.java | 8 +- .../action/treemodel/UnsupportedTreeItem.java | 4 +- .../flash}/action/treemodel/VoidTreeItem.java | 4 +- .../treemodel/WaitForFrame2TreeItem.java | 8 +- .../treemodel/WaitForFrameTreeItem.java | 4 +- .../action/treemodel/clauses/Block.java | 4 +- .../treemodel/clauses/ClassTreeItem.java | 12 +- .../treemodel/clauses/DoWhileTreeItem.java | 10 +- .../treemodel/clauses/ForEachTreeItem.java | 12 +- .../treemodel/clauses/ForInTreeItem.java | 10 +- .../action/treemodel/clauses/ForTreeItem.java | 10 +- .../action/treemodel/clauses/IfTreeItem.java | 10 +- .../treemodel/clauses/InterfaceTreeItem.java | 8 +- .../treemodel/clauses/LoopTreeItem.java | 6 +- .../treemodel/clauses/SwitchTreeItem.java | 10 +- .../treemodel/clauses/TernarOpTreeItem.java | 8 +- .../action/treemodel/clauses/TryTreeItem.java | 8 +- .../treemodel/clauses/WhileTreeItem.java | 10 +- .../treemodel/clauses/WithTreeItem.java | 8 +- .../treemodel/operations/AddTreeItem.java | 6 +- .../treemodel/operations/AndTreeItem.java | 6 +- .../treemodel/operations/AsTypeTreeItem.java | 6 +- .../operations/BinaryOpTreeItem.java | 12 +- .../treemodel/operations/BitAndTreeItem.java | 6 +- .../treemodel/operations/BitNotTreeItem.java | 6 +- .../treemodel/operations/BitOrTreeItem.java | 6 +- .../treemodel/operations/BitXorTreeItem.java | 6 +- .../treemodel/operations/DivideTreeItem.java | 6 +- .../treemodel/operations/EqTreeItem.java | 6 +- .../treemodel/operations/GeTreeItem.java | 6 +- .../treemodel/operations/GtTreeItem.java | 6 +- .../treemodel/operations/InTreeItem.java | 6 +- .../operations/InstanceOfTreeItem.java | 6 +- .../treemodel/operations/IsTypeTreeItem.java | 6 +- .../treemodel/operations/LShiftTreeItem.java | 6 +- .../treemodel/operations/LeTreeItem.java | 6 +- .../treemodel/operations/LogicalOp.java | 4 +- .../treemodel/operations/LtTreeItem.java | 6 +- .../treemodel/operations/ModuloTreeItem.java | 6 +- .../operations/MultiplyTreeItem.java | 6 +- .../treemodel/operations/NegTreeItem.java | 6 +- .../treemodel/operations/NeqTreeItem.java | 6 +- .../treemodel/operations/NotTreeItem.java | 6 +- .../treemodel/operations/OrTreeItem.java | 6 +- .../operations/PreDecrementTreeItem.java | 6 +- .../operations/PreIncrementTreeItem.java | 6 +- .../treemodel/operations/RShiftTreeItem.java | 6 +- .../operations/StrictEqTreeItem.java | 6 +- .../operations/StrictNeqTreeItem.java | 6 +- .../operations/StringAddTreeItem.java | 6 +- .../operations/StringEqTreeItem.java | 6 +- .../operations/StringLengthTreeItem.java | 8 +- .../operations/StringLtTreeItem.java | 6 +- .../operations/SubtractTreeItem.java | 6 +- .../treemodel/operations/URShiftTreeItem.java | 6 +- .../treemodel/operations/UnaryOpTreeItem.java | 12 +- .../flash}/graph/Graph.java | 2 +- .../flash}/graph/GraphPart.java | 2 +- .../flash}/graph/GraphPartMulti.java | 2 +- .../flash}/graph/Loop.java | 2 +- .../flash}/gui/AboutDialog.java | 8 +- .../flash}/gui/ImagePanel.java | 2 +- .../flash}/gui/LinkLabel.java | 2 +- .../flash}/gui/LoadingDialog.java | 4 +- .../flash}/gui/LoadingPanel.java | 4 +- .../flash}/gui/MainFrame.java | 132 +++++++++--------- .../flash}/gui/ModeFrame.java | 14 +- .../flash}/gui/TagNode.java | 56 ++++---- .../flash}/gui/TagPanel.java | 56 ++++---- .../flash}/gui/TagTreeModel.java | 4 +- .../{asdec => decompiler/flash}/gui/View.java | 13 +- .../flash}/gui/graphics/as16.png | Bin .../flash}/gui/graphics/button16.png | Bin .../flash}/gui/graphics/exit16.png | Bin .../flash}/gui/graphics/exit24.png | Bin .../flash}/gui/graphics/font16.png | Bin .../decompiler/flash/gui/graphics/icon16.png | Bin 0 -> 644 bytes .../decompiler/flash/gui/graphics/icon256.png | Bin 0 -> 18090 bytes .../decompiler/flash/gui/graphics/icon32.png | Bin 0 -> 1486 bytes .../decompiler/flash/gui/graphics/icon48.png | Bin 0 -> 2409 bytes .../flash}/gui/graphics/image16.png | Bin .../flash}/gui/graphics/loading.png | Bin .../decompiler/flash/gui/graphics/logo.png | Bin 0 -> 11777 bytes .../flash}/gui/graphics/morphshape16.png | Bin .../flash}/gui/graphics/open16.png | Bin .../flash}/gui/graphics/open24.png | Bin .../flash}/gui/graphics/pcode16.png | Bin .../flash}/gui/graphics/proxy16.png | Bin .../flash}/gui/graphics/proxy24.png | Bin .../flash}/gui/graphics/proxy32.png | Bin .../flash}/gui/graphics/proxy48.png | Bin .../flash}/gui/graphics/save16.png | Bin .../flash}/gui/graphics/saveas16.png | Bin .../flash}/gui/graphics/search.png | Bin .../flash}/gui/graphics/shape16.png | Bin .../flash}/gui/graphics/sprite16.png | Bin .../flash}/gui/graphics/text16.png | Bin .../flash}/gui/proxy/ProxyFrame.java | 16 +-- .../flash}/gui/proxy/SWFListModel.java | 2 +- .../flash}/helpers/Helper.java | 2 +- .../flash}/helpers/Highlighting.java | 2 +- .../flash}/tags/CSMTextSettingsTag.java | 6 +- .../flash}/tags/DebugIDTag.java | 6 +- .../flash}/tags/DefineBinaryDataTag.java | 6 +- .../flash}/tags/DefineBitsJPEG2Tag.java | 8 +- .../flash}/tags/DefineBitsJPEG3Tag.java | 10 +- .../flash}/tags/DefineBitsJPEG4Tag.java | 10 +- .../flash}/tags/DefineBitsLossless2Tag.java | 16 +-- .../flash}/tags/DefineBitsLosslessTag.java | 16 +-- .../flash}/tags/DefineBitsTag.java | 10 +- .../flash}/tags/DefineButton2Tag.java | 22 +-- .../flash}/tags/DefineButtonCxformTag.java | 8 +- .../flash}/tags/DefineButtonSoundTag.java | 10 +- .../flash}/tags/DefineButtonTag.java | 22 +-- .../flash}/tags/DefineEditTextTag.java | 14 +- .../flash}/tags/DefineFont2Tag.java | 20 +-- .../flash}/tags/DefineFont3Tag.java | 22 +-- .../flash}/tags/DefineFont4Tag.java | 8 +- .../flash}/tags/DefineFontAlignZonesTag.java | 8 +- .../flash}/tags/DefineFontInfo2Tag.java | 8 +- .../flash}/tags/DefineFontInfoTag.java | 6 +- .../flash}/tags/DefineFontNameTag.java | 4 +- .../flash}/tags/DefineFontTag.java | 12 +- .../flash}/tags/DefineMorphShape2Tag.java | 20 +-- .../flash}/tags/DefineMorphShapeTag.java | 20 +-- .../flash}/tags/DefineScalingGridTag.java | 8 +- .../tags/DefineSceneAndFrameLabelDataTag.java | 6 +- .../flash}/tags/DefineShape2Tag.java | 14 +- .../flash}/tags/DefineShape3Tag.java | 14 +- .../flash}/tags/DefineShape4Tag.java | 14 +- .../flash}/tags/DefineShapeTag.java | 14 +- .../flash}/tags/DefineSoundTag.java | 8 +- .../flash}/tags/DefineSpriteTag.java | 20 +-- .../flash}/tags/DefineText2Tag.java | 16 +-- .../flash}/tags/DefineTextTag.java | 16 +-- .../flash}/tags/DefineVideoStreamTag.java | 8 +- .../flash}/tags/DoABCTag.java | 12 +- .../flash}/tags/DoActionTag.java | 8 +- .../flash}/tags/DoInitActionTag.java | 12 +- .../flash}/tags/EnableDebugger2Tag.java | 6 +- .../flash}/tags/EnableDebuggerTag.java | 6 +- .../flash}/tags/EndTag.java | 2 +- .../flash}/tags/ExportAssetsTag.java | 6 +- .../flash}/tags/FileAttributesTag.java | 6 +- .../flash}/tags/FrameLabelTag.java | 6 +- .../flash}/tags/ImportAssets2Tag.java | 6 +- .../flash}/tags/ImportAssetsTag.java | 6 +- .../flash}/tags/JPEGTablesTag.java | 2 +- .../flash}/tags/MetadataTag.java | 6 +- .../flash}/tags/PlaceObject2Tag.java | 18 +-- .../flash}/tags/PlaceObject3Tag.java | 20 +-- .../flash}/tags/PlaceObjectTag.java | 10 +- .../flash}/tags/ProductInfoTag.java | 4 +- .../flash}/tags/ProtectTag.java | 6 +- .../flash}/tags/RemoveObject2Tag.java | 4 +- .../flash}/tags/RemoveObjectTag.java | 6 +- .../flash}/tags/ScriptLimitsTag.java | 6 +- .../flash}/tags/SetBackgroundColorTag.java | 8 +- .../flash}/tags/SetTabIndexTag.java | 6 +- .../flash}/tags/ShowFrameTag.java | 2 +- .../flash}/tags/SoundStreamBlockTag.java | 2 +- .../flash}/tags/SoundStreamHead2Tag.java | 6 +- .../flash}/tags/SoundStreamHeadTag.java | 6 +- .../flash}/tags/StartSound2Tag.java | 8 +- .../flash}/tags/StartSoundTag.java | 8 +- .../flash}/tags/SymbolClassTag.java | 6 +- .../{asdec => decompiler/flash}/tags/Tag.java | 2 +- .../flash}/tags/TagStub.java | 6 +- .../flash}/tags/VideoFrameTag.java | 6 +- .../flash}/tags/base/ASMSource.java | 4 +- .../flash}/tags/base/AloneTag.java | 2 +- .../flash}/tags/base/BoundedTag.java | 4 +- .../flash}/tags/base/CharacterTag.java | 6 +- .../flash}/tags/base/Container.java | 2 +- .../flash}/tags/base/FontTag.java | 4 +- .../flash}/types/ALPHABITMAPDATA.java | 2 +- .../flash}/types/ALPHACOLORMAPDATA.java | 2 +- .../flash}/types/ARGB.java | 2 +- .../flash}/types/BITMAPDATA.java | 2 +- .../flash}/types/BUTTONCONDACTION.java | 8 +- .../flash}/types/BUTTONRECORD.java | 4 +- .../flash}/types/CLIPACTIONRECORD.java | 8 +- .../flash}/types/CLIPACTIONS.java | 2 +- .../flash}/types/CLIPEVENTFLAGS.java | 2 +- .../flash}/types/COLORMAPDATA.java | 2 +- .../flash}/types/CXFORM.java | 2 +- .../flash}/types/CXFORMWITHALPHA.java | 2 +- .../flash}/types/FILLSTYLE.java | 2 +- .../flash}/types/FILLSTYLEARRAY.java | 2 +- .../flash}/types/FOCALGRADIENT.java | 2 +- .../flash}/types/GLYPHENTRY.java | 2 +- .../flash}/types/GRADIENT.java | 2 +- .../flash}/types/GRADRECORD.java | 2 +- .../flash}/types/KERNINGRECORD.java | 2 +- .../flash}/types/LANGCODE.java | 2 +- .../flash}/types/LINESTYLE.java | 2 +- .../flash}/types/LINESTYLE2.java | 2 +- .../flash}/types/LINESTYLEARRAY.java | 2 +- .../flash}/types/MATRIX.java | 2 +- .../flash}/types/MORPHFILLSTYLE.java | 2 +- .../flash}/types/MORPHFILLSTYLEARRAY.java | 2 +- .../flash}/types/MORPHGRADIENT.java | 2 +- .../flash}/types/MORPHGRADRECORD.java | 2 +- .../flash}/types/MORPHLINESTYLE.java | 2 +- .../flash}/types/MORPHLINESTYLE2.java | 2 +- .../flash}/types/MORPHLINESTYLEARRAY.java | 2 +- .../flash}/types/PIX15.java | 2 +- .../flash}/types/PIX24.java | 2 +- .../flash}/types/RECT.java | 2 +- .../flash}/types/RGB.java | 2 +- .../flash}/types/RGBA.java | 2 +- .../flash}/types/SHAPE.java | 4 +- .../flash}/types/SHAPEWITHSTYLE.java | 4 +- .../flash}/types/SOUNDENVELOPE.java | 2 +- .../flash}/types/SOUNDINFO.java | 2 +- .../flash}/types/TEXTRECORD.java | 2 +- .../flash}/types/ZONEDATA.java | 2 +- .../flash}/types/ZONERECORD.java | 2 +- .../flash}/types/filters/BEVELFILTER.java | 4 +- .../flash}/types/filters/BLURFILTER.java | 2 +- .../types/filters/COLORMATRIXFILTER.java | 2 +- .../types/filters/CONVOLUTIONFILTER.java | 4 +- .../types/filters/DROPSHADOWFILTER.java | 4 +- .../flash}/types/filters/FILTER.java | 2 +- .../flash}/types/filters/GLOWFILTER.java | 4 +- .../types/filters/GRADIENTBEVELFILTER.java | 4 +- .../types/filters/GRADIENTGLOWFILTER.java | 4 +- .../types/shaperecords/CurvedEdgeRecord.java | 2 +- .../types/shaperecords/EndShapeRecord.java | 2 +- .../types/shaperecords/SHAPERECORD.java | 14 +- .../shaperecords/StraightEdgeRecord.java | 2 +- .../types/shaperecords/StyleChangeRecord.java | 6 +- 792 files changed, 4004 insertions(+), 4021 deletions(-) delete mode 100644 trunk/src/com/jpexs/asdec/gui/graphics/icon16.png delete mode 100644 trunk/src/com/jpexs/asdec/gui/graphics/icon256.png delete mode 100644 trunk/src/com/jpexs/asdec/gui/graphics/icon32.png delete mode 100644 trunk/src/com/jpexs/asdec/gui/graphics/icon48.png delete mode 100644 trunk/src/com/jpexs/asdec/gui/graphics/logo.png rename trunk/src/com/jpexs/{asdec => decompiler/flash}/Configuration.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/EventListener.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/Main.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/PercentListener.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/ReReadableInputStream.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/SWF.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/SWFInputStream.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/SWFOutputStream.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/ABC.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/ABCInputStream.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/ABCOutputStream.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/CopyOutputStream.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/NotSameException.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/AVM2Code.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/CodeStats.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/ConstantPool.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/ConvertException.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/ConvertOutput.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/InstructionStats.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/InvalidInstructionArguments.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/LocalDataArea.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/UnknownInstructionCode.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/UnknownJumpException.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/graph/AVM2Graph.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/graph/ForException.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/AVM2Instruction.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/IfTypeIns.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/InstructionDefinition.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/SetTypeIns.java (70%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/TagInstruction.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/AddIIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/AddIns.java (75%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/DecrementIIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/DecrementIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/DivideIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/IncrementIIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/IncrementIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/ModuloIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/MultiplyIIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/MultiplyIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/NegateIIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/NegateIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/NotIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/SubtractIIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/arithmetic/SubtractIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/BitAndIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/BitNotIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/BitOrIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/BitXorIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/LShiftIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/RShiftIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/bitwise/URShiftIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/comparsion/EqualsIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/comparsion/GreaterEqualsIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/comparsion/GreaterThanIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/comparsion/LessEqualsIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/comparsion/LessThanIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/comparsion/StrictEqualsIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/ConstructIns.java (70%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/ConstructPropIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/ConstructSuperIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/NewActivationIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/NewArrayIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/NewCatchIns.java (63%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/NewClassIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/NewFunctionIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/construction/NewObjectIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/debug/DebugFileIns.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/debug/DebugIns.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/debug/DebugLineIns.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallMethodIns.java (73%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallPropLexIns.java (73%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallPropVoidIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallPropertyIns.java (73%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallStaticIns.java (73%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallSuperIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/executing/CallSuperVoidIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfEqIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfFalseIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfGeIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfGtIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfLeIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfLtIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfNGeIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfNGtIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfNLeIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfNLtIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfNeIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfStrictEqIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfStrictNeIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/IfTrueIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/JumpIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/jumps/LookupSwitchIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/DecLocalIIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/DecLocalIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/GetLocal0Ins.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/GetLocal1Ins.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/GetLocal2Ins.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/GetLocal3Ins.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/GetLocalIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/GetLocalTypeIns.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/IncLocalIIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/IncLocalIns.java (63%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/KillIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/SetLocal0Ins.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/SetLocal1Ins.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/SetLocal2Ins.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/SetLocal3Ins.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/SetLocalIns.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/localregs/SetLocalTypeIns.java (70%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/DeletePropertyIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/FindPropertyIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/FindPropertyStrictIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetDescendantsIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetGlobalScopeIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetGlobalSlotIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetLexIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetPropertyIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetScopeObjectIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetSlotIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/GetSuperIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/HasNext2Ins.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/HasNextIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/InIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/InitPropertyIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/LabelIns.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/NextNameIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/NextValueIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/NopIns.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/ReturnValueIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/ReturnVoidIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/SetGlobalSlotIns.java (60%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/SetPropertyIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/SetSlotIns.java (72%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/SetSuperIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/other/ThrowIns.java (70%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/DupIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PopIns.java (71%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PopScopeIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushByteIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushDoubleIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushFalseIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushIntIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushNamespaceIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushNanIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushNullIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushScopeIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushShortIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushStringIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushTrueIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushUIntIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushUndefinedIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/PushWithIns.java (70%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/stack/SwapIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ApplyTypeIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/AsTypeIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/AsTypeLateIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/CoerceAIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/CoerceIns.java (70%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/CoerceSIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ConvertBIns.java (72%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ConvertDIns.java (74%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ConvertIIns.java (73%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ConvertOIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ConvertSIns.java (69%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/ConvertUIns.java (68%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/InstanceOfIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/IsTypeIns.java (63%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/IsTypeLateIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/types/TypeOfIns.java (64%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/xml/CheckFilterIns.java (65%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/xml/DXNSIns.java (67%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/xml/DXNSLateIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/xml/EscXAttrIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/instructions/xml/EscXElemIns.java (66%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/parser/ASM3Parser.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/parser/Flasm3Lexer.java (97%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/parser/MissingSymbolHandler.java (92%) rename trunk/src/com/jpexs/{asdec/action => decompiler/flash/abc/avm2}/parser/ParseException.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/parser/ParsedSymbol.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/parser/flasm3.flex (99%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ApplyTypeTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/BooleanTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/BreakTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CallMethodTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CallPropertyTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CallStaticTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CallSuperTreeItem.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CallTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ClassTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CoerceTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/CommentTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ConstructPropTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ConstructSuperTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ConstructTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ContinueTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ConvertTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/DecLocalTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/DecrementTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/DefaultXMLNamespace.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/EscapeXAttrTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/EscapeXElemTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/FilteredCheckTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/FindPropertyTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/FloatValueTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/FullMultinameTreeItem.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/GetDescendantsTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/GetLexTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/GetPropertyTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/GetSlotTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/GetSuperTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/HasNextTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/InTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/IncLocalTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/IncrementTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/InitPropertyTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/IntegerValueTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/LocalRegTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NameSpaceTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NameValuePair.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NanTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NewActivationTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NewArrayTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NewFunctionTreeItem.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NewObjectTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NextNameTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NextValueTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NullTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/NumberValueTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/PostDecrementTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/PostIncrementTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ReturnValueTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ReturnVoidTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/SetGlobalSlotTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/SetLocalTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/SetPropertyTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/SetSlotTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/SetSuperTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/SetTypeTreeItem.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/StringTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ThisTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/ThrowTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/TreeItem.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/UndefinedTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/UnparsedTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/WithEndTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/WithObjectTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/WithTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/XMLTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/AssignmentTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/Block.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/DeclarationTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/DoWhileTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/ExceptionTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/FilterTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/ForEachInTreeItem.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/ForInTreeItem.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/ForTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/IfTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/LoopTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/SwitchTreeItem.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/TernarOpTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/TryTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/clauses/WhileTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/AddTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/AndTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/AsTypeTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/BinaryOpTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/BitAndTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/BitNotTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/BitOrTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/BitXorTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/DivideTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/EqTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/GeTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/GtTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/InTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/InstanceOfTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/IsTypeTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/LShiftTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/LeTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/LogicalOp.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/LtTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/ModuloTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/MultiplyTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/NegTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/NeqTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/NotTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/OrTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/PreDecrementTreeItem.java (75%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/PreIncrementTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/RShiftTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/StrictEqTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/StrictNeqTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/SubtractTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/TypeOfTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/URShiftTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/avm2/treemodel/operations/UnaryOpTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/ABCComboBoxModel.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/ABCPanel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/ASMSourceEditorPane.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/ClassesListTree.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/ClassesListTreeModel.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/ConstantsListModel.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/DecompiledEditorPane.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/DeobfuscationDialog.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/DetailPanel.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/DialogMissingSymbolHandler.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/GraphFrame.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/GraphTreeFrame.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/IconListRenderer.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/LineMarkedEditorPane.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/MethodBodyParamsPanel.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/MethodCodePanel.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/MethodInfoPanel.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/MethodTraitDetailPanel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/SlotConstTraitDetailPanel.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/TraitDetail.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/TraitsList.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/TraitsListModel.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/Tree.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/TreeElement.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/TreeLeafScript.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/TreeVisitor.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/UsageFrame.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/UsageListModel.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/graphics/constant.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/graphics/function.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/graphics/variable.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/DecimalTableModel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/DoubleTableModel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/IntTableModel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/MultinameTableModel.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/NamespaceSetTableModel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/NamespaceTableModel.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/StringTableModel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/gui/tablemodels/UIntTableModel.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/methodinfo_parser/MethodInfoLexer.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/methodinfo_parser/MethodInfoParser.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/methodinfo_parser/ParseException.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/methodinfo_parser/ParsedSymbol.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/methodinfo_parser/methodinfo.flex (98%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/ABCException.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/ClassInfo.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/Decimal.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/InstanceInfo.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/MetadataInfo.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/MethodBody.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/MethodInfo.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/Multiname.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/Namespace.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/NamespaceSet.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/ScriptInfo.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/ValueKind.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/traits/Trait.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/traits/TraitClass.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/traits/TraitFunction.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/traits/TraitMethodGetterSetter.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/traits/TraitSlotConst.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/types/traits/Traits.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/ClassNameMultinameUsage.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/ConstVarMultinameUsage.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/ConstVarNameMultinameUsage.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/ConstVarTypeMultinameUsage.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/ExtendsMultinameUsage.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/ImplementsMultinameUsage.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/InsideClassMultinameUsage.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/MethodBodyMultinameUsage.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/MethodMultinameUsage.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/MethodNameMultinameUsage.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/MethodParamsMultinameUsage.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/MethodReturnTypeMultinameUsage.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/MultinameUsage.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/TraitMultinameUsage.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/abc/usages/TypeNameMultinameUsage.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/Action.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/ActionGraph.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/IgnoredPair.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/TagNode.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/UnknownJumpException.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/flashlite/ActionFSCommand2.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/flashlite/ActionStrictMode.java (77%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/gui/ActionPanel.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/gui/TagTreeModel.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/parser/ASMParser.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/parser/FlasmLexer.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/parser/Label.java (91%) rename trunk/src/com/jpexs/{asdec/abc/avm2 => decompiler/flash/action}/parser/ParseException.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/parser/ParsedSymbol.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/parser/flasm.flex (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/special/ActionNop.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionGetURL.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionGoToLabel.java (77%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionGotoFrame.java (77%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionNextFrame.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionPlay.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionPrevFrame.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionSetTarget.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionStop.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionStopSounds.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionToggleQuality.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf3/ActionWaitForFrame.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionAdd.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionAnd.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionAsciiToChar.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionCall.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionCharToAscii.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionCloneSprite.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionDivide.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionEndDrag.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionEquals.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionGetProperty.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionGetTime.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionGetURL2.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionGetVariable.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionGotoFrame2.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionIf.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionJump.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionLess.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionMBAsciiToChar.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionMBCharToAscii.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionMBStringExtract.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionMBStringLength.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionMultiply.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionNot.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionOr.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionPop.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionPush.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionRandomNumber.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionRemoveSprite.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionSetProperty.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionSetTarget2.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionSetVariable.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionStartDrag.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionStringAdd.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionStringEquals.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionStringExtract.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionStringLength.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionStringLess.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionSubtract.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionToInteger.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionTrace.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ActionWaitForFrame2.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/ConstantIndex.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/Null.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/RegisterNumber.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf4/Undefined.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionAdd2.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionBitAnd.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionBitLShift.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionBitOr.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionBitRShift.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionBitURShift.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionBitXor.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionCallFunction.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionCallMethod.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionConstantPool.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionDecrement.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionDefineFunction.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionDefineLocal.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionDefineLocal2.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionDelete.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionDelete2.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionEnumerate.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionEquals2.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionGetMember.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionIncrement.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionInitArray.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionInitObject.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionLess2.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionModulo.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionNewMethod.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionNewObject.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionPushDuplicate.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionReturn.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionSetMember.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionStackSwap.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionStoreRegister.java (77%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionTargetPath.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionToNumber.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionToString.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionTypeOf.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf5/ActionWith.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf6/ActionEnumerate2.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf6/ActionGreater.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf6/ActionInstanceOf.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf6/ActionStrictEquals.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf6/ActionStringGreater.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf7/ActionCastOp.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf7/ActionDefineFunction2.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf7/ActionExtends.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf7/ActionImplementsOp.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf7/ActionThrow.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/swf7/ActionTry.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/AsciiToCharTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/BreakTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/CallFunctionTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/CallMethodTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/CallTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/CastOpTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/CharToAsciiTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/CloneSpriteTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ConstantPool.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ContinueTreeItem.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/DecrementTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/DefineLocalTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/DeleteTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/DirectValueTreeItem.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/EachTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/EnumerateTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ExtendsTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/FSCommand2TreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/FunctionTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GetMemberTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GetPropertyTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GetURL2TreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GetURLTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GetVariableTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GotoFrame2TreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GotoFrameTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/GotoLabelTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ImplementsOpTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/IncrementTreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/InitArrayTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/InitObjectTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/MBAsciiToCharTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/MBCharToAsciiTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/MBStringExtractTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/MBStringLengthTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/NewMethodTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/NewObjectTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/RandomNumberTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/RemoveSpriteTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ReturnTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SetMemberTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SetPropertyTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SetTarget2TreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SetTargetTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SetTypeTreeItem.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SetVariableTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/SimpleActionTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/StartDragTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/StoreRegisterTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/StrictModeTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/StringExtractTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/TargetPathTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ThrowTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ToIntegerTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ToNumberTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/ToStringTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/TraceTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/TreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/TypeOfTreeItem.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/UnsupportedTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/VoidTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/WaitForFrame2TreeItem.java (80%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/WaitForFrameTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/Block.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/ClassTreeItem.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/DoWhileTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/ForEachTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/ForInTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/ForTreeItem.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/IfTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/InterfaceTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/LoopTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/SwitchTreeItem.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/TernarOpTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/TryTreeItem.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/WhileTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/clauses/WithTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/AddTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/AndTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/AsTypeTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/BinaryOpTreeItem.java (79%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/BitAndTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/BitNotTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/BitOrTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/BitXorTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/DivideTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/EqTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/GeTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/GtTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/InTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/InstanceOfTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/IsTypeTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/LShiftTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/LeTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/LogicalOp.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/LtTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/ModuloTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/MultiplyTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/NegTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/NeqTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/NotTreeItem.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/OrTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/PreDecrementTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/PreIncrementTreeItem.java (82%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/RShiftTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/StrictEqTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/StrictNeqTreeItem.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/StringAddTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/StringEqTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/StringLengthTreeItem.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/StringLtTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/SubtractTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/URShiftTreeItem.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/action/treemodel/operations/UnaryOpTreeItem.java (75%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/graph/Graph.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/graph/GraphPart.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/graph/GraphPartMulti.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/graph/Loop.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/AboutDialog.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/ImagePanel.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/LinkLabel.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/LoadingDialog.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/LoadingPanel.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/MainFrame.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/ModeFrame.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/TagNode.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/TagPanel.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/TagTreeModel.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/View.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/as16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/button16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/exit16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/exit24.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/font16.png (100%) create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/image16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/loading.png (100%) create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/logo.png rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/morphshape16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/open16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/open24.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/pcode16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/proxy16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/proxy24.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/proxy32.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/proxy48.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/save16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/saveas16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/search.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/shape16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/sprite16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/graphics/text16.png (100%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/proxy/ProxyFrame.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/gui/proxy/SWFListModel.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/helpers/Helper.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/helpers/Highlighting.java (96%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/CSMTextSettingsTag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DebugIDTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBinaryDataTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBitsJPEG2Tag.java (84%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBitsJPEG3Tag.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBitsJPEG4Tag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBitsLossless2Tag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBitsLosslessTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineBitsTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineButton2Tag.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineButtonCxformTag.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineButtonSoundTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineButtonTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineEditTextTag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFont2Tag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFont3Tag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFont4Tag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFontAlignZonesTag.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFontInfo2Tag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFontInfoTag.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFontNameTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineFontTag.java (86%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineMorphShape2Tag.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineMorphShapeTag.java (83%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineScalingGridTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineSceneAndFrameLabelDataTag.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineShape2Tag.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineShape3Tag.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineShape4Tag.java (81%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineShapeTag.java (78%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineSoundTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineSpriteTag.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineText2Tag.java (85%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineTextTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DefineVideoStreamTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DoABCTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DoActionTag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/DoInitActionTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/EnableDebugger2Tag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/EnableDebuggerTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/EndTag.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ExportAssetsTag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/FileAttributesTag.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/FrameLabelTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ImportAssets2Tag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ImportAssetsTag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/JPEGTablesTag.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/MetadataTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/PlaceObject2Tag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/PlaceObject3Tag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/PlaceObjectTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ProductInfoTag.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ProtectTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/RemoveObject2Tag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/RemoveObjectTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ScriptLimitsTag.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/SetBackgroundColorTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/SetTabIndexTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/ShowFrameTag.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/SoundStreamBlockTag.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/SoundStreamHead2Tag.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/SoundStreamHeadTag.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/StartSound2Tag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/StartSoundTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/SymbolClassTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/Tag.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/TagStub.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/VideoFrameTag.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/base/ASMSource.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/base/AloneTag.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/base/BoundedTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/base/CharacterTag.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/base/Container.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/tags/base/FontTag.java (87%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/ALPHABITMAPDATA.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/ALPHACOLORMAPDATA.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/ARGB.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/BITMAPDATA.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/BUTTONCONDACTION.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/BUTTONRECORD.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/CLIPACTIONRECORD.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/CLIPACTIONS.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/CLIPEVENTFLAGS.java (95%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/COLORMAPDATA.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/CXFORM.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/CXFORMWITHALPHA.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/FILLSTYLE.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/FILLSTYLEARRAY.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/FOCALGRADIENT.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/GLYPHENTRY.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/GRADIENT.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/GRADRECORD.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/KERNINGRECORD.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/LANGCODE.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/LINESTYLE.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/LINESTYLE2.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/LINESTYLEARRAY.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MATRIX.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHFILLSTYLE.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHFILLSTYLEARRAY.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHGRADIENT.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHGRADRECORD.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHLINESTYLE.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHLINESTYLE2.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/MORPHLINESTYLEARRAY.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/PIX15.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/PIX24.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/RECT.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/RGB.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/RGBA.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/SHAPE.java (88%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/SHAPEWITHSTYLE.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/SOUNDENVELOPE.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/SOUNDINFO.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/TEXTRECORD.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/ZONEDATA.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/ZONERECORD.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/BEVELFILTER.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/BLURFILTER.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/COLORMATRIXFILTER.java (92%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/CONVOLUTIONFILTER.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/DROPSHADOWFILTER.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/FILTER.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/GLOWFILTER.java (89%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/GRADIENTBEVELFILTER.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/filters/GRADIENTGLOWFILTER.java (90%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/shaperecords/CurvedEdgeRecord.java (94%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/shaperecords/EndShapeRecord.java (91%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/shaperecords/SHAPERECORD.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/shaperecords/StraightEdgeRecord.java (93%) rename trunk/src/com/jpexs/{asdec => decompiler/flash}/types/shaperecords/StyleChangeRecord.java (90%) diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/icon16.png b/trunk/src/com/jpexs/asdec/gui/graphics/icon16.png deleted file mode 100644 index af1b033c34d6a13f322695154393d29ffad1f232..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 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 M07*qoM6N<$f|kVdF#rGn diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/icon48.png b/trunk/src/com/jpexs/asdec/gui/graphics/icon48.png deleted file mode 100644 index f99cff7e0a5784683252d0a2b07984bbb7a18dc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3728 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 AYybcN diff --git a/trunk/src/com/jpexs/asdec/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/Configuration.java similarity index 96% rename from trunk/src/com/jpexs/asdec/Configuration.java rename to trunk/src/com/jpexs/decompiler/flash/Configuration.java index 86e3f2d55..c746e9423 100644 --- a/trunk/src/com/jpexs/asdec/Configuration.java +++ b/trunk/src/com/jpexs/decompiler/flash/Configuration.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; import com.jpexs.proxy.Replacement; import java.io.*; diff --git a/trunk/src/com/jpexs/asdec/EventListener.java b/trunk/src/com/jpexs/decompiler/flash/EventListener.java similarity index 92% rename from trunk/src/com/jpexs/asdec/EventListener.java rename to trunk/src/com/jpexs/decompiler/flash/EventListener.java index 3c35b7e78..246a5df3f 100644 --- a/trunk/src/com/jpexs/asdec/EventListener.java +++ b/trunk/src/com/jpexs/decompiler/flash/EventListener.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; /** * diff --git a/trunk/src/com/jpexs/asdec/Main.java b/trunk/src/com/jpexs/decompiler/flash/Main.java similarity index 93% rename from trunk/src/com/jpexs/asdec/Main.java rename to trunk/src/com/jpexs/decompiler/flash/Main.java index 5576d7eba..71350cecb 100644 --- a/trunk/src/com/jpexs/asdec/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/Main.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.gui.AboutDialog; -import com.jpexs.asdec.gui.LoadingDialog; -import com.jpexs.asdec.gui.MainFrame; -import com.jpexs.asdec.gui.ModeFrame; -import com.jpexs.asdec.gui.View; -import com.jpexs.asdec.gui.proxy.ProxyFrame; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.gui.AboutDialog; +import com.jpexs.decompiler.flash.gui.LoadingDialog; +import com.jpexs.decompiler.flash.gui.MainFrame; +import com.jpexs.decompiler.flash.gui.ModeFrame; +import com.jpexs.decompiler.flash.gui.View; +import com.jpexs.decompiler.flash.gui.proxy.ProxyFrame; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -63,11 +63,11 @@ public class Main { public static String file; public static String maskURL; public static SWF swf; - public static final String version = "1.2.0u1"; - public static final String applicationName = "JP ActionScript Decompiler v." + version; - public static final String shortApplicationName = "ASDec"; + public static final String version = "1.3"; + public static final String applicationName = "JPEXS Free Flash Decompiler v." + version; + public static final String shortApplicationName = "FFDec"; public static final String shortApplicationVerName = shortApplicationName + " v." + version; - public static final String projectPage = "http://code.google.com/p/asdec/"; + public static final String projectPage = "http://www.free-decompiler.com/flash"; public static LoadingDialog loadingDialog; public static ModeFrame modeFrame; private static boolean working = false; @@ -416,14 +416,14 @@ public class Main { System.out.println(" ...Decompress infile and save it to outfile"); System.out.println(); System.out.println("Examples:"); - System.out.println("java -jar ASDec.jar myfile.swf"); - System.out.println("java -jar ASDec.jar -proxy"); - System.out.println("java -jar ASDec.jar -proxy -P1234"); - System.out.println("java -jar ASDec.jar -export as \"C:\\decompiled\\\" myfile.swf"); - System.out.println("java -jar ASDec.jar -export pcode \"C:\\decompiled\\\" myfile.swf"); - System.out.println("java -jar ASDec.jar -dumpSWF myfile.swf"); - System.out.println("java -jar ASDec.jar -compress myfile.swf myfiledec.swf"); - System.out.println("java -jar ASDec.jar -decompress myfiledec.swf myfile.swf"); + System.out.println("java -jar FFDec.jar myfile.swf"); + System.out.println("java -jar FFDec.jar -proxy"); + System.out.println("java -jar FFDec.jar -proxy -P1234"); + System.out.println("java -jar FFDec.jar -export as \"C:\\decompiled\\\" myfile.swf"); + System.out.println("java -jar FFDec.jar -export pcode \"C:\\decompiled\\\" myfile.swf"); + System.out.println("java -jar FFDec.jar -dumpSWF myfile.swf"); + System.out.println("java -jar FFDec.jar -compress myfile.swf myfiledec.swf"); + System.out.println("java -jar FFDec.jar -decompress myfiledec.swf myfile.swf"); } private static void copyFile(String from, String to) throws IOException { @@ -661,7 +661,7 @@ public class Main { } if (SystemTray.isSupported()) { SystemTray tray = SystemTray.getSystemTray(); - trayIcon = new TrayIcon(View.loadImage("com/jpexs/asdec/gui/graphics/proxy16.png"), "JP ASDec Proxy"); + trayIcon = new TrayIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy16.png"), "JP ASDec Proxy"); trayIcon.setImageAutoSize(true); PopupMenu trayPopup = new PopupMenu(); diff --git a/trunk/src/com/jpexs/asdec/PercentListener.java b/trunk/src/com/jpexs/decompiler/flash/PercentListener.java similarity index 92% rename from trunk/src/com/jpexs/asdec/PercentListener.java rename to trunk/src/com/jpexs/decompiler/flash/PercentListener.java index 4f7bfc06d..a85c5ab4f 100644 --- a/trunk/src/com/jpexs/asdec/PercentListener.java +++ b/trunk/src/com/jpexs/decompiler/flash/PercentListener.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; /** * diff --git a/trunk/src/com/jpexs/asdec/ReReadableInputStream.java b/trunk/src/com/jpexs/decompiler/flash/ReReadableInputStream.java similarity index 94% rename from trunk/src/com/jpexs/asdec/ReReadableInputStream.java rename to trunk/src/com/jpexs/decompiler/flash/ReReadableInputStream.java index c8b438a10..d5ded8387 100644 --- a/trunk/src/com/jpexs/asdec/ReReadableInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/ReReadableInputStream.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java similarity index 93% rename from trunk/src/com/jpexs/asdec/SWF.java rename to trunk/src/com/jpexs/decompiler/flash/SWF.java index 05ec97387..540cf421c 100644 --- a/trunk/src/com/jpexs/asdec/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; import SevenZip.Compression.LZMA.Encoder; -import com.jpexs.asdec.action.TagNode; -import com.jpexs.asdec.tags.DefineBitsJPEG2Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG3Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG4Tag; -import com.jpexs.asdec.tags.DefineBitsLossless2Tag; -import com.jpexs.asdec.tags.DefineBitsLosslessTag; -import com.jpexs.asdec.tags.DefineBitsTag; -import com.jpexs.asdec.tags.DoABCTag; -import com.jpexs.asdec.tags.JPEGTablesTag; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.action.TagNode; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG4Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLossless2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLosslessTag; +import com.jpexs.decompiler.flash.tags.DefineBitsTag; +import com.jpexs.decompiler.flash.tags.DoABCTag; +import com.jpexs.decompiler.flash.tags.JPEGTablesTag; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.types.RECT; import java.io.*; import java.util.ArrayList; import java.util.HashSet; diff --git a/trunk/src/com/jpexs/asdec/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java similarity index 94% rename from trunk/src/com/jpexs/asdec/SWFInputStream.java rename to trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index d656343db..137afe89d 100644 --- a/trunk/src/com/jpexs/asdec/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -14,30 +14,38 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.IgnoredPair; -import com.jpexs.asdec.action.parser.ASMParser; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.special.ActionNop; -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.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.*; -import com.jpexs.asdec.types.*; -import com.jpexs.asdec.types.filters.*; -import com.jpexs.asdec.types.shaperecords.CurvedEdgeRecord; -import com.jpexs.asdec.types.shaperecords.EndShapeRecord; -import com.jpexs.asdec.types.shaperecords.SHAPERECORD; -import com.jpexs.asdec.types.shaperecords.StraightEdgeRecord; -import com.jpexs.asdec.types.shaperecords.StyleChangeRecord; +import com.jpexs.decompiler.flash.types.filters.GLOWFILTER; +import com.jpexs.decompiler.flash.types.filters.BLURFILTER; +import com.jpexs.decompiler.flash.types.filters.COLORMATRIXFILTER; +import com.jpexs.decompiler.flash.types.filters.CONVOLUTIONFILTER; +import com.jpexs.decompiler.flash.types.filters.FILTER; +import com.jpexs.decompiler.flash.types.filters.DROPSHADOWFILTER; +import com.jpexs.decompiler.flash.types.filters.GRADIENTGLOWFILTER; +import com.jpexs.decompiler.flash.types.filters.BEVELFILTER; +import com.jpexs.decompiler.flash.types.filters.GRADIENTBEVELFILTER; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.IgnoredPair; +import com.jpexs.decompiler.flash.action.parser.ASMParser; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.special.ActionNop; +import com.jpexs.decompiler.flash.action.swf3.*; +import com.jpexs.decompiler.flash.action.swf4.*; +import com.jpexs.decompiler.flash.action.swf5.*; +import com.jpexs.decompiler.flash.action.swf6.*; +import com.jpexs.decompiler.flash.action.swf7.*; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.*; +import com.jpexs.decompiler.flash.types.*; +import com.jpexs.decompiler.flash.types.shaperecords.CurvedEdgeRecord; +import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord; +import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; +import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord; +import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/SWFOutputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java similarity index 94% rename from trunk/src/com/jpexs/asdec/SWFOutputStream.java rename to trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java index a35359223..537c1de57 100644 --- a/trunk/src/com/jpexs/asdec/SWFOutputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFOutputStream.java @@ -14,16 +14,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec; +package com.jpexs.decompiler.flash; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.types.*; -import com.jpexs.asdec.types.filters.*; -import com.jpexs.asdec.types.shaperecords.CurvedEdgeRecord; -import com.jpexs.asdec.types.shaperecords.EndShapeRecord; -import com.jpexs.asdec.types.shaperecords.SHAPERECORD; -import com.jpexs.asdec.types.shaperecords.StraightEdgeRecord; -import com.jpexs.asdec.types.shaperecords.StyleChangeRecord; +import com.jpexs.decompiler.flash.types.filters.GLOWFILTER; +import com.jpexs.decompiler.flash.types.filters.BLURFILTER; +import com.jpexs.decompiler.flash.types.filters.COLORMATRIXFILTER; +import com.jpexs.decompiler.flash.types.filters.CONVOLUTIONFILTER; +import com.jpexs.decompiler.flash.types.filters.FILTER; +import com.jpexs.decompiler.flash.types.filters.DROPSHADOWFILTER; +import com.jpexs.decompiler.flash.types.filters.GRADIENTGLOWFILTER; +import com.jpexs.decompiler.flash.types.filters.BEVELFILTER; +import com.jpexs.decompiler.flash.types.filters.GRADIENTBEVELFILTER; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.types.*; +import com.jpexs.decompiler.flash.types.shaperecords.CurvedEdgeRecord; +import com.jpexs.decompiler.flash.types.shaperecords.EndShapeRecord; +import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; +import com.jpexs.decompiler.flash.types.shaperecords.StraightEdgeRecord; +import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/trunk/src/com/jpexs/asdec/abc/ABC.java b/trunk/src/com/jpexs/decompiler/flash/abc/ABC.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/ABC.java rename to trunk/src/com/jpexs/decompiler/flash/abc/ABC.java index a030f39e0..e24cdd082 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABC.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/ABC.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc; +package com.jpexs.decompiler.flash.abc; -import com.jpexs.asdec.EventListener; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.UnknownInstructionCode; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -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.*; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.EventListener; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.UnknownInstructionCode; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.types.*; +import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.abc.usages.*; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.io.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java b/trunk/src/com/jpexs/decompiler/flash/abc/ABCInputStream.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/ABCInputStream.java rename to trunk/src/com/jpexs/decompiler/flash/abc/ABCInputStream.java index fafe7ad1d..21de85312 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABCInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/ABCInputStream.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc; +package com.jpexs.decompiler.flash.abc; -import com.jpexs.asdec.abc.types.*; -import com.jpexs.asdec.abc.types.traits.*; +import com.jpexs.decompiler.flash.abc.types.*; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/ABCOutputStream.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/ABCOutputStream.java rename to trunk/src/com/jpexs/decompiler/flash/abc/ABCOutputStream.java index c7188d8b5..c0c46c160 100644 --- a/trunk/src/com/jpexs/asdec/abc/ABCOutputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/ABCOutputStream.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc; +package com.jpexs.decompiler.flash.abc; -import com.jpexs.asdec.abc.types.*; -import com.jpexs.asdec.abc.types.traits.*; +import com.jpexs.decompiler.flash.abc.types.*; +import com.jpexs.decompiler.flash.abc.types.traits.*; import java.io.IOException; import java.io.OutputStream; diff --git a/trunk/src/com/jpexs/asdec/abc/CopyOutputStream.java b/trunk/src/com/jpexs/decompiler/flash/abc/CopyOutputStream.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/CopyOutputStream.java rename to trunk/src/com/jpexs/decompiler/flash/abc/CopyOutputStream.java index fa60ab8e3..f49f4b617 100644 --- a/trunk/src/com/jpexs/asdec/abc/CopyOutputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/CopyOutputStream.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc; +package com.jpexs.decompiler.flash.abc; import java.io.IOException; import java.io.InputStream; diff --git a/trunk/src/com/jpexs/asdec/abc/NotSameException.java b/trunk/src/com/jpexs/decompiler/flash/abc/NotSameException.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/NotSameException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/NotSameException.java index 22f173d98..919413780 100644 --- a/trunk/src/com/jpexs/asdec/abc/NotSameException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/NotSameException.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc; +package com.jpexs.decompiler.flash.abc; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Helper; public class NotSameException extends RuntimeException { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index b288e6a13..94e364694 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -14,44 +14,44 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.ABCInputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.abc.avm2.graph.AVM2Graph; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.asdec.abc.avm2.instructions.arithmetic.*; -import com.jpexs.asdec.abc.avm2.instructions.bitwise.*; -import com.jpexs.asdec.abc.avm2.instructions.comparsion.*; -import com.jpexs.asdec.abc.avm2.instructions.construction.*; -import com.jpexs.asdec.abc.avm2.instructions.debug.DebugFileIns; -import com.jpexs.asdec.abc.avm2.instructions.debug.DebugIns; -import com.jpexs.asdec.abc.avm2.instructions.debug.DebugLineIns; -import com.jpexs.asdec.abc.avm2.instructions.executing.*; -import com.jpexs.asdec.abc.avm2.instructions.jumps.*; -import com.jpexs.asdec.abc.avm2.instructions.localregs.*; -import com.jpexs.asdec.abc.avm2.instructions.other.*; -import com.jpexs.asdec.abc.avm2.instructions.stack.*; -import com.jpexs.asdec.abc.avm2.instructions.types.*; -import com.jpexs.asdec.abc.avm2.instructions.xml.*; -import com.jpexs.asdec.abc.avm2.parser.ASM3Parser; -import com.jpexs.asdec.abc.avm2.parser.ParseException; -import com.jpexs.asdec.abc.avm2.treemodel.*; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.*; -import com.jpexs.asdec.abc.avm2.treemodel.operations.AndTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.OrTreeItem; -import com.jpexs.asdec.abc.types.ABCException; -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.traits.Trait; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.ABCInputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.debug.DebugFileIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.debug.DebugIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.debug.DebugLineIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.executing.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.types.*; +import com.jpexs.decompiler.flash.abc.avm2.instructions.xml.*; +import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; +import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.*; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.*; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AndTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.OrTreeItem; +import com.jpexs.decompiler.flash.abc.types.ABCException; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.*; import java.util.*; import java.util.logging.Level; @@ -2086,43 +2086,6 @@ public class AVM2Code implements Serializable { return ret; } - public static void main(String[] args) { - FileInputStream fis = null; - try { - fis = new FileInputStream("src/asdec/abc/avm2/AVM2Code.java"); - byte[] data = new byte[fis.available()]; - fis.read(data); - - String content = new String(data); - Pattern partPat = Pattern.compile("private static InstructionDefinition instructionSet(.*)endoflist", Pattern.MULTILINE | Pattern.DOTALL); - Matcher m = partPat.matcher(content); - if (m.find()) { - System.out.println("1 found"); - content = m.group(1); - System.out.println(content); - Pattern part2Pat = Pattern.compile("new InstructionDefinition(\\([^\\)]*\"([^\"]*)\"[^\\)]*\\))\\{(.*)\\},", Pattern.MULTILINE | Pattern.DOTALL); - m = part2Pat.matcher(content); - while (m.find()) { - System.out.println("2 found"); - String superCall = m.group(1); - String name = m.group(2); - String methods = m.group(3); - FileOutputStream fos = new FileOutputStream("src/asdec/abc/avm2/instructions/generated/" + name + "Ins.java"); - String out = "public class " + name + "Ins extends InstructionDefinition {\r\n public " + name + "Ins(){\r\nsuper" + superCall + ";\r\n}" + methods + "}"; - fos.write(out.getBytes()); - fos.close(); - } - } - } catch (IOException ex) { - } finally { - try { - fis.close(); - } catch (IOException ex) { - Logger.getLogger(AVM2Code.class.getName()).log(Level.SEVERE, null, ex); - } - } - } - public void removeInstruction(int pos, MethodBody body) { if ((pos < 0) || (pos >= code.size())) { throw new IndexOutOfBoundsException(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/CodeStats.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/CodeStats.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java index a9a829f05..665729c18 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/CodeStats.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/CodeStats.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.abc.ABC; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConstantPool.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConstantPool.java index 4f06fc43d..9392103b5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/ConstantPool.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConstantPool.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; -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 com.jpexs.decompiler.flash.abc.types.Decimal; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.Namespace; +import com.jpexs.decompiler.flash.abc.types.NamespaceSet; import java.io.OutputStream; import java.io.PrintStream; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertException.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertException.java index e77418449..15c06a2a8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/ConvertException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; public class ConvertException extends RuntimeException { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/ConvertOutput.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java similarity index 87% rename from trunk/src/com/jpexs/asdec/abc/avm2/ConvertOutput.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java index 1f26d098b..1935adc01 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/ConvertOutput.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/ConvertOutput.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/InstructionStats.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/InstructionStats.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/InstructionStats.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/InstructionStats.java index 2f67de812..a22868e26 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/InstructionStats.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/InstructionStats.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/InvalidInstructionArguments.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/InvalidInstructionArguments.java index 0963068ab..07bce8826 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/InvalidInstructionArguments.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/InvalidInstructionArguments.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; public class InvalidInstructionArguments extends RuntimeException { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java index b83250fe8..b9ca45ac2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/LocalDataArea.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; import java.util.HashMap; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownInstructionCode.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownInstructionCode.java index 6cccef251..58d33aac3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownInstructionCode.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownInstructionCode.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; public class UnknownInstructionCode extends RuntimeException { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java index 3491b1f16..4aafc2d94 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/UnknownJumpException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/UnknownJumpException.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2; +package com.jpexs.decompiler.flash.abc.avm2; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/graph/AVM2Graph.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/avm2/graph/AVM2Graph.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java index 159373eda..8e053186c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/graph/AVM2Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java @@ -14,66 +14,66 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.graph; +package com.jpexs.decompiler.flash.abc.avm2.graph; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.ConvertException; -import com.jpexs.asdec.abc.avm2.ConvertOutput; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.IfTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.IfFalseIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.IfStrictEqIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.IfStrictNeIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.IfTrueIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.JumpIns; -import com.jpexs.asdec.abc.avm2.instructions.jumps.LookupSwitchIns; -import com.jpexs.asdec.abc.avm2.instructions.localregs.GetLocalTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.localregs.KillIns; -import com.jpexs.asdec.abc.avm2.instructions.other.LabelIns; -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.other.ThrowIns; -import com.jpexs.asdec.abc.avm2.instructions.stack.*; -import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.BreakTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.CommentTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.FilteredCheckTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.HasNextTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.InTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.IntegerValueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.NextNameTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.NextValueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.NullTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ReturnValueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ReturnVoidTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetTypeTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.WithTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.DoWhileTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.ExceptionTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.FilterTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.ForEachInTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.ForInTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.ForTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.IfTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.SwitchTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.TernarOpTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.TryTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.WhileTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.AndTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.LogicalOp; -import com.jpexs.asdec.abc.avm2.treemodel.operations.OrTreeItem; -import com.jpexs.asdec.abc.types.ABCException; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.graph.Graph; -import com.jpexs.asdec.graph.GraphPart; -import com.jpexs.asdec.graph.GraphPartMulti; -import com.jpexs.asdec.graph.Loop; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConvertException; +import com.jpexs.decompiler.flash.abc.avm2.ConvertOutput; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.IfFalseIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.IfStrictEqIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.IfStrictNeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.IfTrueIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.JumpIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.jumps.LookupSwitchIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.GetLocalTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.localregs.KillIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.LabelIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnValueIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ReturnVoidIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.ThrowIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.stack.*; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BreakTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CommentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FilteredCheckTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.HasNextTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.InTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextNameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NullTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnVoidTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.DoWhileTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.FilterTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ForEachInTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ForInTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ForTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.IfTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.SwitchTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.TernarOpTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.TryTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.WhileTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AndTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LogicalOp; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.OrTreeItem; +import com.jpexs.decompiler.flash.abc.types.ABCException; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.graph.Graph; +import com.jpexs.decompiler.flash.graph.GraphPart; +import com.jpexs.decompiler.flash.graph.GraphPartMulti; +import com.jpexs.decompiler.flash.graph.Loop; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -237,7 +237,6 @@ public class AVM2Graph extends Graph { List loopContinues = getLoopsContinues(loops); loopContinues.add(part); if (sp1.leadsTo(sp0, loopContinues)) { - } else if (sp0.leadsTo(sp1, loopContinues)) { reversed = true; } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/graph/ForException.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/ForException.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/graph/ForException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/ForException.java index 7b046ea06..a828fe8d3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/graph/ForException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/ForException.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.graph; +package com.jpexs.decompiler.flash.abc.avm2.graph; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.graph.GraphPart; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.graph.GraphPart; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java similarity index 93% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index 91c85216f..98e30c1d4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions; +package com.jpexs.decompiler.flash.abc.avm2.instructions; -import com.jpexs.asdec.abc.ABCOutputStream; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.ABCOutputStream; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Serializable; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java index 49c29022f..f74cf2c8b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/IfTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/IfTypeIns.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions; +package com.jpexs.decompiler.flash.abc.avm2.instructions; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java index 6654b33c8..c806be6d9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions; +package com.jpexs.decompiler.flash.abc.avm2.instructions; -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; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.Serializable; import java.util.HashMap; import java.util.List; @@ -71,7 +71,7 @@ public class InstructionDefinition implements Serializable { throw new UnsupportedOperationException("Instruction " + instructionName + " not implemented"); } - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { } protected FullMultinameTreeItem resolveMultiname(Stack stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java similarity index 70% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java index 893122160..090ad83b4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/SetTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/SetTypeIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions; +package com.jpexs.decompiler.flash.abc.avm2.instructions; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; import java.util.Stack; public interface SetTypeIns { - public abstract String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.asdec.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames); + public abstract String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/TagInstruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/TagInstruction.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/TagInstruction.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/TagInstruction.java index 71db40d07..00c358658 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/TagInstruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/TagInstruction.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions; +package com.jpexs.decompiler.flash.abc.avm2.instructions; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java index 4dd3ef2e1..668591a5b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIIns.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class AddIIns extends AddIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new AddTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java similarity index 75% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java index 89d79cdb9..40cc8b077 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/AddIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.avm2.treemodel.operations.AddTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -57,7 +57,7 @@ public class AddIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new AddTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java index 99484a2a7..8b98a9a70 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.DecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -53,7 +53,7 @@ public class DecrementIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new DecrementTreeItem(ins, (TreeItem) stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java index bfbb47f34..cf343d9cc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DecrementIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.DecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -53,7 +53,7 @@ public class DecrementIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new DecrementTreeItem(ins, (TreeItem) stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java index 700897207..dadbf9c0e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/DivideIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.avm2.treemodel.operations.DivideTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.DivideTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -56,7 +56,7 @@ public class DivideIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new DivideTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java index de85ae8f2..5c06a4d3c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.IncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class IncrementIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new IncrementTreeItem(ins, (TreeItem) stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java index 80f0d85ae..1792bba20 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/IncrementIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/IncrementIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.IncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class IncrementIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new IncrementTreeItem(ins, (TreeItem) stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java index 6cb75e811..14f102f51 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/ModuloIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.avm2.treemodel.operations.ModuloTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.ModuloTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -48,7 +48,7 @@ public class ModuloIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new ModuloTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java index aab30cfd8..8a2ad46ca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.MultiplyTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class MultiplyIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new MultiplyTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java index ed0580a02..0a68db6a8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/MultiplyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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.avm2.treemodel.operations.MultiplyTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.MultiplyTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -56,7 +56,7 @@ public class MultiplyIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new MultiplyTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java index c8c5ec6ea..fb35bc90b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NegTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class NegateIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v = (TreeItem) stack.pop(); stack.push(new NegTreeItem(ins, v)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java index de7632cc1..a0f602892 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NegateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NegateIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NegTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class NegateIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v = (TreeItem) stack.pop(); stack.push(new NegTreeItem(ins, v)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java index 8cc86b51a..5ef89310a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/NotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/NotIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NotTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class NotIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v = (TreeItem) stack.pop(); stack.push(new NotTreeItem(ins, v)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java index e6ea6da16..abfc47179 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class SubtractIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new SubtractTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java index 95fb40aef..09a982632 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/arithmetic/SubtractIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/SubtractIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.arithmetic; +package com.jpexs.decompiler.flash.abc.avm2.instructions.arithmetic; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class SubtractIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new SubtractTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java index ab11410db..8c69b5ba9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitAndIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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.avm2.treemodel.operations.BitAndTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitAndTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class BitAndIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new BitAndTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java index 14b7fa18d..18833c57c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitNotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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.avm2.treemodel.operations.BitNotTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitNotTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class BitNotIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v = (TreeItem) stack.pop(); stack.push(new BitNotTreeItem(ins, v)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java index c32031742..e8f8f61e4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitOrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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.avm2.treemodel.operations.BitOrTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitOrTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class BitOrIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new BitOrTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java index 35910fed3..fde1197cb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/BitXorIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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.avm2.treemodel.operations.BitXorTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.BitXorTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class BitXorIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new BitXorTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java index cc27e91ce..efc942f34 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/LShiftIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/LShiftIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LShiftTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class LShiftIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LShiftTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java index 2aaaa569b..d28c81805 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/RShiftIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/RShiftIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.RShiftTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class RShiftIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new RShiftTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java index 96d1c157f..a1ea7b5c0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/bitwise/URShiftIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/URShiftIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.bitwise; +package com.jpexs.decompiler.flash.abc.avm2.instructions.bitwise; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.URShiftTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class URShiftIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new URShiftTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java index d8d423544..4ab60f400 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/EqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.comparsion; +package com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion; -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.avm2.treemodel.operations.EqTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.EqTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -43,7 +43,7 @@ public class EqualsIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new EqTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/GreaterEqualsIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/GreaterEqualsIns.java index 7afe67682..6a61a6f1e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterEqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/GreaterEqualsIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.comparsion; +package com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class GreaterEqualsIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new GeTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/GreaterThanIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/GreaterThanIns.java index b863921ef..f76f57724 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/GreaterThanIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/GreaterThanIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.comparsion; +package com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class GreaterThanIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LtTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/LessEqualsIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/LessEqualsIns.java index 74e90c577..670f46c55 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessEqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/LessEqualsIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.comparsion; +package com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class LessEqualsIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LeTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/LessThanIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/LessThanIns.java index 59f9d1d91..4262041da 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/LessThanIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/LessThanIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.comparsion; +package com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class LessThanIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new GtTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/StrictEqualsIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/StrictEqualsIns.java index b282584d5..12a403b51 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/comparsion/StrictEqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/StrictEqualsIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.comparsion; +package com.jpexs.decompiler.flash.abc.avm2.instructions.comparsion; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class StrictEqualsIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new StrictEqTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java similarity index 70% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java index ada5a4032..e446e08e6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.asdec.abc.avm2.treemodel.ConstructTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.EscapeXAttrTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.EscapeXElemTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.FindPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.GetLexTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.GetPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.StringTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.XMLTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.AddTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConstructTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXAttrTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXElemTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetLexTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.StringTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.XMLTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -74,7 +74,7 @@ public class ConstructIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int argCount = ins.operands[0]; List args = new ArrayList(); for (int a = 0; a < argCount; a++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java index f9b6d264d..3d8e820a1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructPropIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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.avm2.treemodel.XMLTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConstructPropTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.XMLTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -54,7 +54,7 @@ public class ConstructPropIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java index 7488eae07..71a19ceff 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/ConstructSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConstructSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -50,7 +50,7 @@ public class ConstructSuperIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int argCount = ins.operands[0]; List args = new ArrayList(); for (int a = 0; a < argCount; a++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java index 227f26144..f94991b6c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewActivationIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewActivationIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewActivationTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class NewActivationIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new NewActivationTreeItem(ins)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java index b081b2ef0..e67030fbe 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewArrayIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewArrayIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewArrayTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,7 +36,7 @@ public class NewArrayIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int argCount = ins.operands[0]; List args = new ArrayList(); for (int a = 0; a < argCount; a++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java similarity index 63% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java index ee3e58fb2..146c7e84a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewCatchIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewCatchIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class NewCatchIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int exInfo = ins.operands[0]; stack.push(new ExceptionTreeItem(body.exceptions[exInfo])); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java index d652c3592..2f074c34a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewClassIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewClassIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.UnparsedTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class NewClassIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int clsIndex = ins.operands[0]; String baseType = stack.pop().toString(constants, localRegNames, fullyQualifiedNames); stack.push(new UnparsedTreeItem(ins, "new " + abc.constants.constant_multiname[abc.instance_info[clsIndex].name_index].getName(constants, fullyQualifiedNames) + ".class extends " + baseType)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java index 744cf8b06..e6f3d60d1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewFunctionIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewFunctionIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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.NewFunctionTreeItem; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewFunctionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class NewFunctionIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int methodIndex = ins.operands[0]; MethodBody mybody = abc.findBody(methodIndex); String bodyStr = ""; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java index cd50fc1f4..17600916d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/construction/NewObjectIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/NewObjectIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.construction; +package com.jpexs.decompiler.flash.abc.avm2.instructions.construction; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NameValuePair; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewObjectTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -37,7 +37,7 @@ public class NewObjectIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int argCount = ins.operands[0]; List args = new ArrayList(); for (int a = 0; a < argCount; a++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugFileIns.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugFileIns.java index 1a525ccda..d611675dd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugFileIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugFileIns.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.debug; +package com.jpexs.decompiler.flash.abc.avm2.instructions.debug; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; public class DebugFileIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugIns.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugIns.java index 445ad42f8..5160a5c41 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugIns.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.debug; +package com.jpexs.decompiler.flash.abc.avm2.instructions.debug; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; public class DebugIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugLineIns.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugLineIns.java index d9efe8595..51700344b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/debug/DebugLineIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/debug/DebugLineIns.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.debug; +package com.jpexs.decompiler.flash.abc.avm2.instructions.debug; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; public class DebugLineIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java index ec6652be5..e51325fa4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -50,7 +50,7 @@ public class CallIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int argCount = ins.operands[0]; List args = new ArrayList(); for (int a = 0; a < argCount; a++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java similarity index 73% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java index d483304e6..24c76b2d8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallMethodIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallMethodTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -50,7 +50,7 @@ public class CallMethodIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int methodIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java similarity index 73% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java index ed1940156..c65cef287 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropLexIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropLexIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,7 +36,7 @@ public class CallPropLexIns extends CallPropertyIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java index 8635e37ef..cc5bd6cce 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -55,7 +55,7 @@ public class CallPropVoidIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java similarity index 73% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java index 74de48a70..cecbb4de3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,7 +53,7 @@ public class CallPropertyIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java similarity index 73% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java index 7f5707606..88212c458 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallStaticIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallStaticTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -50,7 +50,7 @@ public class CallStaticIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int methodIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java index 270200733..ee2843b3d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,7 +53,7 @@ public class CallSuperIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java index dbe5468fc..ec70196df 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/executing/CallSuperVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.executing; +package com.jpexs.decompiler.flash.abc.avm2.instructions.executing; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CallSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,7 +53,7 @@ public class CallSuperVoidIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; int argCount = ins.operands[1]; List args = new ArrayList(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java index f28e7dae4..b8bf76ae8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfEqIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfEqIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.NeqTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.EqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NeqTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfEqIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new EqTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java index 5adba8b7c..628d6766f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfFalseIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfFalseIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NotTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class IfFalseIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v1 = (TreeItem) stack.pop(); stack.push(new NotTreeItem(ins, v1)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java index ff25328df..07c78dd6e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LtTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfGeIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new GeTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java index 85da49074..cf0b544fe 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfGtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfGtIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LeTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfGtIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new GtTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java index ab139883b..80e726cdd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LeTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfLeIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LeTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java index 4e6160069..366865ae9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfLtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfLtIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LtTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfLtIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LtTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java index 6315ace69..8849bbf7e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LtTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfNGeIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LtTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java index 85373a470..1bdcda8e5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNGtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNGtIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LeTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfNGtIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new LeTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java index af9cd9f26..8457135db 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LeTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfNLeIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new GtTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java index 8c8bc8cde..e5179f526 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNLtIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNLtIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.LtTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.GeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfNLtIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new GeTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java index 13d43084b..252595125 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfNeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfNeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.NeqTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.EqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NeqTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfNeIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new NeqTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java index 2238744c3..a9210d615 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictEqIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictEqIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.StrictNeqTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictNeqTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfStrictEqIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new StrictEqTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java index e7d1cdce7..7d80b931d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfStrictNeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfStrictNeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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.avm2.treemodel.operations.StrictNeqTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.StrictNeqTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class IfStrictNeIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v2 = (TreeItem) stack.pop(); TreeItem v1 = (TreeItem) stack.pop(); stack.push(new StrictNeqTreeItem(ins, v1, v2)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java index ef5804061..74c9020b4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/IfTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/IfTrueIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.NotTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class IfTrueIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { //String v1 = stack.pop().toString(); //stack.push("(" + v1 + ")"); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java index e08e806c7..34fa3486f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/JumpIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/JumpIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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; -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 com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.IfTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class JumpIns extends InstructionDefinition implements IfTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new BooleanTreeItem(ins, Boolean.TRUE));// + ins.operands[0]); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java index a5b87bc34..a3e63115c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/jumps/LookupSwitchIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/jumps/LookupSwitchIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.jumps; +package com.jpexs.decompiler.flash.abc.avm2.instructions.jumps; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class LookupSwitchIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int defaultOffset = ins.operands[0]; int caseCount = ins.operands[1]; //stack.push("switch(...)"); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java index 6dec29476..8afdba9cc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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; -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 com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -54,7 +54,7 @@ public class DecLocalIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int regIndex = ins.operands[0]; output.add(new DecLocalTreeItem(ins, regIndex)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java index ebb74ae3c..72c78d2c0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/DecLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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; -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 com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -54,7 +54,7 @@ public class DecLocalIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int regIndex = ins.operands[0]; output.add(new DecLocalTreeItem(ins, regIndex)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java index 4f5236baa..bfd372e8c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal0Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThisTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class GetLocal0Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { if (isStatic) { stack.push(new ClassTreeItem(abc.instance_info[classIndex].getName(constants))); } else { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java index 95583feb2..606385967 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal1Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class GetLocal1Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new LocalRegTreeItem(ins, 1, localRegs.get(1))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java index 727cb1bd1..f3d4abfc8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class GetLocal2Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new LocalRegTreeItem(ins, 2, localRegs.get(2))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java index 250f6454e..f9fd2f92b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocal3Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class GetLocal3Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new LocalRegTreeItem(ins, 3, localRegs.get(3))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java index da5f8bb2b..a37a8f7de 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class GetLocalIns extends InstructionDefinition implements GetLocalTypeIn } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int regIndex = ins.operands[0]; stack.push(new LocalRegTreeItem(ins, regIndex, localRegs.get(regIndex))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java index ac0189c4e..fc1bf28ec 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/GetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalTypeIns.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public interface GetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java index 7ff486a91..f287b36ca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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 com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class IncLocalIIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int regIndex = ins.operands[0]; output.add(new IncLocalTreeItem(ins, regIndex)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java similarity index 63% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java index a405919cb..0518ed3f9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/IncLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/IncLocalIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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 com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class IncLocalIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int regIndex = ins.operands[0]; output.add(new IncLocalTreeItem(ins, regIndex)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java index 208839066..3ab569c7d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/KillIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/KillIns.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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 com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -33,7 +33,7 @@ public class KillIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { //kill local register } } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java index b8bca12e1..66dc468da 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal0Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal0Ins.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public class SetLocal0Ins extends SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java index 91056c655..ad3250bad 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal1Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal1Ins.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public class SetLocal1Ins extends SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java index 8c4653934..f957245ca 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal2Ins.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public class SetLocal2Ins extends SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java index 8754a10fd..9911739f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocal3Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocal3Ins.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public class SetLocal3Ins extends SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java index 6799954e8..280a0461b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalIns.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public class SetLocalIns extends SetLocalTypeIns { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java similarity index 70% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java index 01a5bb2d7..079472721 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/localregs/SetLocalTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/SetLocalTypeIns.java @@ -14,25 +14,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.localregs; +package com.jpexs.decompiler.flash.abc.avm2.instructions.localregs; -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.instructions.SetTypeIns; -import com.jpexs.asdec.abc.avm2.treemodel.DecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.FindPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.IncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.NewActivationTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.PostDecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.PostIncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.PreIncrementTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NewActivationTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostDecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreDecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,7 +44,7 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int regId = getRegisterId(ins); TreeItem value = (TreeItem) stack.pop(); localRegs.put(regId, value); @@ -105,7 +105,7 @@ public abstract class SetLocalTypeIns extends InstructionDefinition implements S output.add(new SetLocalTreeItem(ins, regId, value)); } - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.asdec.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { return TreeItem.localRegName(localRegNames, getRegisterId(ins)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java index 4a4d5e193..90d78bee2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/DeletePropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.asdec.abc.avm2.treemodel.BooleanTreeItem; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.DeletePropertyTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -49,7 +49,7 @@ public class DeletePropertyIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); TreeItem obj = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java index a183b871d..e048703c6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,7 +46,7 @@ public class FindPropertyIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); stack.push(new FindPropertyTreeItem(ins, multiname)); //resolve right object diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java index 809123cc1..b6961bdf2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/FindPropertyStrictIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FindPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -45,7 +45,7 @@ public class FindPropertyStrictIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); stack.push(new FindPropertyTreeItem(ins, multiname)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java index 0790bb66a..deec38537 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetDescendantsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetDescendantsTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -46,7 +46,7 @@ public class GetDescendantsIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); TreeItem obj = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java index 5976ee56a..7450a69c8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.ClassTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class GetGlobalScopeIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { if (scopeStack.isEmpty()) { stack.push(new ClassTreeItem(abc.instance_info[classIndex].getName(constants))); return; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java index f76d79141..c247564f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalSlotIns.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.GetSlotTreeItem; -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 com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSlotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -38,7 +38,7 @@ public class GetGlobalSlotIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int slotIndex = ins.operands[0]; TreeItem obj = (TreeItem) scopeStack.get(0); //scope Multiname slotname = null; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java index cc6fb4a03..14497b3b6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetLexIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetLexIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.GetLexTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetLexTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class GetLexIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; Multiname multiname = constants.constant_multiname[multinameIndex]; stack.push(new GetLexTreeItem(ins, multiname)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java index dc10a1fed..18c9e7de5 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetPropertyIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class GetPropertyIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); TreeItem obj = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java index 6affb2a4a..5803af9b3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetScopeObjectIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetScopeObjectIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class GetScopeObjectIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int index = ins.operands[0]; if (scopeStack.size() <= index) { System.out.println("uuu"); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java index 8549f8f58..8d0a37d9e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSlotIns.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.ClassTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.GetSlotTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ThisTreeItem; -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 com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSlotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThisTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class GetSlotIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int slotIndex = ins.operands[0]; TreeItem obj = (TreeItem) stack.pop(); //scope Multiname slotname = null; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java index 59c7e5955..c220817a0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/GetSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetSuperIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class GetSuperIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); TreeItem obj = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java index 61811b69f..88ed5cd8f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNext2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNext2Ins.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.HasNextTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.HasNextTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -35,7 +35,7 @@ public class HasNext2Ins extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int objectReg = ins.operands[0]; int indexReg = ins.operands[1]; //stack.push("_loc_" + objectReg + ".hasNext(cnt=_loc_" + indexReg + ")"); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java index 9ee5c0709..a6cbca36d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/HasNextIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/HasNextIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.HasNextTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.HasNextTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class HasNextIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem curIndex = (TreeItem) stack.pop(); TreeItem obj = (TreeItem) stack.pop(); stack.push(new HasNextTreeItem(ins, curIndex, obj)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java index 68bf4ce4c..b52860ac3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.InTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class InIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem obj = (TreeItem) stack.pop(); TreeItem name = (TreeItem) stack.pop(); stack.push(new InTreeItem(ins, name, obj)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java index c2d18e59b..5d6ef42e1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/InitPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/InitPropertyIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.InitPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class InitPropertyIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; TreeItem val = (TreeItem) stack.pop(); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/LabelIns.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/LabelIns.java index 8e89d2196..c599f1d5c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/LabelIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/LabelIns.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; public class LabelIns extends InstructionDefinition { //this can be target of branch diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java index dce096d77..f3e2a7cad 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextNameIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextNameIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.NextNameTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextNameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class NextNameIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem index = stack.pop(); TreeItem obj = stack.pop(); stack.push(new NextNameTreeItem(ins, index, obj)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java index d07380b21..037f099ae 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NextValueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NextValueIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.NextValueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NextValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class NextValueIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem index = stack.pop(); TreeItem obj = stack.pop(); stack.push(new NextValueTreeItem(ins, index, obj)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NopIns.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NopIns.java index 78dc28ed8..9f5a94dd9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/NopIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/NopIns.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; public class NopIns extends InstructionDefinition { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java index cc3717c78..5491420d2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnValueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnValueIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class ReturnValueIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { output.add(new ReturnValueTreeItem(ins, (TreeItem) stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java index bb3ee015c..bc4a23e63 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ReturnVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ReturnVoidIns.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ReturnVoidTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -33,7 +33,7 @@ public class ReturnVoidIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { output.add(new ReturnVoidTreeItem(ins)); } } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java similarity index 60% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java index c2f3b9191..58e32b644 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetGlobalSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetGlobalSlotIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetGlobalSlotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,11 +36,11 @@ public class SetGlobalSlotIns extends InstructionDefinition implements SetTypeIn } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { output.add(new SetGlobalSlotTreeItem(ins, ins.operands[0], (TreeItem) stack.pop())); } - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.asdec.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { return "globalslot" + ins.operands[0]; } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java index cfe11371e..72e572329 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetPropertyIns.java @@ -14,26 +14,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.instructions.SetTypeIns; -import com.jpexs.asdec.abc.avm2.treemodel.DecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.FullMultinameTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.GetPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.IncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.LocalRegTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.PostDecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.PostIncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetPropertyTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.PreIncrementTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.LocalRegTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostDecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetPropertyTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreDecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -45,7 +45,7 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; TreeItem value = (TreeItem) stack.pop(); FullMultinameTreeItem multiname = resolveMultiname(stack, constants, multinameIndex, ins); @@ -112,7 +112,7 @@ public class SetPropertyIns extends InstructionDefinition implements SetTypeIns output.add(new SetPropertyTreeItem(ins, obj, multiname, value)); } - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.asdec.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; String multiname = resolveMultinameNoPop(0, stack, abc.constants, multinameIndex, ins, fullyQualifiedNames); TreeItem obj = stack.get(1 + resolvedCount(abc.constants, multinameIndex)); //pod vrcholem diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java similarity index 72% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java index 1022337d4..5feff25d7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSlotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSlotIns.java @@ -14,29 +14,29 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.instructions.SetTypeIns; -import com.jpexs.asdec.abc.avm2.treemodel.ClassTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.DecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.GetSlotTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.IncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.PostDecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.PostIncrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetSlotTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ThisTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.ExceptionTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.PreDecrementTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.operations.PreIncrementTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ClassTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.GetSlotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostDecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.PostIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetSlotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThisTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.ExceptionTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreDecrementTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.PreIncrementTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -48,7 +48,7 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int slotIndex = ins.operands[0]; TreeItem value = (TreeItem) stack.pop(); TreeItem obj = (TreeItem) stack.pop(); //scopeId @@ -131,7 +131,7 @@ public class SetSlotIns extends InstructionDefinition implements SetTypeIns { output.add(new SetSlotTreeItem(ins, obj, slotname, value)); } - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.asdec.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int slotIndex = ins.operands[0]; ////String obj = stack.get(1); String slotname = ""; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java index b90ebf88f..7e7fdab53 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/SetSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/SetSuperIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.instructions.SetTypeIns; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.instructions.SetTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetSuperTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -37,7 +37,7 @@ public class SetSuperIns extends InstructionDefinition implements SetTypeIns { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; TreeItem value = (TreeItem) stack.pop(); @@ -46,7 +46,7 @@ public class SetSuperIns extends InstructionDefinition implements SetTypeIns { output.add(new SetSuperTreeItem(ins, value, obj, multiname)); } - public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.asdec.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { + public String getObject(Stack stack, ABC abc, AVM2Instruction ins, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; String multiname = resolveMultinameNoPop(1, stack, abc.constants, multinameIndex, ins, fullyQualifiedNames); String obj = stack.get(1 + resolvedCount(abc.constants, multinameIndex)).toString(abc.constants, localRegNames, fullyQualifiedNames); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java similarity index 70% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java index 1f8ac2007..76cda70d2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/other/ThrowIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/ThrowIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.other; +package com.jpexs.decompiler.flash.abc.avm2.instructions.other; -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.ThrowTreeItem; -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.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ThrowTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java index ebcac10a5..18165bb13 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class DupIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem v = (TreeItem) stack.pop(); stack.push(v); stack.push(v); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java similarity index 71% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java index 2f5ff33b9..c30ebe2a0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.*; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.*; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class PopIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { if (stack.size() > 0) { TreeItem top = stack.pop(); if (top instanceof CallPropertyTreeItem) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java index 59cf23022..ec91bab07 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PopScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.avm2.treemodel.WithEndTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.WithObjectTreeItem; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithEndTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithObjectTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java index b5c40b3e1..6a9713d33 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushByteIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushByteIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new IntegerValueTreeItem(ins, new Long(ins.operands[0]))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java index 1f1df081d..7a0b9a1b6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushDoubleIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FloatValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushDoubleIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new FloatValueTreeItem(ins, constants.constant_double[ins.operands[0]])); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java index 7f51d3bc5..0fddde128 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushFalseIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.BooleanTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class PushFalseIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new BooleanTreeItem(ins, Boolean.FALSE)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java index 44860cd02..7a328e7f6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushIntIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new IntegerValueTreeItem(ins, constants.constant_int[ins.operands[0]])); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java index f2a46f2ba..fa2f484b1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNamespaceIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNamespaceIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.NameSpaceTreeItem; -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.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NameSpaceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java index c7fd61bdb..2aa3a3129 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNanIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNanIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class PushNanIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new NanTreeItem(ins)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java index d447d3464..baf3639fc 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushNullIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushNullIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.NullTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class PushNullIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new NullTreeItem(ins)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java index 7bcaf313c..a5051b1e3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -39,7 +39,7 @@ public class PushScopeIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { scopeStack.push(stack.pop()); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java index 681272bfd..d103a91df 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushShortIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushShortIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new IntegerValueTreeItem(ins, new Long(ins.operands[0]))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java index 3b1d5d625..5993060f8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushStringIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.StringTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushStringIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new StringTreeItem(ins, constants.constant_string[ins.operands[0]])); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java index 6e5cfb6f0..5a878314a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.BooleanTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BooleanTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class PushTrueIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new BooleanTreeItem(ins, Boolean.TRUE)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java index cfe05cd77..d829d6adb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.IntegerValueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class PushUIntIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new IntegerValueTreeItem(ins, constants.constant_uint[ins.operands[0]])); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java index 8fdfb7092..deef1b928 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushUndefinedIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUndefinedIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.UndefinedTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class PushUndefinedIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new UndefinedTreeItem(ins)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java similarity index 70% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java index 4a0b4e310..1c9155ffb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/PushWithIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushWithIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.WithObjectTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.WithTreeItem; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithObjectTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.WithTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java index 7ffb23187..df3573a59 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/stack/SwapIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.stack; +package com.jpexs.decompiler.flash.abc.avm2.instructions.stack; -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.MethodBody; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java index 84e06857b..5d503e543 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ApplyTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ApplyTypeTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.*; public class ApplyTypeIns extends InstructionDefinition { @@ -45,7 +45,7 @@ public class ApplyTypeIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int argCount = ins.operands[0]; List params = new ArrayList(); for (int i = 0; i < argCount; i++) { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java index 22bac03a6..d7a517392 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -47,7 +47,7 @@ public class AsTypeIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem val = (TreeItem) stack.pop(); stack.push(new AsTypeTreeItem(ins, val, new FullMultinameTreeItem(ins, ins.operands[0]))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java index 0f28f15aa..e1e9d1b42 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/AsTypeLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.avm2.treemodel.operations.AsTypeTreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.AsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,7 +44,7 @@ public class AsTypeLateIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem cls = (TreeItem) stack.pop(); TreeItem val = (TreeItem) stack.pop(); stack.push(new AsTypeTreeItem(ins, val, cls)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java index 7a45ab26f..c8ce22fff 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceAIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.CoerceTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -44,7 +44,7 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new CoerceTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java similarity index 70% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java index 3441154df..9132655c0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class CoerceIns extends InstructionDefinition implements CoerceOrConvertT } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; stack.push(new CoerceTreeItem(ins, (TreeItem) stack.pop(), constants.constant_multiname[multinameIndex].getName(constants, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java index 60fdd88e8..73a5c71ad 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceOrConvertTypeIns.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java index 24bae012b..09190c28f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/CoerceSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.CoerceTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class CoerceSIns extends InstructionDefinition implements CoerceOrConvert } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new CoerceTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java similarity index 72% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java index 741c7beef..b13fcd54d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertBIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -51,7 +51,7 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new ConvertTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java similarity index 74% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java index 2273edfaf..b188b3f93 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertDIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -59,7 +59,7 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new ConvertTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java similarity index 73% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java index b54790dbd..4bdd1c54f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -57,7 +57,7 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new ConvertTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java index 0ab9171c6..8f5c66610 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertOIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class ConvertOIns extends InstructionDefinition implements CoerceOrConver } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new ConvertTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java similarity index 69% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java index e53b8881f..9b759dae1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class ConvertSIns extends InstructionDefinition implements CoerceOrConver } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new ConvertTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java similarity index 68% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java index c7571b093..e4c7c5a27 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/ConvertUIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class ConvertUIns extends InstructionDefinition implements CoerceOrConver } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new ConvertTreeItem(ins, (TreeItem) stack.pop(), getTargetType(constants, ins, fullyQualifiedNames))); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java index 4dbc8fd16..20aa7846d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/InstanceOfIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/InstanceOfIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.InstanceOfTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class InstanceOfIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem type = (TreeItem) stack.pop(); TreeItem value = (TreeItem) stack.pop(); stack.push(new InstanceOfTreeItem(ins, value, type)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java similarity index 63% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java index 260796f55..3caad6054 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeIns.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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.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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.IsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -36,7 +36,7 @@ public class IsTypeIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { int multinameIndex = ins.operands[0]; TreeItem value = (TreeItem) stack.pop(); stack.push(new IsTypeTreeItem(ins, value, new FullMultinameTreeItem(ins, multinameIndex))); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java index 3209a3e6e..d6066d546 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/IsTypeLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/IsTypeLateIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.IsTypeTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class IsTypeLateIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem type = (TreeItem) stack.pop(); TreeItem value = (TreeItem) stack.pop(); stack.push(new IsTypeTreeItem(ins, value, type)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java similarity index 64% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java index 031c26575..cff241f5a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/types/TypeOfIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/TypeOfIns.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.types; +package com.jpexs.decompiler.flash.abc.avm2.instructions.types; -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 com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.operations.TypeOfTreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -34,7 +34,7 @@ public class TypeOfIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new TypeOfTreeItem(ins, (TreeItem) stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java similarity index 65% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java index e6eba505c..074fce387 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/CheckFilterIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.xml; +package com.jpexs.decompiler.flash.abc.avm2.instructions.xml; -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.FilteredCheckTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FilteredCheckTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -40,7 +40,7 @@ public class CheckFilterIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem obj = stack.pop(); stack.push(new FilteredCheckTreeItem(ins, obj)); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java similarity index 67% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java index 0b8b65661..6194bd9a7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.xml; +package com.jpexs.decompiler.flash.abc.avm2.instructions.xml; -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; -import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition; -import com.jpexs.asdec.abc.avm2.treemodel.DefaultXMLNamespace; -import com.jpexs.asdec.abc.avm2.treemodel.StringTreeItem; -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.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DefaultXMLNamespace; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.StringTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java index 2c4e844ef..18859d0ed 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.xml; +package com.jpexs.decompiler.flash.abc.avm2.instructions.xml; -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.DefaultXMLNamespace; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.DefaultXMLNamespace; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -41,7 +41,7 @@ public class DXNSLateIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { TreeItem xmlns = stack.pop(); output.add(new DefaultXMLNamespace(ins, xmlns)); diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java index 66ddf5130..76180b776 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.xml; +package com.jpexs.decompiler.flash.abc.avm2.instructions.xml; -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.EscapeXAttrTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXAttrTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class EscXAttrIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new EscapeXAttrTreeItem(ins, stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java similarity index 66% rename from trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java index 9646373d4..de1d83a35 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXElemIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.instructions.xml; +package com.jpexs.decompiler.flash.abc.avm2.instructions.xml; -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.EscapeXElemTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.LocalDataArea; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.EscapeXElemTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; import java.util.HashMap; import java.util.List; import java.util.Stack; @@ -42,7 +42,7 @@ public class EscXElemIns extends InstructionDefinition { } @Override - public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { + public void translate(boolean isStatic, int classIndex, java.util.HashMap localRegs, Stack stack, java.util.Stack scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List output, com.jpexs.decompiler.flash.abc.types.MethodBody body, com.jpexs.decompiler.flash.abc.ABC abc, HashMap localRegNames, List fullyQualifiedNames) { stack.push(new EscapeXElemTreeItem(ins, stack.pop())); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ASM3Parser.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ASM3Parser.java index e1f7f174a..ec13e8c6f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ASM3Parser.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ASM3Parser.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.parser; +package com.jpexs.decompiler.flash.abc.avm2.parser; -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.types.ABCException; -import com.jpexs.asdec.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.InstructionDefinition; +import com.jpexs.decompiler.flash.abc.types.ABCException; +import com.jpexs.decompiler.flash.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/parser/Flasm3Lexer.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java similarity index 97% rename from trunk/src/com/jpexs/asdec/abc/avm2/parser/Flasm3Lexer.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java index 2911a206f..bf640e3c4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/Flasm3Lexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/Flasm3Lexer.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.parser; +package com.jpexs.decompiler.flash.abc.avm2.parser; /** * This class is a scanner generated by JFlex * 1.4.3 on 19.9.10 10:36 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/asdec/abc/avm2/parser/flasm3.flex + * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/flasm3.flex */ public final class Flasm3Lexer { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/MissingSymbolHandler.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/MissingSymbolHandler.java index 0ef308859..4d60882ba 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/MissingSymbolHandler.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/MissingSymbolHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.parser; +package com.jpexs.decompiler.flash.abc.avm2.parser; public interface MissingSymbolHandler { diff --git a/trunk/src/com/jpexs/asdec/action/parser/ParseException.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ParseException.java similarity index 92% rename from trunk/src/com/jpexs/asdec/action/parser/ParseException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ParseException.java index ecbf939be..a4fdbf1b0 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ParseException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ParseException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.parser; +package com.jpexs.decompiler.flash.abc.avm2.parser; public class ParseException extends Exception { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ParsedSymbol.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ParsedSymbol.java index 7ba157bf7..31152e53a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParsedSymbol.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/ParsedSymbol.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.parser; +package com.jpexs.decompiler.flash.abc.avm2.parser; public class ParsedSymbol { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/flasm3.flex b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/flasm3.flex similarity index 99% rename from trunk/src/com/jpexs/asdec/abc/avm2/parser/flasm3.flex rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/flasm3.flex index d9c9948d6..b00259707 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/flasm3.flex +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/parser/flasm3.flex @@ -1,6 +1,6 @@ /* Flash assembler language lexer specification */ -package com.jpexs.asdec.abc.avm2.parser; +package com.jpexs.decompiler.flash.abc.avm2.parser; %% diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ApplyTypeTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ApplyTypeTreeItem.java index 40a549067..98c89efcf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ApplyTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ApplyTypeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/BooleanTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BooleanTreeItem.java index 355216f49..36611d2d1 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BooleanTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BooleanTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BreakTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BreakTreeItem.java index c706fe309..431975f7b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/BreakTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/BreakTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallMethodTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallMethodTreeItem.java index ad5f2ea64..ed566fce9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallMethodTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/CallPropertyTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallPropertyTreeItem.java index 42b7422fe..7ecd82085 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallPropertyTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/CallStaticTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallStaticTreeItem.java index 875edf427..13dc16557 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallStaticTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallStaticTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/CallSuperTreeItem.java similarity index 87% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallSuperTreeItem.java index 6fa82639f..e0c4ff652 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallSuperTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Highlighting; import 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/decompiler/flash/abc/avm2/treemodel/CallTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallTreeItem.java index 242591621..11ce5a67a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CallTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/ClassTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ClassTreeItem.java index 18e6750f3..f8ab1175d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ClassTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ClassTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CoerceTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CoerceTreeItem.java index 215433080..994f28e97 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CoerceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CoerceTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CommentTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CommentTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CommentTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CommentTreeItem.java index dd61bd3df..ee2ab95a4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/CommentTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/CommentTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructPropTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructPropTreeItem.java index e15591bcf..7264456f2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructPropTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructPropTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/ConstructSuperTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructSuperTreeItem.java index c2681d4b1..63dc7b7b6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructSuperTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Highlighting; import 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/decompiler/flash/abc/avm2/treemodel/ConstructTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructTreeItem.java index b0c55119b..76fe708a3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConstructTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConstructTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/ContinueTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ContinueTreeItem.java index 3dabe31a2..fa2805500 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ContinueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ContinueTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConvertTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConvertTreeItem.java index 6dddf2743..3179c892c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ConvertTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ConvertTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecLocalTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecLocalTreeItem.java index 437ef99e7..2325e4f95 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecLocalTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecrementTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecrementTreeItem.java index 00375ae77..56c1ae061 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DecrementTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DefaultXMLNamespace.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DefaultXMLNamespace.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DefaultXMLNamespace.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DefaultXMLNamespace.java index 27c2a83ac..6976c601a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/DefaultXMLNamespace.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/DefaultXMLNamespace.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EscapeXAttrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXAttrTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EscapeXAttrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXAttrTreeItem.java index cb84aa512..ce3455a9b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EscapeXAttrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXAttrTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EscapeXElemTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXElemTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EscapeXElemTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXElemTreeItem.java index 361173baa..7eaa2be09 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/EscapeXElemTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/EscapeXElemTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FilteredCheckTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FilteredCheckTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FilteredCheckTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FilteredCheckTreeItem.java index d1e133081..d812e6080 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FilteredCheckTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FilteredCheckTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FindPropertyTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FindPropertyTreeItem.java index f07d510c0..53e8306f2 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FindPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FindPropertyTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FloatValueTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FloatValueTreeItem.java index 273de1d96..0b94786d7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FloatValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FloatValueTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FullMultinameTreeItem.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FullMultinameTreeItem.java index e745c5c1a..fa495d60a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/FullMultinameTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.types.Namespace; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.types.Namespace; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetDescendantsTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetDescendantsTreeItem.java index fd63c6323..8734fe5e9 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetDescendantsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetDescendantsTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetLexTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetLexTreeItem.java index ae3f6f413..b0aceb836 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetLexTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetLexTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetPropertyTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetPropertyTreeItem.java index dafc23049..7cc9b8d48 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetPropertyTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSlotTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSlotTreeItem.java index 1ebdc3f22..dd63e4ef0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSlotTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSuperTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSuperTreeItem.java index 5eea48828..089fbda5e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/GetSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/GetSuperTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/HasNextTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/HasNextTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/HasNextTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/HasNextTreeItem.java index 3b8b0ef48..d00efa917 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/HasNextTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/HasNextTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InTreeItem.java index fe5413941..163559a13 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncLocalTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncLocalTreeItem.java index 2decdb16c..b09f4ce12 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncLocalTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncrementTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncrementTreeItem.java index f8592109d..a651e5989 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IncrementTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java index 863537dfd..f6f831b9f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/InitPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/InitPropertyTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IntegerValueTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IntegerValueTreeItem.java index 273b20972..cfdfde3d7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/IntegerValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/IntegerValueTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/LocalRegTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/LocalRegTreeItem.java index 2e1e75db1..88226ab9c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/LocalRegTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/LocalRegTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.FilterTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.FilterTreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java index 3cf7d48cf..388a000c7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameSpaceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameSpaceTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameValuePair.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameValuePair.java index 66be6ced5..802d38d51 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NameValuePair.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NameValuePair.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NanTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NanTreeItem.java index c0c315d4f..d7d6692bf 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NanTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NanTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewActivationTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewActivationTreeItem.java index e6de5d515..637f07ecb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewActivationTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewActivationTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewArrayTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewArrayTreeItem.java index 909e2f91b..8cae3393d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewArrayTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewArrayTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/NewFunctionTreeItem.java similarity index 87% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewFunctionTreeItem.java index 84989f43d..39f25f162 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewFunctionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewFunctionTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewObjectTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewObjectTreeItem.java index f0f5327d1..29643fc1a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NewObjectTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NextNameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextNameTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NextNameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextNameTreeItem.java index 72598c551..c1829e7eb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NextNameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextNameTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NextValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextValueTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NextValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextValueTreeItem.java index 0c0d61ca8..9102ae3b0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NextValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NextValueTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/NullTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NullTreeItem.java index 65fdf373c..de0fa313b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NullTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NullTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NumberValueTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NumberValueTreeItem.java index c9b2f5a3f..1f66c9e37 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/NumberValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/NumberValueTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; public abstract class NumberValueTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostDecrementTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostDecrementTreeItem.java index a388845c3..08eb1d9fd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostDecrementTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostIncrementTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostIncrementTreeItem.java index 5df3f349a..992f70bd0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/PostIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/PostIncrementTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnValueTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnValueTreeItem.java index 923ffd4dd..7845db49e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnValueTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnVoidTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnVoidTreeItem.java index 9b54db1f4..1f1db2ea8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ReturnVoidTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ReturnVoidTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetGlobalSlotTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetGlobalSlotTreeItem.java index 0599f6411..ff8eb2203 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetGlobalSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetGlobalSlotTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java index f79e9771f..8d1edcf03 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetLocalTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java index 2ea6c783d..ada9ecf9e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetPropertyTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java index 7186564af..e74a77300 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSlotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSlotTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; -import com.jpexs.asdec.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSuperTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSuperTreeItem.java index 2d5cf982d..d97cff22b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetSuperTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetSuperTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetTypeTreeItem.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetTypeTreeItem.java index 03935cf66..87f63d7a8 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/SetTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/SetTypeTreeItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/StringTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/StringTreeItem.java index 8378bae01..a37047626 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/StringTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/StringTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThisTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThisTreeItem.java index 31a5fdeae..fb3354520 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThisTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThisTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.types.Multiname; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThrowTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThrowTreeItem.java index d7848af62..dccd3004c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/ThrowTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java index 415aa6fb5..272977999 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UndefinedTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UndefinedTreeItem.java index b097c69a1..26096134e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UndefinedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UndefinedTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UnparsedTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UnparsedTreeItem.java index 213279309..24c63f83d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/UnparsedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/UnparsedTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithEndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithEndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java index 936495850..cad827c67 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithEndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithEndTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithObjectTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithObjectTreeItem.java index 86c2ecf44..c68bb03de 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithObjectTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java index 9dcc861d3..61768fdbd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/WithTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.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/XMLTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/XMLTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/XMLTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/XMLTreeItem.java index bda16e244..6a27d2879 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/XMLTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/XMLTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel; +package com.jpexs.decompiler.flash.abc.avm2.treemodel; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/AssignmentTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/AssignmentTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/AssignmentTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/AssignmentTreeItem.java index 8648af302..876ef5644 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/AssignmentTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/AssignmentTreeItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/Block.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/Block.java index 5a0b06357..16718f5db 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/Block.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/Block.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; import java.util.List; public interface Block { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DeclarationTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DeclarationTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DeclarationTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DeclarationTreeItem.java index dda653ac5..14d25144b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DeclarationTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DeclarationTreeItem.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.treemodel.CoerceTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ConvertTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetLocalTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.SetSlotTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.CoerceTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ConvertTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetLocalTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.SetSlotTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DoWhileTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DoWhileTreeItem.java index 01e5379d0..2e20c22df 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/DoWhileTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/DoWhileTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/clauses/ExceptionTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ExceptionTreeItem.java index 96e95459e..13a6cbf1b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ExceptionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ExceptionTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.ABCException; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.ABCException; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/FilterTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/FilterTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/FilterTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/FilterTreeItem.java index 8c568c7e1..622bcc6df 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/FilterTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/FilterTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java index 9f8d1dad0..311266e4d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForEachInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.*; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForInTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java index ca425057a..904046057 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.*; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/clauses/ForTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForTreeItem.java index 053e458c0..f15546da0 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/ForTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/clauses/IfTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/IfTreeItem.java index fa2ddb384..74c8b8141 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/IfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/IfTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/LoopTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/LoopTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/LoopTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/LoopTreeItem.java index dfe01f067..76b8b7f54 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/LoopTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/LoopTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public abstract class LoopTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/SwitchTreeItem.java similarity index 87% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/SwitchTreeItem.java index efb22eca2..e08808a7c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/SwitchTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/SwitchTreeItem.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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.treemodel.BreakTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.ContinueTreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.BreakTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/clauses/TernarOpTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TernarOpTreeItem.java index 5e84fc3de..686d4ad09 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TernarOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TernarOpTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java index 89022366e..1556aab5c 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/TryTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/avm2/treemodel/clauses/WhileTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/WhileTreeItem.java index b3432e933..f5c73d890 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/clauses/WhileTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/WhileTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.clauses; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/AddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AddTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java index 9901f47c5..464372673 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -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.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AndTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AndTreeItem.java index ba56d7fc5..e3b2a49fd 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AndTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class AndTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AsTypeTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AsTypeTreeItem.java index 847848fa2..3471d9317 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/AsTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AsTypeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class AsTypeTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BinaryOpTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BinaryOpTreeItem.java index 01bbf730c..cc5c4f1d4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BinaryOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BinaryOpTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -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.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitAndTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitAndTreeItem.java index a39d44591..3ca8cf250 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitAndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitAndTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class BitAndTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitNotTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitNotTreeItem.java index edb28492f..171dcb207 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitNotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitNotTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class BitNotTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitOrTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitOrTreeItem.java index b3b419c21..14f8dcc7f 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitOrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitOrTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class BitOrTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitXorTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitXorTreeItem.java index 4b03f0683..3c46c3853 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/BitXorTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/BitXorTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class BitXorTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java index 1a0e9263b..5fe31bcb7 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DeletePropertyTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -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 com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.FullMultinameTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DivideTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DivideTreeItem.java index dd5906795..fa521c158 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/DivideTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/DivideTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class DivideTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/EqTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/EqTreeItem.java index 15ed43a52..8ade7feda 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/EqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/EqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class EqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GeTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GeTreeItem.java index f47b28a48..458f759bb 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class GeTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GtTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GtTreeItem.java index 3d776ebd8..384333d04 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/GtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/GtTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class GtTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InTreeItem.java index 4f891de9b..13049ff54 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class InTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InstanceOfTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InstanceOfTreeItem.java index d5204d6dc..1b097c127 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/InstanceOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/InstanceOfTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class InstanceOfTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/IsTypeTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/IsTypeTreeItem.java index 70df35e3a..fcfb3c9af 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/IsTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/IsTypeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class IsTypeTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LShiftTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LShiftTreeItem.java index 0bed125c3..096888864 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LShiftTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class LShiftTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LeTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LeTreeItem.java index 66392d868..ec1f91563 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class LeTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LogicalOp.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LogicalOp.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LogicalOp.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LogicalOp.java index a947ba4fa..32bef8c53 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LogicalOp.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LogicalOp.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LtTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LtTreeItem.java index c6d2ba741..569710f44 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/LtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/LtTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class LtTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/ModuloTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/ModuloTreeItem.java index 77b99d057..17ba0543e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/ModuloTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/ModuloTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class ModuloTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/MultiplyTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/MultiplyTreeItem.java index bf43048a4..57798d1ae 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/MultiplyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/MultiplyTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class MultiplyTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NegTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NegTreeItem.java index c807de481..0189518af 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NegTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NegTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class NegTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NeqTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NeqTreeItem.java index 5136d17a2..1098d287d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NeqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class NeqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NotTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NotTreeItem.java index 0dea304fa..5c2a2e334 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/NotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/NotTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class NotTreeItem extends UnaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/OrTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/OrTreeItem.java index c3649b22c..76cb3a55b 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/OrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/OrTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class OrTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreDecrementTreeItem.java similarity index 75% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreDecrementTreeItem.java index 796d12c78..9547f85f6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreDecrementTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.avm2.treemodel.clauses.AssignmentTreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.clauses.AssignmentTreeItem; public class PreDecrementTreeItem extends UnaryOpTreeItem implements AssignmentTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreIncrementTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreIncrementTreeItem.java index 8d76678a1..3936c58b4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/PreIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/PreIncrementTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class PreIncrementTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/RShiftTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/RShiftTreeItem.java index 34c8bfb33..eeb0d78f6 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/RShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/RShiftTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class RShiftTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictEqTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictEqTreeItem.java index d3dfc99c2..79de6f36d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictEqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictEqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class StrictEqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictNeqTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictNeqTreeItem.java index 06877b94c..cab25938e 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/StrictNeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/StrictNeqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class StrictNeqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/SubtractTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/SubtractTreeItem.java index 04897e35e..9d1d8e399 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/SubtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/SubtractTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class SubtractTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/TypeOfTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/TypeOfTreeItem.java index 70e7c0630..e030512b3 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/TypeOfTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class TypeOfTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/URShiftTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/URShiftTreeItem.java index 09aff99cc..921bd3d5a 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/URShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/URShiftTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; public class URShiftTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/UnaryOpTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/UnaryOpTreeItem.java index d3fccf179..e0846aa62 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/operations/UnaryOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/UnaryOpTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.treemodel.operations; +package com.jpexs.decompiler.flash.abc.avm2.treemodel.operations; -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.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java index 9df447349..32285d5ee 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ABCComboBoxModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCComboBoxModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.Collections; import java.util.List; import javax.swing.ComboBoxModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java index d09b30b0d..9599a59b3 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ABCPanel.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.gui.tablemodels.*; -import com.jpexs.asdec.gui.View; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.gui.tablemodels.*; +import com.jpexs.decompiler.flash.gui.View; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.*; @@ -247,7 +247,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { JPanel searchPanel = new JPanel(); searchPanel.setLayout(new BorderLayout()); searchPanel.add(filterField, BorderLayout.CENTER); - JLabel picLabel = new JLabel(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/search.png"))); + JLabel picLabel = new JLabel(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/search.png"))); searchPanel.add(picLabel, BorderLayout.EAST); treePanel.add(searchPanel, BorderLayout.NORTH); diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java index 83ff6a39a..88f62ed7e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -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.graph.AVM2Graph; -import com.jpexs.asdec.abc.avm2.parser.ASM3Parser; -import com.jpexs.asdec.abc.avm2.parser.ParseException; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph; +import com.jpexs.decompiler.flash.abc.avm2.parser.ASM3Parser; +import com.jpexs.decompiler.flash.abc.avm2.parser.ParseException; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTree.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTree.java index b4edd3ab1..7c66d998b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTree.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTree.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.types.traits.Trait; -import com.jpexs.asdec.abc.types.traits.TraitClass; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.abc.types.traits.TraitClass; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,7 +53,7 @@ public class ClassesListTree extends JTree implements TreeSelectionListener { addTreeSelectionListener(this); DefaultTreeCellRenderer treeRenderer = new DefaultTreeCellRenderer(); ClassLoader cldr = this.getClass().getClassLoader(); - java.net.URL imageURL = cldr.getResource("com/jpexs/asdec/gui/graphics/as16.png"); + java.net.URL imageURL = cldr.getResource("com/jpexs/decompiler/flash/gui/graphics/as16.png"); ImageIcon leafIcon = new ImageIcon(imageURL); treeRenderer.setLeafIcon(leafIcon); setCellRenderer(treeRenderer); diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java index 0bf80032a..d8ace2912 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ClassesListTreeModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ClassesListTreeModel.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.types.traits.Trait; -import com.jpexs.asdec.abc.types.traits.TraitClass; +import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.abc.types.traits.TraitClass; import java.util.HashMap; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreeModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java similarity index 93% rename from trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java index c5cb3da9b..5c40071bb 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ConstantsListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ConstantsListModel.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; 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/decompiler/flash/abc/gui/DecompiledEditorPane.java similarity index 93% rename from trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java index 3439439ac..2bd81adc7 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DecompiledEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.ScriptInfo; -import com.jpexs.asdec.abc.types.traits.Trait; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.ScriptInfo; +import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DeobfuscationDialog.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/DeobfuscationDialog.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java index 668800641..a98d750e5 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DeobfuscationDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DeobfuscationDialog.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.gui.View; +import com.jpexs.decompiler.flash.gui.View; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java similarity index 96% rename from trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java index 702a2125b..51d04da26 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DetailPanel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; import java.awt.BorderLayout; import java.awt.CardLayout; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java index ba1448358..192820a8b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/DialogMissingSymbolHandler.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DialogMissingSymbolHandler.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.avm2.parser.MissingSymbolHandler; +import com.jpexs.decompiler.flash.abc.avm2.parser.MissingSymbolHandler; 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/decompiler/flash/abc/gui/GraphFrame.java similarity index 93% rename from trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/GraphFrame.java index cde7e15e2..a8b18a050 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/GraphFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/GraphFrame.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.graph.Graph; -import com.jpexs.asdec.graph.GraphPart; -import com.jpexs.asdec.gui.View; +import com.jpexs.decompiler.flash.graph.Graph; +import com.jpexs.decompiler.flash.graph.GraphPart; +import com.jpexs.decompiler.flash.gui.View; import java.awt.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/GraphTreeFrame.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/GraphTreeFrame.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/gui/GraphTreeFrame.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/GraphTreeFrame.java index d1776a490..48ffea40e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/GraphTreeFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/GraphTreeFrame.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.avm2.graph.AVM2Graph; -import com.jpexs.asdec.graph.GraphPart; +import com.jpexs.decompiler.flash.abc.avm2.graph.AVM2Graph; +import com.jpexs.decompiler.flash.graph.GraphPart; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java similarity index 85% rename from trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java index b4d64a5d8..b39a7c9fa 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/IconListRenderer.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/IconListRenderer.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; import java.awt.Component; import javax.swing.*; @@ -33,9 +33,9 @@ public class IconListRenderer } public IconListRenderer() { - constIcon = loadIcon("com/jpexs/asdec/abc/gui/graphics/constant.png"); - functionIcon = loadIcon("com/jpexs/asdec/abc/gui/graphics/function.png"); - variableIcon = loadIcon("com/jpexs/asdec/abc/gui/graphics/variable.png"); + constIcon = loadIcon("com/jpexs/decompiler/flash/abc/gui/graphics/constant.png"); + functionIcon = loadIcon("com/jpexs/decompiler/flash/abc/gui/graphics/function.png"); + variableIcon = loadIcon("com/jpexs/decompiler/flash/abc/gui/graphics/variable.png"); } @Override diff --git a/trunk/src/com/jpexs/asdec/abc/gui/LineMarkedEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/LineMarkedEditorPane.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java index a0a79b02c..257a31c95 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/LineMarkedEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/LineMarkedEditorPane.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; import java.awt.Color; import java.awt.FontMetrics; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java index d2f6b0616..a3ebf0b3b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MethodBodyParamsPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodBodyParamsPanel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.MethodBody; import java.awt.Color; import java.awt.Dimension; import java.text.NumberFormat; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MethodCodePanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodCodePanel.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/gui/MethodCodePanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodCodePanel.java index 956554008..2d59aec7e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MethodCodePanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodCodePanel.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.event.ActionEvent; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodInfoPanel.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodInfoPanel.java index 9f2aa1e27..720771db1 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MethodInfoPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodInfoPanel.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.methodinfo_parser.MethodInfoParser; -import com.jpexs.asdec.abc.methodinfo_parser.ParseException; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.methodinfo_parser.MethodInfoParser; +import com.jpexs.decompiler.flash.abc.methodinfo_parser.ParseException; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.helpers.Helper; import java.awt.Dimension; import java.util.ArrayList; import javax.swing.*; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/MethodTraitDetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/MethodTraitDetailPanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java index 5d24d7c7b..8aae7ea6b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/MethodTraitDetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/MethodTraitDetailPanel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java index eecefa6d7..a740881ed 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/SlotConstTraitDetailPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/SlotConstTraitDetailPanel.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.methodinfo_parser.MethodInfoParser; -import com.jpexs.asdec.abc.methodinfo_parser.ParseException; -import com.jpexs.asdec.abc.types.ValueKind; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.methodinfo_parser.MethodInfoParser; +import com.jpexs.decompiler.flash.abc.methodinfo_parser.ParseException; +import com.jpexs.decompiler.flash.abc.types.ValueKind; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.helpers.Helper; import java.awt.BorderLayout; import java.util.ArrayList; import javax.swing.*; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitDetail.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitDetail.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/gui/TraitDetail.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitDetail.java index 79ea76cd1..bd782a284 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitDetail.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitDetail.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java index 5dc4cdb07..4fb6e6444 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitsList.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsList.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; import javax.swing.DefaultListModel; import javax.swing.JList; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java index 1257301b8..9267aa094 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TraitsListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TraitsListModel.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.ArrayList; import java.util.List; import javax.swing.ListModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/Tree.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/Tree.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/Tree.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/Tree.java index c999cd9f9..9acb9de8a 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/Tree.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/Tree.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; import java.util.StringTokenizer; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TreeElement.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeElement.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/gui/TreeElement.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeElement.java index 27d6c17aa..408d69804 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TreeElement.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeElement.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; import java.util.*; import javax.swing.tree.TreePath; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TreeLeafScript.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeLeafScript.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/gui/TreeLeafScript.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeLeafScript.java index 6ac37812d..041b9a912 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TreeLeafScript.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeLeafScript.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.abc.ABC; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/gui/TreeVisitor.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeVisitor.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/gui/TreeVisitor.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeVisitor.java index 6011ab283..175bdf21b 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/TreeVisitor.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/TreeVisitor.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; public interface TreeVisitor { diff --git a/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java index 350e7693b..c7339d5b4 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/UsageFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageFrame.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.usages.InsideClassMultinameUsage; -import com.jpexs.asdec.abc.usages.MethodMultinameUsage; -import com.jpexs.asdec.abc.usages.MultinameUsage; -import com.jpexs.asdec.abc.usages.TraitMultinameUsage; -import com.jpexs.asdec.gui.View; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.usages.InsideClassMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.MethodMultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; +import com.jpexs.decompiler.flash.abc.usages.TraitMultinameUsage; +import com.jpexs.decompiler.flash.gui.View; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.awt.BorderLayout; import java.awt.Container; import java.awt.FlowLayout; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/UsageListModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/gui/UsageListModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java index 0cde26d47..c585738b1 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/UsageListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/UsageListModel.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui; +package com.jpexs.decompiler.flash.abc.gui; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.usages.MultinameUsage; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.usages.MultinameUsage; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; import javax.swing.DefaultListModel; diff --git a/trunk/src/com/jpexs/asdec/abc/gui/graphics/constant.png b/trunk/src/com/jpexs/decompiler/flash/abc/gui/graphics/constant.png similarity index 100% rename from trunk/src/com/jpexs/asdec/abc/gui/graphics/constant.png rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/graphics/constant.png diff --git a/trunk/src/com/jpexs/asdec/abc/gui/graphics/function.png b/trunk/src/com/jpexs/decompiler/flash/abc/gui/graphics/function.png similarity index 100% rename from trunk/src/com/jpexs/asdec/abc/gui/graphics/function.png rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/graphics/function.png diff --git a/trunk/src/com/jpexs/asdec/abc/gui/graphics/variable.png b/trunk/src/com/jpexs/decompiler/flash/abc/gui/graphics/variable.png similarity index 100% rename from trunk/src/com/jpexs/asdec/abc/gui/graphics/variable.png rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/graphics/variable.png diff --git a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java index 3ccfa1274..3c491efdd 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DecimalTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DecimalTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java index e43b1f9fc..7c7155c92 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/DoubleTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/DoubleTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/gui/tablemodels/IntTableModel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/IntTableModel.java index 543eed8b9..f4f5748ff 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/IntTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/IntTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java index cb08eec9a..16e83acf9 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/MultinameTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/MultinameTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.abc.ABC; import java.util.ArrayList; 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/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java index f813c167b..c8e789514 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceSetTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceSetTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java index c78fdb454..c597270dd 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/NamespaceTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/NamespaceTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/gui/tablemodels/StringTableModel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/StringTableModel.java index 4bd943485..d2b043903 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/StringTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/StringTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.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/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java rename to trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java index 823ff471b..51db8fff6 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/tablemodels/UIntTableModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/tablemodels/UIntTableModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.gui.tablemodels; +package com.jpexs.decompiler.flash.abc.gui.tablemodels; -import com.jpexs.asdec.abc.ABC; +import com.jpexs.decompiler.flash.abc.ABC; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; diff --git a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/MethodInfoLexer.java b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java similarity index 96% rename from trunk/src/com/jpexs/asdec/abc/methodinfo_parser/MethodInfoLexer.java rename to trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java index 320fb965d..80cc60032 100644 --- a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/MethodInfoLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.methodinfo_parser; +package com.jpexs.decompiler.flash.abc.methodinfo_parser; /** * This class is a scanner generated by JFlex * 1.4.3 on 11.7.11 15:46 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/methodinfo.flex + * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/methodinfo.flex */ public final class MethodInfoLexer { diff --git a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/MethodInfoParser.java b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoParser.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/methodinfo_parser/MethodInfoParser.java rename to trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoParser.java index 376c02c7f..58bc8a731 100644 --- a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/MethodInfoParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoParser.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.methodinfo_parser; +package com.jpexs.decompiler.flash.abc.methodinfo_parser; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.MethodInfo; -import com.jpexs.asdec.abc.types.ValueKind; -import com.jpexs.asdec.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.MethodInfo; +import com.jpexs.decompiler.flash.abc.types.ValueKind; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/ParseException.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/ParseException.java index c2458f772..c91a1ff67 100644 --- a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParseException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/ParseException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.methodinfo_parser; +package com.jpexs.decompiler.flash.abc.methodinfo_parser; public class ParseException extends Exception { diff --git a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParsedSymbol.java b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/ParsedSymbol.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParsedSymbol.java rename to trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/ParsedSymbol.java index baa804fa9..382c545c4 100644 --- a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/ParsedSymbol.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/ParsedSymbol.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.methodinfo_parser; +package com.jpexs.decompiler.flash.abc.methodinfo_parser; public class ParsedSymbol { diff --git a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/methodinfo.flex b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/methodinfo.flex similarity index 98% rename from trunk/src/com/jpexs/asdec/abc/methodinfo_parser/methodinfo.flex rename to trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/methodinfo.flex index ce51a7d0b..a51e27526 100644 --- a/trunk/src/com/jpexs/asdec/abc/methodinfo_parser/methodinfo.flex +++ b/trunk/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/methodinfo.flex @@ -1,6 +1,6 @@ /* Method info lexer specification */ -package com.jpexs.asdec.abc.methodinfo_parser; +package com.jpexs.decompiler.flash.abc.methodinfo_parser; %% diff --git a/trunk/src/com/jpexs/asdec/abc/types/ABCException.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/ABCException.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/types/ABCException.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/ABCException.java index a6bce46c9..86e98eea1 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ABCException.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/ABCException.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.ConvertException; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.ConvertException; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.Serializable; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/ClassInfo.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/ClassInfo.java index b0d028e70..6dbdec1a1 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ClassInfo.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/ClassInfo.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; import java.util.List; public class ClassInfo { diff --git a/trunk/src/com/jpexs/asdec/abc/types/Decimal.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/Decimal.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/types/Decimal.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/Decimal.java index b3f4c78d1..65a52cfd4 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/Decimal.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/Decimal.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/InstanceInfo.java similarity index 91% rename from trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/InstanceInfo.java index eeb613277..eb3fa1ec4 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/InstanceInfo.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/InstanceInfo.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/MetadataInfo.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/MetadataInfo.java index 00927c9a8..043b67090 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MetadataInfo.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/MetadataInfo.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.helpers.Helper; public class MetadataInfo { diff --git a/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/types/MethodBody.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java index 3c0e25b10..374872aa9 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MethodBody.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodBody.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.Main; -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.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.CodeStats; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.Serializable; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java similarity index 93% rename from trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java index 30bba29eb..1c8469e7f 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/MethodInfo.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/MethodInfo.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.helpers.Helper; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/types/Multiname.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/Multiname.java similarity index 95% rename from trunk/src/com/jpexs/asdec/abc/types/Multiname.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/Multiname.java index b07a05fd8..ceea40048 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/Multiname.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/Multiname.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import java.util.List; public class Multiname { diff --git a/trunk/src/com/jpexs/asdec/abc/types/Namespace.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/Namespace.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/types/Namespace.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/Namespace.java index bd7e10c31..eb0681cd3 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/Namespace.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/Namespace.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; public class Namespace { diff --git a/trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java index b0581a3e9..a328d7496 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/NamespaceSet.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/NamespaceSet.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; public class NamespaceSet { diff --git a/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/ScriptInfo.java similarity index 87% rename from trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/ScriptInfo.java index a1cb1f4b7..bc3631cb4 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ScriptInfo.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/ScriptInfo.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Trait; -import com.jpexs.asdec.abc.types.traits.TraitClass; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Trait; +import com.jpexs.decompiler.flash.abc.types.traits.TraitClass; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/abc/types/ValueKind.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java similarity index 94% rename from trunk/src/com/jpexs/asdec/abc/types/ValueKind.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java index 07c78c8ef..47e34d96b 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/ValueKind.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/ValueKind.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types; +package com.jpexs.decompiler.flash.abc.types; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.helpers.Helper; public class ValueKind { diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java index 67a664cbb..253ea0aa0 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/Trait.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types.traits; +package com.jpexs.decompiler.flash.abc.types.traits; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.Namespace; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.Namespace; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.io.Serializable; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java index acaa8780b..1271df057 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java @@ -14,27 +14,27 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types.traits; +package com.jpexs.decompiler.flash.abc.types.traits; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.AVM2Code; -import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction; -import com.jpexs.asdec.abc.avm2.instructions.construction.NewFunctionIns; -import com.jpexs.asdec.abc.avm2.instructions.other.FindPropertyIns; -import com.jpexs.asdec.abc.avm2.instructions.other.FindPropertyStrictIns; -import com.jpexs.asdec.abc.avm2.instructions.other.GetLexIns; -import com.jpexs.asdec.abc.avm2.instructions.types.AsTypeIns; -import com.jpexs.asdec.abc.avm2.instructions.types.CoerceIns; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.ABCException; -import com.jpexs.asdec.abc.types.MethodBody; -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.helpers.Helper; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.AVM2Code; +import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction; +import com.jpexs.decompiler.flash.abc.avm2.instructions.construction.NewFunctionIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.FindPropertyIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.FindPropertyStrictIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.other.GetLexIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.types.AsTypeIns; +import com.jpexs.decompiler.flash.abc.avm2.instructions.types.CoerceIns; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.ABCException; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.Namespace; +import com.jpexs.decompiler.flash.abc.types.NamespaceSet; +import com.jpexs.decompiler.flash.abc.types.ScriptInfo; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ArrayList; @@ -190,7 +190,7 @@ public class TraitClass extends Trait { } private void parseImportsUsagesFromMethodInfo(List abcTags, ABC abc, int method_index, List imports, List uses, String ignorePackage, List fullyQualifiedNames) { - if(method_index>abc.method_info.length){ + if (method_index > abc.method_info.length) { return; } if (abc.method_info[method_index].ret_type != 0) { diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java index fc8adbcd8..4fc9119c4 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitFunction.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types.traits; +package com.jpexs.decompiler.flash.abc.types.traits; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java index ab0625e2a..8304e9843 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitMethodGetterSetter.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitMethodGetterSetter.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types.traits; +package com.jpexs.decompiler.flash.abc.types.traits; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.MethodBody; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.MethodBody; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java index bb9d12d82..143b27e33 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/TraitSlotConst.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types.traits; +package com.jpexs.decompiler.flash.abc.types.traits; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.avm2.ConstantPool; -import com.jpexs.asdec.abc.avm2.treemodel.TreeItem; -import com.jpexs.asdec.abc.types.Multiname; -import com.jpexs.asdec.abc.types.Namespace; -import com.jpexs.asdec.abc.types.ValueKind; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; +import com.jpexs.decompiler.flash.abc.avm2.treemodel.TreeItem; +import com.jpexs.decompiler.flash.abc.types.Multiname; +import com.jpexs.decompiler.flash.abc.types.Namespace; +import com.jpexs.decompiler.flash.abc.types.ValueKind; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java similarity index 90% rename from trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java rename to trunk/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java index 686dc7d29..860fe965b 100644 --- a/trunk/src/com/jpexs/asdec/abc/types/traits/Traits.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/Traits.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.types.traits; +package com.jpexs.decompiler.flash.abc.types.traits; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.io.Serializable; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/usages/ClassNameMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ClassNameMultinameUsage.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/usages/ClassNameMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/ClassNameMultinameUsage.java index 2a444324c..1593e85e8 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/ClassNameMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ClassNameMultinameUsage.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/ConstVarMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarMultinameUsage.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/usages/ConstVarMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarMultinameUsage.java index 65d9c3a1e..4ac62bb37 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/ConstVarMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarMultinameUsage.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -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.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter; +import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/usages/ConstVarNameMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/usages/ConstVarNameMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java index 3171a1fe8..8774c4463 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/ConstVarNameMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/ConstVarTypeMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarTypeMultinameUsage.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/usages/ConstVarTypeMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarTypeMultinameUsage.java index bb73301af..a748e4ae3 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/ConstVarTypeMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ConstVarTypeMultinameUsage.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/ExtendsMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ExtendsMultinameUsage.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/usages/ExtendsMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/ExtendsMultinameUsage.java index bc670397d..641fa9470 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/ExtendsMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ExtendsMultinameUsage.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/ImplementsMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ImplementsMultinameUsage.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/usages/ImplementsMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/ImplementsMultinameUsage.java index de0c4080d..7cc74e4c9 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/ImplementsMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/ImplementsMultinameUsage.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/InsideClassMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java similarity index 88% rename from trunk/src/com/jpexs/asdec/abc/usages/InsideClassMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java index 9ba1f20f0..73f859070 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/InsideClassMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/InsideClassMultinameUsage.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/MethodBodyMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodBodyMultinameUsage.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/usages/MethodBodyMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodBodyMultinameUsage.java index 96ad3a9b5..c68542981 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/MethodBodyMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodBodyMultinameUsage.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/MethodMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodMultinameUsage.java similarity index 87% rename from trunk/src/com/jpexs/asdec/abc/usages/MethodMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodMultinameUsage.java index effd24bc5..dde88a671 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/MethodMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodMultinameUsage.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.TraitMethodGetterSetter; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/abc/usages/MethodNameMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/usages/MethodNameMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java index 2e7c96294..ea42c1e01 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/MethodNameMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/MethodParamsMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodParamsMultinameUsage.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/usages/MethodParamsMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodParamsMultinameUsage.java index 970edaad4..56f4b05c7 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/MethodParamsMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodParamsMultinameUsage.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/MethodReturnTypeMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodReturnTypeMultinameUsage.java similarity index 84% rename from trunk/src/com/jpexs/asdec/abc/usages/MethodReturnTypeMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodReturnTypeMultinameUsage.java index 23788d011..86ec402e2 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/MethodReturnTypeMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MethodReturnTypeMultinameUsage.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.types.traits.Traits; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/MultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MultinameUsage.java similarity index 83% rename from trunk/src/com/jpexs/asdec/abc/usages/MultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/MultinameUsage.java index fe2f413ef..4f47b2ba7 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/MultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/MultinameUsage.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/abc/usages/TraitMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/TraitMultinameUsage.java similarity index 89% rename from trunk/src/com/jpexs/asdec/abc/usages/TraitMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/TraitMultinameUsage.java index 1d35c82cb..af6d68238 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/TraitMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/TraitMultinameUsage.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.types.traits.Traits; +import com.jpexs.decompiler.flash.abc.types.traits.Traits; /** * diff --git a/trunk/src/com/jpexs/asdec/abc/usages/TypeNameMultinameUsage.java b/trunk/src/com/jpexs/decompiler/flash/abc/usages/TypeNameMultinameUsage.java similarity index 86% rename from trunk/src/com/jpexs/asdec/abc/usages/TypeNameMultinameUsage.java rename to trunk/src/com/jpexs/decompiler/flash/abc/usages/TypeNameMultinameUsage.java index 62d900ae9..5b020f51e 100644 --- a/trunk/src/com/jpexs/asdec/abc/usages/TypeNameMultinameUsage.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/usages/TypeNameMultinameUsage.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.usages; +package com.jpexs.decompiler.flash.abc.usages; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.tags.DoABCTag; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.tags.DoABCTag; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java similarity index 95% rename from trunk/src/com/jpexs/asdec/action/Action.java rename to trunk/src/com/jpexs/decompiler/flash/action/Action.java index e896620bb..2dc36f3cb 100644 --- a/trunk/src/com/jpexs/asdec/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -14,23 +14,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action; +package com.jpexs.decompiler.flash.action; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.parser.ParsedSymbol; -import com.jpexs.asdec.action.special.ActionNop; -import com.jpexs.asdec.action.swf4.*; -import com.jpexs.asdec.action.swf5.*; -import com.jpexs.asdec.action.swf6.ActionEnumerate2; -import com.jpexs.asdec.action.swf7.ActionDefineFunction2; -import com.jpexs.asdec.action.swf7.ActionTry; -import com.jpexs.asdec.action.treemodel.*; -import com.jpexs.asdec.action.treemodel.clauses.*; -import com.jpexs.asdec.action.treemodel.operations.NotTreeItem; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.parser.ParsedSymbol; +import com.jpexs.decompiler.flash.action.special.ActionNop; +import com.jpexs.decompiler.flash.action.swf4.*; +import com.jpexs.decompiler.flash.action.swf5.*; +import com.jpexs.decompiler.flash.action.swf6.ActionEnumerate2; +import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; +import com.jpexs.decompiler.flash.action.swf7.ActionTry; +import com.jpexs.decompiler.flash.action.treemodel.*; +import com.jpexs.decompiler.flash.action.treemodel.clauses.*; +import com.jpexs.decompiler.flash.action.treemodel.operations.NotTreeItem; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.*; diff --git a/trunk/src/com/jpexs/asdec/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java similarity index 92% rename from trunk/src/com/jpexs/asdec/action/ActionGraph.java rename to trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java index eb7345b06..5993fb2cb 100644 --- a/trunk/src/com/jpexs/asdec/action/ActionGraph.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java @@ -14,33 +14,33 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action; +package com.jpexs.decompiler.flash.action; -import com.jpexs.asdec.action.swf4.ActionIf; -import com.jpexs.asdec.action.swf4.ActionJump; -import com.jpexs.asdec.action.swf4.Null; -import com.jpexs.asdec.action.swf5.ActionReturn; -import com.jpexs.asdec.action.swf7.ActionThrow; -import com.jpexs.asdec.action.treemodel.BreakTreeItem; -import com.jpexs.asdec.action.treemodel.ContinueTreeItem; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.clauses.DoWhileTreeItem; -import com.jpexs.asdec.action.treemodel.clauses.ForTreeItem; -import com.jpexs.asdec.action.treemodel.clauses.IfTreeItem; -import com.jpexs.asdec.action.treemodel.clauses.SwitchTreeItem; -import com.jpexs.asdec.action.treemodel.clauses.TernarOpTreeItem; -import com.jpexs.asdec.action.treemodel.clauses.WhileTreeItem; -import com.jpexs.asdec.action.treemodel.operations.AndTreeItem; -import com.jpexs.asdec.action.treemodel.operations.LogicalOp; -import com.jpexs.asdec.action.treemodel.operations.NotTreeItem; -import com.jpexs.asdec.action.treemodel.operations.OrTreeItem; -import com.jpexs.asdec.action.treemodel.operations.StrictEqTreeItem; -import com.jpexs.asdec.graph.Graph; -import com.jpexs.asdec.graph.GraphPart; -import com.jpexs.asdec.graph.GraphPartMulti; -import com.jpexs.asdec.graph.Loop; +import com.jpexs.decompiler.flash.action.swf4.ActionIf; +import com.jpexs.decompiler.flash.action.swf4.ActionJump; +import com.jpexs.decompiler.flash.action.swf4.Null; +import com.jpexs.decompiler.flash.action.swf5.ActionReturn; +import com.jpexs.decompiler.flash.action.swf7.ActionThrow; +import com.jpexs.decompiler.flash.action.treemodel.BreakTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.treemodel.clauses.DoWhileTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.clauses.ForTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.clauses.IfTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.clauses.SwitchTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.clauses.TernarOpTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.clauses.WhileTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.operations.AndTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.operations.LogicalOp; +import com.jpexs.decompiler.flash.action.treemodel.operations.NotTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.operations.OrTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.graph.Graph; +import com.jpexs.decompiler.flash.graph.GraphPart; +import com.jpexs.decompiler.flash.graph.GraphPartMulti; +import com.jpexs.decompiler.flash.graph.Loop; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/trunk/src/com/jpexs/asdec/action/IgnoredPair.java b/trunk/src/com/jpexs/decompiler/flash/action/IgnoredPair.java similarity index 92% rename from trunk/src/com/jpexs/asdec/action/IgnoredPair.java rename to trunk/src/com/jpexs/decompiler/flash/action/IgnoredPair.java index 3fc3e1dfc..31c8970e3 100644 --- a/trunk/src/com/jpexs/asdec/action/IgnoredPair.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/IgnoredPair.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action; +package com.jpexs.decompiler.flash.action; /** * diff --git a/trunk/src/com/jpexs/asdec/action/TagNode.java b/trunk/src/com/jpexs/decompiler/flash/action/TagNode.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/TagNode.java rename to trunk/src/com/jpexs/decompiler/flash/action/TagNode.java index a31a8fc66..df9f6a0b8 100644 --- a/trunk/src/com/jpexs/asdec/action/TagNode.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/TagNode.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action; +package com.jpexs.decompiler.flash.action; -import com.jpexs.asdec.EventListener; -import com.jpexs.asdec.SWF; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.DefineButton2Tag; -import com.jpexs.asdec.tags.DefineButtonTag; -import com.jpexs.asdec.tags.DefineSpriteTag; -import com.jpexs.asdec.tags.DoInitActionTag; -import com.jpexs.asdec.tags.ExportAssetsTag; -import com.jpexs.asdec.tags.ShowFrameTag; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.tags.base.ASMSource; -import com.jpexs.asdec.tags.base.Container; +import com.jpexs.decompiler.flash.EventListener; +import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.DefineButton2Tag; +import com.jpexs.decompiler.flash.tags.DefineButtonTag; +import com.jpexs.decompiler.flash.tags.DefineSpriteTag; +import com.jpexs.decompiler.flash.tags.DoInitActionTag; +import com.jpexs.decompiler.flash.tags.ExportAssetsTag; +import com.jpexs.decompiler.flash.tags.ShowFrameTag; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.tags.base.ASMSource; +import com.jpexs.decompiler.flash.tags.base.Container; import java.io.File; import java.io.FileOutputStream; import java.util.ArrayList; @@ -160,9 +160,9 @@ public class TagNode { if (isPcode) { ret = Highlighting.stripHilights(((ASMSource) node.tag).getASMSource(SWF.DEFAULT_VERSION)); } else { - List as = ((ASMSource) node.tag).getActions(SWF.DEFAULT_VERSION); - com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION); - ret = (Highlighting.stripHilights(com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION))); + List as = ((ASMSource) node.tag).getActions(SWF.DEFAULT_VERSION); + com.jpexs.decompiler.flash.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION); + ret = (Highlighting.stripHilights(com.jpexs.decompiler.flash.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION))); } diff --git a/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java b/trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java similarity index 90% rename from trunk/src/com/jpexs/asdec/action/UnknownJumpException.java rename to trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java index 0244381cd..cc2be5a08 100644 --- a/trunk/src/com/jpexs/asdec/action/UnknownJumpException.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/UnknownJumpException.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action; +package com.jpexs.decompiler.flash.action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/flashlite/ActionFSCommand2.java b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/flashlite/ActionFSCommand2.java rename to trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java index 3a7a9f0a3..fc9bc2d03 100644 --- a/trunk/src/com/jpexs/asdec/action/flashlite/ActionFSCommand2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionFSCommand2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.flashlite; +package com.jpexs.decompiler.flash.action.flashlite; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.FSCommand2TreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.FSCommand2TreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.ArrayList; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/flashlite/ActionStrictMode.java b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java similarity index 77% rename from trunk/src/com/jpexs/asdec/action/flashlite/ActionStrictMode.java rename to trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java index 887ea6007..0a12bc17b 100644 --- a/trunk/src/com/jpexs/asdec/action/flashlite/ActionStrictMode.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/flashlite/ActionStrictMode.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.flashlite; +package com.jpexs.decompiler.flash.action.flashlite; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.StrictModeTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.StrictModeTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java rename to trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java index a8d27e10e..8a8fb7a05 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.gui; +package com.jpexs.decompiler.flash.action.gui; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWF; -import com.jpexs.asdec.abc.gui.GraphFrame; -import com.jpexs.asdec.abc.gui.LineMarkedEditorPane; -import com.jpexs.asdec.action.ActionGraph; -import com.jpexs.asdec.action.TagNode; -import com.jpexs.asdec.action.parser.ASMParser; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.helpers.Highlighting; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.tags.base.ASMSource; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.abc.gui.GraphFrame; +import com.jpexs.decompiler.flash.abc.gui.LineMarkedEditorPane; +import com.jpexs.decompiler.flash.action.ActionGraph; +import com.jpexs.decompiler.flash.action.TagNode; +import com.jpexs.decompiler.flash.action.parser.ASMParser; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.helpers.Highlighting; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.tags.base.ASMSource; import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.event.ActionEvent; @@ -66,7 +66,7 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action private String lastDisasm = ""; private boolean ignoreCarret = false; private boolean editMode = false; - private List lastCode; + private List lastCode; public ActionPanel(List list) { this.list = list; @@ -79,7 +79,7 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action DefaultTreeCellRenderer treeRenderer = new DefaultTreeCellRenderer(); ClassLoader cldr = this.getClass().getClassLoader(); - java.net.URL imageURL = cldr.getResource("com/jpexs/asdec/gui/graphics/as16.png"); + java.net.URL imageURL = cldr.getResource("com/jpexs/decompiler/flash/gui/graphics/as16.png"); ImageIcon leafIcon = new ImageIcon(imageURL); treeRenderer.setLeafIcon(leafIcon); tagTree.setCellRenderer(treeRenderer); @@ -213,11 +213,11 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action lastDisasm = Highlighting.stripHilights(lastDisasm); editor.setText(lastDisasm); if (Main.DO_DECOMPILE) { - List as = asm.getActions(SWF.DEFAULT_VERSION); + List as = asm.getActions(SWF.DEFAULT_VERSION); lastCode = as; - com.jpexs.asdec.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION); + com.jpexs.decompiler.flash.action.Action.setActionsAddresses(as, 0, SWF.DEFAULT_VERSION); decompiledEditor.setText("//Decompiling..."); - String s = com.jpexs.asdec.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION); + String s = com.jpexs.decompiler.flash.action.Action.actionsToSource(as, SWF.DEFAULT_VERSION); decompiledHilights = Highlighting.getInstrHighlights(s); decompiledEditor.setText(Highlighting.stripHilights(s)); } diff --git a/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/action/gui/TagTreeModel.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java rename to trunk/src/com/jpexs/decompiler/flash/action/gui/TagTreeModel.java index ed29dfd8e..86d3fddd1 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/TagTreeModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/gui/TagTreeModel.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.gui; +package com.jpexs.decompiler.flash.action.gui; -import com.jpexs.asdec.action.TagNode; -import com.jpexs.asdec.tags.*; +import com.jpexs.decompiler.flash.action.TagNode; +import com.jpexs.decompiler.flash.tags.*; import java.util.ArrayList; import java.util.List; import javax.swing.event.TreeModelListener; diff --git a/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java similarity index 95% rename from trunk/src/com/jpexs/asdec/action/parser/ASMParser.java rename to trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java index 373127188..c521e97e0 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ASMParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.parser; +package com.jpexs.decompiler.flash.action.parser; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.flashlite.ActionFSCommand2; -import com.jpexs.asdec.action.flashlite.ActionStrictMode; -import com.jpexs.asdec.action.special.ActionNop; -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.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.flashlite.ActionFSCommand2; +import com.jpexs.decompiler.flash.action.flashlite.ActionStrictMode; +import com.jpexs.decompiler.flash.action.special.ActionNop; +import com.jpexs.decompiler.flash.action.swf3.*; +import com.jpexs.decompiler.flash.action.swf4.*; +import com.jpexs.decompiler.flash.action.swf5.*; +import com.jpexs.decompiler.flash.action.swf6.*; +import com.jpexs.decompiler.flash.action.swf7.*; import 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/decompiler/flash/action/parser/FlasmLexer.java similarity index 96% rename from trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java rename to trunk/src/com/jpexs/decompiler/flash/action/parser/FlasmLexer.java index 0af5de221..73abfdca6 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/FlasmLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/FlasmLexer.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.parser; +package com.jpexs.decompiler.flash.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.decompiler.flash.action.swf4.ConstantIndex; +import com.jpexs.decompiler.flash.action.swf4.Null; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; +import com.jpexs.decompiler.flash.action.swf4.Undefined; /** * This class is a scanner generated by JFlex * 1.4.3 on 15.1.11 16:48 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/asdec/action/parser/flasm.flex + * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/src/com/jpexs/decompiler/flash/action/parser/flasm.flex */ public final class FlasmLexer { diff --git a/trunk/src/com/jpexs/asdec/action/parser/Label.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/Label.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/parser/Label.java rename to trunk/src/com/jpexs/decompiler/flash/action/parser/Label.java index 549ba9b05..102b7681f 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/Label.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/Label.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.parser; +package com.jpexs.decompiler.flash.action.parser; public class Label { diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/ParseException.java similarity index 92% rename from trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java rename to trunk/src/com/jpexs/decompiler/flash/action/parser/ParseException.java index 0f35b7596..fc9030d9d 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/parser/ParseException.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/ParseException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.abc.avm2.parser; +package com.jpexs.decompiler.flash.action.parser; public class ParseException extends Exception { diff --git a/trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/ParsedSymbol.java similarity index 94% rename from trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java rename to trunk/src/com/jpexs/decompiler/flash/action/parser/ParsedSymbol.java index a76e53ff6..0d6691154 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/ParsedSymbol.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/ParsedSymbol.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.parser; +package com.jpexs.decompiler.flash.action.parser; public class ParsedSymbol { diff --git a/trunk/src/com/jpexs/asdec/action/parser/flasm.flex b/trunk/src/com/jpexs/decompiler/flash/action/parser/flasm.flex similarity index 94% rename from trunk/src/com/jpexs/asdec/action/parser/flasm.flex rename to trunk/src/com/jpexs/decompiler/flash/action/parser/flasm.flex index 9387cabbe..a6c72896b 100644 --- a/trunk/src/com/jpexs/asdec/action/parser/flasm.flex +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/flasm.flex @@ -1,11 +1,11 @@ /* Flash assembler language lexer specification */ -package com.jpexs.asdec.action.parser; +package com.jpexs.decompiler.flash.action.parser; -import com.jpexs.asdec.action.swf4.ConstantIndex; -import com.jpexs.asdec.action.swf4.RegisterNumber; -import com.jpexs.asdec.action.swf4.Undefined; -import com.jpexs.asdec.action.swf4.Null; +import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; +import com.jpexs.decompiler.flash.action.swf4.Undefined; +import com.jpexs.decompiler.flash.action.swf4.Null; %% diff --git a/trunk/src/com/jpexs/asdec/action/special/ActionNop.java b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/special/ActionNop.java rename to trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java index 644377467..faa93ee2d 100644 --- a/trunk/src/com/jpexs/asdec/action/special/ActionNop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionNop.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.special; +package com.jpexs.decompiler.flash.action.special; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.List; import java.util.Stack; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java index 4c4430841..35f035c18 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGetURL.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGetURL.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.GetURLTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.GetURLTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java similarity index 77% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java index 22ab9f174..346003bd7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGoToLabel.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGoToLabel.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.GotoLabelTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.GotoLabelTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java similarity index 77% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java index 8683bd29e..4e5676a56 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionGotoFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionGotoFrame.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.GotoFrameTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.GotoFrameTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionNextFrame.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java index 2308de8de..923ba78c4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionNextFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionPlay.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java index c503d68b2..a9fa1aa2c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionPlay.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPlay.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionPrevFrame.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java index 7cb517bc6..20f0858a5 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionPrevFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionSetTarget.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java index 7ae897f71..2cb11af07 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionSetTarget.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.SetTargetTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.SetTargetTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java index 324b67ca2..52a98b45d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionStop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStop.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionStopSounds.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java index 3ab7ec7e2..e818a3131 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionStopSounds.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionStopSounds.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionToggleQuality.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java index 60cb261c7..9ac01e3a4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionToggleQuality.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionToggleQuality.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf3/ActionWaitForFrame.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java index 0c11a00ef..9f5ef335c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf3/ActionWaitForFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf3; +package com.jpexs.decompiler.flash.action.swf3; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.WaitForFrameTreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionAdd.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAdd.java index 90d952d44..87d44b7b5 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAdd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAdd.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionAnd.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAnd.java index 05064098a..180ab8322 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAnd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAnd.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.AndTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionAsciiToChar.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java index 802271254..dabb2da8c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionAsciiToChar.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.AsciiToCharTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.AsciiToCharTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionCall.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java index a15f40129..d04c5458e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCall.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CallTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CallTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionCharToAscii.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java index 74f9f0f7e..88e8f11e8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCharToAscii.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CharToAsciiTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CharToAsciiTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionCloneSprite.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java index ff79bf0d9..50e30c79d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionCloneSprite.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CloneSpriteTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CloneSpriteTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionDivide.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionDivide.java index dcdf6587c..d0ae8cc84 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionDivide.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionDivide.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.DivideTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionEndDrag.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java index 6760fc951..f1ae101d6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionEndDrag.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionEquals.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEquals.java index f26f46151..d5434159f 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionEquals.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionEquals.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.EqTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionGetProperty.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java index a5d9df25a..a430039c6 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetProperty.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.GetPropertyTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.GetPropertyTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionGetTime.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetTime.java index baf7af0a4..905ad57e8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetTime.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetTime.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SimpleActionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SimpleActionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionGetURL2.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java index ec6b7fe57..f37fd2cd3 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetURL2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.GetURL2TreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.GetURL2TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionGetVariable.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java index 834f7ffb8..d9449c71e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.GetVariableTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.GetVariableTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionGotoFrame2.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java index 738b703b8..1bf3c4971 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionGotoFrame2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.GotoFrame2TreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.GotoFrame2TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionIf.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index 964ca2634..174f09edc 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -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 com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java index 8dd91f11d..40078e4ce 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -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 com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java index 4320f4f33..946666418 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionLess.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionLess.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionMBAsciiToChar.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java index 648646880..d309a6778 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBAsciiToChar.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.MBAsciiToCharTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.MBAsciiToCharTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionMBCharToAscii.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java index 2cc397bc6..b9667f321 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBCharToAscii.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.MBCharToAsciiTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.MBCharToAsciiTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionMBStringExtract.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringExtract.java index 64f8a4b0e..06ef3a931 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringExtract.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringExtract.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.MBStringExtractTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.MBStringExtractTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionMBStringLength.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java index b1050e188..e4abf9019 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMBStringLength.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.MBStringLengthTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.MBStringLengthTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; 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/decompiler/flash/action/swf4/ActionMultiply.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMultiply.java index 1c21272c3..c4c313874 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionMultiply.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionMultiply.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.MultiplyTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionNot.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java index 3b6732302..fbee7d4ce 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionNot.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.NotTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionOr.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionOr.java index 7314505bb..51c7af64d 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionOr.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionOr.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.OrTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionPop.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java index 24fba1d6a..d3a5a1156 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionPop.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CallFunctionTreeItem; -import com.jpexs.asdec.action.treemodel.CallMethodTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CallFunctionTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.CallMethodTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; 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/decompiler/flash/action/swf4/ActionPush.java similarity index 90% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java index dbc51de5f..64c34ac2a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.parser.ParsedSymbol; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.parser.ParsedSymbol; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionRandomNumber.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java index afb8b201b..4a5464394 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionRandomNumber.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.RandomNumberTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.RandomNumberTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionRemoveSprite.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java index 6976f6049..33d55df1e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionRemoveSprite.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.RemoveSpriteTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.RemoveSpriteTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionSetProperty.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java index 5470ae2d6..4f051158e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetProperty.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.SetPropertyTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.SetPropertyTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionSetTarget2.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java index 5cc4798c3..e37df3e13 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetTarget2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SetTarget2TreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SetTarget2TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionSetVariable.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java index 7fa631dc4..c2077f53e 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSetVariable.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SetVariableTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SetVariableTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionStartDrag.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java index 5c664c685..73bccb340 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStartDrag.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.StartDragTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.StartDragTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionStringAdd.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java index b257ffcdc..735bba8f4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringAdd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringAdd.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.StringAddTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionStringEquals.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringEquals.java index a456b8f57..53bdbb893 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringEquals.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringEquals.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.StringEqTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionStringExtract.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringExtract.java index deed5c3d7..752866819 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringExtract.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringExtract.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.StringExtractTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.StringExtractTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionStringLength.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java index 22d32ceb9..4c63a39c4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLength.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.StringLengthTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionStringLess.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLess.java index 93c443943..53337b1ed 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionStringLess.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLess.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.StringLtTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionSubtract.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSubtract.java index 39b531348..5304d6ba7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionSubtract.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionSubtract.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.SubtractTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionToInteger.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java index b440bb04b..cf9ef0b53 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionToInteger.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ToIntegerTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ToIntegerTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionTrace.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java index cf8b5d727..34b8703ad 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionTrace.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TraceTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TraceTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ActionWaitForFrame2.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java index 172997ab6..8d5426e02 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ActionWaitForFrame2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.WaitForFrame2TreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf4/ConstantIndex.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/ConstantIndex.java index 25cf79126..ac71ebd32 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/ConstantIndex.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ConstantIndex.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.helpers.Helper; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/swf4/Null.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/Null.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/swf4/Null.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/Null.java index eb3b8c054..6ca66d0b1 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/Null.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/Null.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; public class Null { diff --git a/trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/RegisterNumber.java similarity index 92% rename from trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/RegisterNumber.java index abf3e2f76..753463202 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/RegisterNumber.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/RegisterNumber.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; public class RegisterNumber { diff --git a/trunk/src/com/jpexs/asdec/action/swf4/Undefined.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/Undefined.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/swf4/Undefined.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf4/Undefined.java index 9f8d379a9..cded702b7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf4/Undefined.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/Undefined.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf4; +package com.jpexs.decompiler.flash.action.swf4; public class Undefined { diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java index 34ef5cde8..c03df533a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionAdd2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionAdd2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.AddTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionBitAnd.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitAnd.java index 3a1018a07..248566443 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitAnd.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitAnd.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.BitAndTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionBitLShift.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitLShift.java index c59d93b11..21e7da2db 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitLShift.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitLShift.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.LShiftTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionBitOr.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitOr.java index edd2ca4e9..09fc071f4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitOr.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitOr.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.BitOrTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionBitRShift.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitRShift.java index 23a12c0ec..63ffd40fd 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitRShift.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitRShift.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.RShiftTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionBitURShift.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitURShift.java index 2520a1803..b8502765b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitURShift.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitURShift.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.URShiftTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionBitXor.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitXor.java index 89513eece..26bbe4cac 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionBitXor.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionBitXor.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.BitXorTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionCallFunction.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java index 2acf37903..b6e51fa97 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CallFunctionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CallFunctionTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionCallMethod.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java index 6f1c8f5b1..eb3cad70b 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionCallMethod.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CallMethodTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CallMethodTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionConstantPool.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java index d469d3029..9f94b2e84 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionConstantPool.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionConstantPool.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.parser.ParsedSymbol; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.parser.ParsedSymbol; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java index 78e566cce..451f4fdab 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDecrement.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DecrementTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DecrementTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionDefineFunction.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java index d47d931b2..c6e0b8249 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -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 com.jpexs.asdec.action.swf4.ActionPush; -import com.jpexs.asdec.action.swf7.ActionDefineFunction2; -import com.jpexs.asdec.action.treemodel.FunctionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.ASMParser; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.Label; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.swf4.ActionPush; +import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2; +import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionDefineLocal.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java index f6bd28519..5a781c874 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DefineLocalTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DefineLocalTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionDefineLocal2.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal2.java index 95b36aec2..c78346fa2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDefineLocal2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineLocal2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DefineLocalTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DefineLocalTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionDelete.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java index 93b17635b..9f69754c4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DeleteTreeItem; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DeleteTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.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/ActionDelete2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java index 79ee7149d..7bc2ddcea 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionDelete2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.DeleteTreeItem; -import com.jpexs.asdec.action.treemodel.DirectValueTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.DeleteTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem; +import com.jpexs.decompiler.flash.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/ActionEnumerate.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java index 1ace01202..495a3036c 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionEnumerate.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.EnumerateTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.EnumerateTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionEquals2.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEquals2.java index b4743e887..94536d86a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionEquals2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionEquals2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.EqTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionGetMember.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java index 3747e2555..1b5072121 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionGetMember.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.GetMemberTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.GetMemberTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionIncrement.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java index eb5f75aa0..04d8ab393 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionIncrement.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.IncrementTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.IncrementTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionInitArray.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java index 1575c91ba..6af86ddec 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitArray.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.InitArrayTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.InitArrayTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionInitObject.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java index 3448e4cfb..b16a072dc 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionInitObject.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.InitObjectTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.InitObjectTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionLess2.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionLess2.java index 54b4a511d..c286078d2 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionLess2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionLess2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.LtTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionModulo.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionModulo.java index 7ff352d9c..76c54414a 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionModulo.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionModulo.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.ModuloTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionNewMethod.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java index bc45ed8fd..b995ff447 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewMethod.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.NewMethodTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.NewMethodTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionNewObject.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java index 4f84bca93..f29454b89 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionNewObject.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.NewObjectTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.NewObjectTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionPushDuplicate.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java index 76d69d2f7..0bd9b1d25 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionPushDuplicate.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.IgnoredPair; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.IgnoredPair; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionReturn.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java index 8df94456b..13fcf7bf7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionReturn.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ReturnTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ReturnTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionSetMember.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java index 3088a42db..ec80bfc22 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionSetMember.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.SetMemberTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.SetMemberTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionStackSwap.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java index 63dcf4e13..dfb8a85a4 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionStackSwap.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStackSwap.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionStoreRegister.java similarity index 77% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java index 39eea444f..9bb018165 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionStoreRegister.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionStoreRegister.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.parser.FlasmLexer; -import com.jpexs.asdec.action.parser.ParseException; -import com.jpexs.asdec.action.swf4.RegisterNumber; -import com.jpexs.asdec.action.treemodel.StoreRegisterTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; +import com.jpexs.decompiler.flash.action.treemodel.StoreRegisterTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionTargetPath.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java index 2304ccf5e..599a32d72 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionTargetPath.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TargetPathTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TargetPathTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionToNumber.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java index 671d3575b..dddb11592 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionToNumber.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ToNumberTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ToNumberTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionToString.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java index 1c1caf74e..a6c194d46 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionToString.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ToStringTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ToStringTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionTypeOf.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java index 51a1b258c..af39a86d5 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionTypeOf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.TypeOfTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf5/ActionWith.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index b21030af3..795b8d6cc 100644 --- a/trunk/src/com/jpexs/asdec/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf5; +package com.jpexs.decompiler.flash.action.swf5; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -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 com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.ASMParser; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.Label; +import com.jpexs.decompiler.flash.action.parser.ParseException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java index f290ea0ef..073279296 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionEnumerate2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf6; +package com.jpexs.decompiler.flash.action.swf6; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.EnumerateTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.EnumerateTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf6/ActionGreater.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionGreater.java index 87957ac7c..8c6a32a33 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionGreater.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionGreater.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf6; +package com.jpexs.decompiler.flash.action.swf6; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf6/ActionInstanceOf.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java index 3744a1ee7..15bceb1ed 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionInstanceOf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf6; +package com.jpexs.decompiler.flash.action.swf6; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.InstanceOfTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf6/ActionStrictEquals.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStrictEquals.java index 1d29aabd0..d4a3d5469 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionStrictEquals.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStrictEquals.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf6; +package com.jpexs.decompiler.flash.action.swf6; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.StrictEqTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf6/ActionStringGreater.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStringGreater.java index b6576f741..e5681e5c7 100644 --- a/trunk/src/com/jpexs/asdec/action/swf6/ActionStringGreater.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf6/ActionStringGreater.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf6; +package com.jpexs.decompiler.flash.action.swf6; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.action.treemodel.operations.GtTreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf7/ActionCastOp.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java index 819504b69..35b7c1889 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionCastOp.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf7; +package com.jpexs.decompiler.flash.action.swf7; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.CastOpTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.CastOpTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf7/ActionDefineFunction2.java similarity index 89% rename from trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java index 2ed5ceee6..fcc2e3609 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf7; +package com.jpexs.decompiler.flash.action.swf7; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -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 com.jpexs.asdec.action.swf4.ActionPush; -import com.jpexs.asdec.action.swf5.ActionDefineFunction; -import com.jpexs.asdec.action.treemodel.FunctionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.ASMParser; +import com.jpexs.decompiler.flash.action.parser.FlasmLexer; +import com.jpexs.decompiler.flash.action.parser.Label; +import com.jpexs.decompiler.flash.action.parser.ParseException; +import com.jpexs.decompiler.flash.action.swf4.ActionPush; +import com.jpexs.decompiler.flash.action.swf5.ActionDefineFunction; +import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf7/ActionExtends.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java index 36d3fc666..c922eccb8 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionExtends.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf7; +package com.jpexs.decompiler.flash.action.swf7; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ExtendsTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ExtendsTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf7/ActionImplementsOp.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java index 33f87ba45..d42e92da9 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionImplementsOp.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf7; +package com.jpexs.decompiler.flash.action.swf7; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ImplementsOpTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ImplementsOpTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf7/ActionThrow.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionThrow.java index dde9c93e0..c52b9ff97 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionThrow.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionThrow.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf7; +package com.jpexs.decompiler.flash.action.swf7; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ThrowTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ThrowTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/swf7/ActionTry.java similarity index 93% rename from trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java rename to trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java index 733c2315b..670da4662 100644 --- a/trunk/src/com/jpexs/asdec/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.swf7; +package com.jpexs.decompiler.flash.action.swf7; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -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 com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.parser.*; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; +import com.jpexs.decompiler.flash.helpers.Helper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/AsciiToCharTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/AsciiToCharTreeItem.java index 16c7dfadb..da3f3df3b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/AsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/AsciiToCharTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class AsciiToCharTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class AsciiToCharTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/BreakTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/BreakTreeItem.java index 4487c859f..2150f244a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/BreakTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/BreakTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class BreakTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java index 3843fb4ef..2a9bac685 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallFunctionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallFunctionTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class CallFunctionTreeItem extends TreeItem { @@ -43,8 +43,8 @@ public class CallFunctionTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(functionName.getNeededActions()); for (TreeItem ti : arguments) { ret.addAll(ti.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java index b63ef8d7a..4a7c6c315 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallMethodTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallMethodTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.swf4.Undefined; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.swf4.Undefined; import java.util.List; public class CallMethodTreeItem extends TreeItem { @@ -60,8 +60,8 @@ public class CallMethodTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(methodName.getNeededActions()); ret.addAll(scriptObject.getNeededActions()); for (TreeItem ti : arguments) { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallTreeItem.java index 62738d5d0..24432e6b9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CallTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CallTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class CallTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class CallTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CastOpTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/CastOpTreeItem.java index c60ab1cb3..163f05537 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CastOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CastOpTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class CastOpTreeItem extends TreeItem { @@ -36,8 +36,8 @@ public class CastOpTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(constructor.getNeededActions()); ret.addAll(object.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CharToAsciiTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/CharToAsciiTreeItem.java index 87b04357b..1fc995500 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CharToAsciiTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class CharToAsciiTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class CharToAsciiTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CloneSpriteTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/CloneSpriteTreeItem.java index 08eed00ff..6530f45b2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/CloneSpriteTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/CloneSpriteTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class CloneSpriteTreeItem extends TreeItem { @@ -38,8 +38,8 @@ public class CloneSpriteTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(source.getNeededActions()); ret.addAll(target.getNeededActions()); ret.addAll(depth.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ConstantPool.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ConstantPool.java index 5a82f43d0..894a83ac4 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ConstantPool.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ConstantPool.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ContinueTreeItem.java similarity index 90% rename from trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ContinueTreeItem.java index c18be98b9..7f79f3ac8 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ContinueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ContinueTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class ContinueTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DecrementTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/DecrementTreeItem.java index 079ec140d..ba553d12f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DecrementTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class DecrementTreeItem extends TreeItem { @@ -44,8 +44,8 @@ public class DecrementTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineLocalTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineLocalTreeItem.java index 2ab7685a7..f2ac40633 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DefineLocalTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DefineLocalTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class DefineLocalTreeItem extends TreeItem { @@ -39,8 +39,8 @@ public class DefineLocalTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); ret.addAll(name.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DeleteTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/DeleteTreeItem.java index 84d7ebae3..4952634ce 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DeleteTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DeleteTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class DeleteTreeItem extends TreeItem { @@ -39,8 +39,8 @@ public class DeleteTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); ret.addAll(propertyName.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java index 54d86a50f..f750bd0e6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.swf4.ConstantIndex; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.swf4.ConstantIndex; +import com.jpexs.decompiler.flash.helpers.Helper; import java.util.List; public class DirectValueTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EachTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/EachTreeItem.java index e3520d03a..69a94b4d0 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/EachTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EachTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class EachTreeItem extends TreeItem { @@ -36,8 +36,8 @@ public class EachTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); ret.addAll(collection.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EnumerateTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/EnumerateTreeItem.java index 132f386a0..eabba9b41 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/EnumerateTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/EnumerateTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class EnumerateTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class EnumerateTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java index 26e3a1f7e..00ae50c85 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ExtendsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ExtendsTreeItem extends TreeItem { @@ -36,8 +36,8 @@ public class ExtendsTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(subclass.getNeededActions()); ret.addAll(superclass.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommand2TreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommand2TreeItem.java index 431519a1f..5a8485057 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/FSCommand2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FSCommand2TreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class FSCommand2TreeItem extends TreeItem { @@ -42,8 +42,8 @@ public class FSCommand2TreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(command.getNeededActions()); for (TreeItem ti : arguments) { ret.addAll(ti.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java index af982d747..32590831a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/FunctionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/FunctionTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class FunctionTreeItem extends TreeItem { @@ -61,8 +61,8 @@ public class FunctionTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); for (TreeItem ti : actions) { ret.addAll(ti.getNeededActions()); } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetMemberTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetMemberTreeItem.java index eb2db46e4..625a08c2c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetMemberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetMemberTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class GetMemberTreeItem extends TreeItem { @@ -40,8 +40,8 @@ public class GetMemberTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); ret.addAll(memberName.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetPropertyTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetPropertyTreeItem.java index 615d6ff6f..1fe72becc 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetPropertyTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class GetPropertyTreeItem extends TreeItem { @@ -39,8 +39,8 @@ public class GetPropertyTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(target.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java index b032f6f64..b67298634 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetURL2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURL2TreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class GetURL2TreeItem extends TreeItem { @@ -56,8 +56,8 @@ public class GetURL2TreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(urlString.getNeededActions()); ret.addAll(targetString.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java index 85f8e9e33..6634a3803 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetURLTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetURLTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.helpers.Helper; public class GetURLTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVariableTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVariableTreeItem.java index 504b5cfcf..677a96b8b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GetVariableTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GetVariableTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class GetVariableTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class GetVariableTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrame2TreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrame2TreeItem.java index 1bdbc510c..73c0e5fa4 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrame2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrame2TreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class GotoFrame2TreeItem extends TreeItem { @@ -44,8 +44,8 @@ public class GotoFrame2TreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(frame.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrameTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrameTreeItem.java index b7210e71c..90acc3681 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoFrameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoFrameTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class GotoFrameTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoLabelTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoLabelTreeItem.java index 904626f40..e19fdbe3b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/GotoLabelTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/GotoLabelTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.helpers.Helper; public class GotoLabelTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ImplementsOpTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ImplementsOpTreeItem.java index 99ca2217d..8011996e5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ImplementsOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ImplementsOpTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ImplementsOpTreeItem extends TreeItem { @@ -43,8 +43,8 @@ public class ImplementsOpTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(subclass.getNeededActions()); for (TreeItem ti : superclasses) { ret.addAll(ti.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/IncrementTreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/IncrementTreeItem.java index 841c72b70..0de4d6200 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/IncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/IncrementTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class IncrementTreeItem extends TreeItem { @@ -44,8 +44,8 @@ public class IncrementTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitArrayTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitArrayTreeItem.java index 54002213f..09b4fc160 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitArrayTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitArrayTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.IgnoredPair; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.IgnoredPair; import java.util.List; public class InitArrayTreeItem extends TreeItem { @@ -42,7 +42,7 @@ public class InitArrayTreeItem extends TreeItem { } @Override - public List getNeededActions() { + public List getNeededActions() { List ret = super.getNeededActions(); for (TreeItem value : values) { ret.addAll(value.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitObjectTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitObjectTreeItem.java index 88358f4ff..4b4ebdedc 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/InitObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/InitObjectTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class InitObjectTreeItem extends TreeItem { @@ -43,8 +43,8 @@ public class InitObjectTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); for (TreeItem name : names) { ret.addAll(name.getNeededActions()); } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBAsciiToCharTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBAsciiToCharTreeItem.java index 78ae8353b..7ec5bcae4 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBAsciiToCharTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBAsciiToCharTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class MBAsciiToCharTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class MBAsciiToCharTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBCharToAsciiTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBCharToAsciiTreeItem.java index 1251e6959..d7f26ad22 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBCharToAsciiTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBCharToAsciiTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class MBCharToAsciiTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class MBCharToAsciiTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringExtractTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringExtractTreeItem.java index 95df84d2a..62ae77bb4 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringExtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringExtractTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class MBStringExtractTreeItem extends TreeItem { @@ -38,8 +38,8 @@ public class MBStringExtractTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); ret.addAll(index.getNeededActions()); ret.addAll(count.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringLengthTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringLengthTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/treemodel/MBStringLengthTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringLengthTreeItem.java index 38bb60ef4..dfa62fc52 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/MBStringLengthTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/MBStringLengthTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class MBStringLengthTreeItem extends TreeItem { @@ -38,8 +38,8 @@ public class MBStringLengthTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewMethodTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewMethodTreeItem.java index 68b7fdc6d..673aa2cad 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewMethodTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewMethodTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.swf4.Undefined; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.swf4.Undefined; import java.util.List; public class NewMethodTreeItem extends TreeItem { @@ -65,8 +65,8 @@ public class NewMethodTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(methodName.getNeededActions()); ret.addAll(scriptObject.getNeededActions()); for (TreeItem ti : arguments) { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewObjectTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewObjectTreeItem.java index 250657209..5c0542d03 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/NewObjectTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/NewObjectTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class NewObjectTreeItem extends TreeItem { @@ -43,8 +43,8 @@ public class NewObjectTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(objectName.getNeededActions()); for (TreeItem ti : arguments) { ret.addAll(ti.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RandomNumberTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/RandomNumberTreeItem.java index 3ebb1af9e..aeaf63190 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/RandomNumberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RandomNumberTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class RandomNumberTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class RandomNumberTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(maximum.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RemoveSpriteTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/RemoveSpriteTreeItem.java index 44f47859a..a4ba5a201 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/RemoveSpriteTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/RemoveSpriteTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class RemoveSpriteTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class RemoveSpriteTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(target.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ReturnTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ReturnTreeItem.java index ae1791ebf..af33202c1 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ReturnTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ReturnTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ReturnTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class ReturnTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java index eaf6565f8..abed18458 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetMemberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { @@ -43,8 +43,8 @@ public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); ret.addAll(objectName.getNeededActions()); ret.addAll(value.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java index 193edc15f..f337fa680 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { @@ -46,8 +46,8 @@ public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(target.getNeededActions()); ret.addAll(value.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTarget2TreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTarget2TreeItem.java index be2e779a2..0a067428c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTarget2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTarget2TreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class SetTarget2TreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class SetTarget2TreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(target.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTargetTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTargetTreeItem.java index 2bdb6ec23..3af6de0e7 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTargetTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTargetTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.helpers.Helper; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.helpers.Helper; public class SetTargetTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTypeTreeItem.java similarity index 91% rename from trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTypeTreeItem.java index 7081d9381..ab177f875 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetTypeTreeItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; /** * diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java index 96bc4e66c..644a97eea 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SetVariableTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { @@ -41,8 +41,8 @@ public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(name.getNeededActions()); ret.addAll(value.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SimpleActionTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/SimpleActionTreeItem.java index 06fdc5163..94b144c24 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/SimpleActionTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SimpleActionTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class SimpleActionTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StartDragTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/StartDragTreeItem.java index 74c87cbfa..cd446591c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StartDragTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StartDragTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class StartDragTreeItem extends TreeItem { @@ -59,8 +59,8 @@ public class StartDragTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(target.getNeededActions()); ret.addAll(constrain.getNeededActions()); ret.addAll(x1.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StoreRegisterTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/StoreRegisterTreeItem.java index 27da2396e..9e37e45fc 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StoreRegisterTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StoreRegisterTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.swf4.RegisterNumber; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.swf4.RegisterNumber; import java.util.List; public class StoreRegisterTreeItem extends TreeItem implements SetTypeTreeItem { @@ -42,8 +42,8 @@ public class StoreRegisterTreeItem extends TreeItem implements SetTypeTreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StrictModeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StrictModeTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/action/treemodel/StrictModeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/StrictModeTreeItem.java index 4075cb7a9..4f143006d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StrictModeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StrictModeTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class StrictModeTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringExtractTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringExtractTreeItem.java index da573d4b5..0b5641ee5 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/StringExtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/StringExtractTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class StringExtractTreeItem extends TreeItem { @@ -38,8 +38,8 @@ public class StringExtractTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); ret.addAll(index.getNeededActions()); ret.addAll(count.getNeededActions()); diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TargetPathTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/TargetPathTreeItem.java index 22f9cb8bb..755fd466e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TargetPathTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TargetPathTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class TargetPathTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class TargetPathTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ThrowTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ThrowTreeItem.java index 289ad4d70..694597950 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ThrowTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ThrowTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ThrowTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class ThrowTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(object.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToIntegerTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToIntegerTreeItem.java index 591e57372..585f4ae14 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToIntegerTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToIntegerTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ToIntegerTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class ToIntegerTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToNumberTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToNumberTreeItem.java index 534bab8a4..d8428e4b2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToNumberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToNumberTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ToNumberTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class ToNumberTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToStringTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToStringTreeItem.java index 10e901fbf..1468815f2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/ToStringTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ToStringTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class ToStringTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class ToStringTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TraceTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/TraceTreeItem.java index d454a6d0d..bd4d588c2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TraceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TraceTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class TraceTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class TraceTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java index 3c7434308..7022bd87f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.IgnoredPair; -import com.jpexs.asdec.helpers.Highlighting; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.IgnoredPair; +import com.jpexs.decompiler.flash.helpers.Highlighting; import java.util.ArrayList; import java.util.List; @@ -114,8 +114,8 @@ public abstract class TreeItem { return Double.compare(toNumber(), 0.0) != 0; } - public List getNeededActions() { - List ret = new ArrayList(); + public List getNeededActions() { + List ret = new ArrayList(); if (instruction != null) { ret.add(new IgnoredPair(instruction, instructionPos)); } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TypeOfTreeItem.java similarity index 78% rename from trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/TypeOfTreeItem.java index ad4548f37..db52323e1 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/TypeOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TypeOfTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class TypeOfTreeItem extends TreeItem { @@ -34,8 +34,8 @@ public class TypeOfTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnsupportedTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnsupportedTreeItem.java index eb22a9d4f..f88463175 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/UnsupportedTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/UnsupportedTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class UnsupportedTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/VoidTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/VoidTreeItem.java index 581ffd400..e610b8a45 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/VoidTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/VoidTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class VoidTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/WaitForFrame2TreeItem.java similarity index 80% rename from trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/WaitForFrame2TreeItem.java index 9d3a0a410..2aa7cd386 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrame2TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/WaitForFrame2TreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; public class WaitForFrame2TreeItem extends TreeItem { @@ -36,8 +36,8 @@ public class WaitForFrame2TreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(frame.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/WaitForFrameTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/WaitForFrameTreeItem.java index 5a3bbc0d6..5611592f2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/WaitForFrameTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/WaitForFrameTreeItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel; +package com.jpexs.decompiler.flash.action.treemodel; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; public class WaitForFrameTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/Block.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/Block.java index 3996479a9..6702a8ec6 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/Block.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/Block.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.treemodel.clauses; -import com.jpexs.asdec.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; import java.util.List; public interface Block { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java similarity index 86% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java index 9e51c64fa..b4024083a 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ClassTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ClassTreeItem.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.FunctionTreeItem; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/DoWhileTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/DoWhileTreeItem.java index dc7336445..bb9fe79eb 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/DoWhileTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/DoWhileTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/treemodel/clauses/ForEachTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForEachTreeItem.java index 86a4c4514..76c11f2ad 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForEachTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForEachTreeItem.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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 com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.EachTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/treemodel/clauses/ForInTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForInTreeItem.java index 28e3d9828..c4f0e375f 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForInTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/treemodel/clauses/ForTreeItem.java similarity index 88% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForTreeItem.java index d933e50d6..7758e657c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/ForTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/ForTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/treemodel/clauses/IfTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/IfTreeItem.java index e73bc29da..fe1c404f9 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/IfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/IfTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/InterfaceTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/InterfaceTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/InterfaceTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/InterfaceTreeItem.java index 2fab65e50..16a13182b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/InterfaceTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/InterfaceTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.treemodel.clauses; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/LoopTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/LoopTreeItem.java index e10a90f2a..4d1b78094 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/LoopTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/LoopTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.treemodel.clauses; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public abstract class LoopTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/SwitchTreeItem.java similarity index 89% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/SwitchTreeItem.java index 5363399ec..f7ccdbf24 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/SwitchTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/SwitchTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TernarOpTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TernarOpTreeItem.java index 03b659d53..75ea24e5b 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TernarOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TernarOpTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.treemodel.clauses; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class TernarOpTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java similarity index 90% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java index 8f8a3fdf8..d7e6a3bf1 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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 com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/treemodel/clauses/WhileTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WhileTreeItem.java index 7eb03e9ae..6dbbe9bdf 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WhileTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WhileTreeItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.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.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.ContinueTreeItem; +import com.jpexs.decompiler.flash.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/decompiler/flash/action/treemodel/clauses/WithTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java index ca107d7ed..3a08c884d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/clauses/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.clauses; +package com.jpexs.decompiler.flash.action.treemodel.clauses; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AddTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AddTreeItem.java index 99dab3e1f..9e9816506 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AddTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class AddTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AndTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AndTreeItem.java index 3029aff0d..e9498bd37 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AndTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class AndTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AsTypeTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AsTypeTreeItem.java index 6ac0f125f..b39e37476 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/AsTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/AsTypeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class AsTypeTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BinaryOpTreeItem.java similarity index 79% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BinaryOpTreeItem.java index 5fdfbfac6..43be4054d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BinaryOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BinaryOpTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.List; public abstract class BinaryOpTreeItem extends TreeItem { @@ -57,8 +57,8 @@ public abstract class BinaryOpTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(leftSide.getNeededActions()); ret.addAll(rightSide.getNeededActions()); return ret; diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitAndTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitAndTreeItem.java index fa5287560..6941812d7 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitAndTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitAndTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class BitAndTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitNotTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitNotTreeItem.java index 8d80aa2b0..898e55743 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitNotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitNotTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class BitNotTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitOrTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitOrTreeItem.java index 8b02faab0..8a79ecded 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitOrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitOrTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class BitOrTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitXorTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitXorTreeItem.java index dbe259146..95cf4b68d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/BitXorTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/BitXorTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class BitXorTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/DivideTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/DivideTreeItem.java index 8b6eb71ca..ea77b7d21 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/DivideTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/DivideTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class DivideTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/EqTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/EqTreeItem.java index 6bd05e457..3ce8ec72c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/EqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/EqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class EqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GeTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GeTreeItem.java index b67eb6a48..146c15801 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class GeTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GtTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GtTreeItem.java index 5adb98bb6..0c5a65b75 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/GtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/GtTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class GtTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InTreeItem.java index b4917e133..b106dae89 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class InTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InstanceOfTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InstanceOfTreeItem.java index 65d7704f4..b1d38661e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/InstanceOfTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/InstanceOfTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class InstanceOfTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/IsTypeTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/IsTypeTreeItem.java index a871b0a18..5bd428a13 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/IsTypeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/IsTypeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class IsTypeTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LShiftTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LShiftTreeItem.java index df4b95ebc..9745a0f04 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LShiftTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class LShiftTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LeTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LeTreeItem.java index 0ac85d924..78289306d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LeTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LeTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class LeTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LogicalOp.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LogicalOp.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/LogicalOp.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LogicalOp.java index fe4fffa15..7738c69af 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LogicalOp.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LogicalOp.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; /** * diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LtTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LtTreeItem.java index 1368b5599..fb92d9c30 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/LtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/LtTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class LtTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/ModuloTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/ModuloTreeItem.java index 1b436135d..905f59702 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/ModuloTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/ModuloTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class ModuloTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/MultiplyTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/MultiplyTreeItem.java index 21b89c2a1..4fd610074 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/MultiplyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/MultiplyTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class MultiplyTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NegTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NegTreeItem.java index 4c4f09b4a..258dc15df 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NegTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NegTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class NegTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NeqTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NeqTreeItem.java index cf543420c..e7c2985e2 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NeqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class NeqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NotTreeItem.java similarity index 84% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NotTreeItem.java index 9ec7209fb..e3bcab5b1 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/NotTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/NotTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class NotTreeItem extends UnaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/OrTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/OrTreeItem.java index a313d8bb6..2e5fe28b4 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/OrTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/OrTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class OrTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreDecrementTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreDecrementTreeItem.java index 38457fc25..15f657a6c 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreDecrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreDecrementTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class PreDecrementTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreIncrementTreeItem.java similarity index 82% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreIncrementTreeItem.java index 0aee2c3fc..d1274391d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/PreIncrementTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/PreIncrementTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class PreIncrementTreeItem extends UnaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/RShiftTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/RShiftTreeItem.java index 68117f2a6..68918b13d 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/RShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/RShiftTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class RShiftTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictEqTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictEqTreeItem.java index c075a80ac..210ed0ee7 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictEqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictEqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class StrictEqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictNeqTreeItem.java similarity index 85% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictNeqTreeItem.java index fe7ea64f0..965cd2403 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StrictNeqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StrictNeqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class StrictNeqTreeItem extends BinaryOpTreeItem implements LogicalOp { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringAddTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringAddTreeItem.java index dedba1092..fc9481500 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringAddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringAddTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class StringAddTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringEqTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringEqTreeItem.java index 492718797..ea474bc12 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringEqTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringEqTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class StringEqTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLengthTreeItem.java similarity index 81% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLengthTreeItem.java index 53240f07c..2beecbb39 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLengthTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLengthTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class StringLengthTreeItem extends TreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLtTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLtTreeItem.java index 312b70e9c..33383f9c8 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/StringLtTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/StringLtTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class StringLtTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/SubtractTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/SubtractTreeItem.java index e512d6273..cff78065e 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/SubtractTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/SubtractTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class SubtractTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/URShiftTreeItem.java similarity index 83% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/URShiftTreeItem.java index a6f904223..af632d5f8 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/URShiftTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/URShiftTreeItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; public class URShiftTreeItem extends BinaryOpTreeItem { diff --git a/trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/UnaryOpTreeItem.java similarity index 75% rename from trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java rename to trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/UnaryOpTreeItem.java index 0363ae45f..271190c10 100644 --- a/trunk/src/com/jpexs/asdec/action/treemodel/operations/UnaryOpTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/operations/UnaryOpTreeItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.action.treemodel.operations; +package com.jpexs.decompiler.flash.action.treemodel.operations; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.action.treemodel.ConstantPool; -import com.jpexs.asdec.action.treemodel.TreeItem; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.treemodel.ConstantPool; +import com.jpexs.decompiler.flash.action.treemodel.TreeItem; import java.util.List; public abstract class UnaryOpTreeItem extends TreeItem { @@ -47,8 +47,8 @@ public abstract class UnaryOpTreeItem extends TreeItem { } @Override - public List getNeededActions() { - List ret = super.getNeededActions(); + public List getNeededActions() { + List ret = super.getNeededActions(); ret.addAll(value.getNeededActions()); return ret; } diff --git a/trunk/src/com/jpexs/asdec/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java similarity index 96% rename from trunk/src/com/jpexs/asdec/graph/Graph.java rename to trunk/src/com/jpexs/decompiler/flash/graph/Graph.java index 5cacfa6cc..dd8d4a0f4 100644 --- a/trunk/src/com/jpexs/asdec/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.graph; +package com.jpexs.decompiler.flash.graph; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/graph/GraphPart.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java similarity index 95% rename from trunk/src/com/jpexs/asdec/graph/GraphPart.java rename to trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java index d51b5331a..58d7496f4 100644 --- a/trunk/src/com/jpexs/asdec/graph/GraphPart.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.graph; +package com.jpexs.decompiler.flash.graph; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/graph/GraphPartMulti.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphPartMulti.java similarity index 94% rename from trunk/src/com/jpexs/asdec/graph/GraphPartMulti.java rename to trunk/src/com/jpexs/decompiler/flash/graph/GraphPartMulti.java index 225ae7971..c83c83334 100644 --- a/trunk/src/com/jpexs/asdec/graph/GraphPartMulti.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphPartMulti.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.graph; +package com.jpexs.decompiler.flash.graph; import java.util.Collections; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/graph/Loop.java b/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java similarity index 92% rename from trunk/src/com/jpexs/asdec/graph/Loop.java rename to trunk/src/com/jpexs/decompiler/flash/graph/Loop.java index c30031298..1c3603d66 100644 --- a/trunk/src/com/jpexs/asdec/graph/Loop.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/Loop.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.graph; +package com.jpexs.decompiler.flash.graph; /** * diff --git a/trunk/src/com/jpexs/asdec/gui/AboutDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java similarity index 92% rename from trunk/src/com/jpexs/asdec/gui/AboutDialog.java rename to trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java index 343a10201..507a87fab 100644 --- a/trunk/src/com/jpexs/asdec/gui/AboutDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/AboutDialog.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.Main; +import com.jpexs.decompiler.flash.Main; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -40,13 +40,13 @@ public class AboutDialog extends JDialog { Container cp = getContentPane(); cp.setLayout(new FlowLayout()); - JLabel jpLabel = new JLabel("JP"); + JLabel jpLabel = new JLabel("JPEXS"); jpLabel.setForeground(new Color(0, 0, 160)); jpLabel.setFont(new Font("Tahoma", Font.BOLD, 25)); jpLabel.setHorizontalAlignment(SwingConstants.CENTER); cp.add(jpLabel); - JLabel asLabel = new JLabel("ActionScript"); + JLabel asLabel = new JLabel("Free Flash"); asLabel.setFont(new Font("Tahoma", Font.BOLD, 25)); asLabel.setHorizontalAlignment(SwingConstants.CENTER); cp.add(asLabel); diff --git a/trunk/src/com/jpexs/asdec/gui/ImagePanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java similarity index 95% rename from trunk/src/com/jpexs/asdec/gui/ImagePanel.java rename to trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index 4102a957b..1ee507553 100644 --- a/trunk/src/com/jpexs/asdec/gui/ImagePanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; import java.awt.BorderLayout; import java.awt.Image; diff --git a/trunk/src/com/jpexs/asdec/gui/LinkLabel.java b/trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java similarity index 95% rename from trunk/src/com/jpexs/asdec/gui/LinkLabel.java rename to trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java index f737df9bf..d6bff2d02 100644 --- a/trunk/src/com/jpexs/asdec/gui/LinkLabel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LinkLabel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; import java.awt.Cursor; import java.awt.event.MouseEvent; diff --git a/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java similarity index 94% rename from trunk/src/com/jpexs/asdec/gui/LoadingDialog.java rename to trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java index ad63c0505..ce8e2b05f 100644 --- a/trunk/src/com/jpexs/asdec/gui/LoadingDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.Main; +import com.jpexs.decompiler.flash.Main; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.WindowAdapter; diff --git a/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java similarity index 92% rename from trunk/src/com/jpexs/asdec/gui/LoadingPanel.java rename to trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java index 11efe202d..458bf11df 100644 --- a/trunk/src/com/jpexs/asdec/gui/LoadingPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingPanel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; import java.awt.Graphics; import java.awt.Image; @@ -42,7 +42,7 @@ public class LoadingPanel extends JPanel { public LoadingPanel(int iconWidth, int iconHeight) { this.iconWidth = iconWidth; this.iconHeight = iconHeight; - ImageIcon icon = (new ImageIcon(this.getClass().getResource("/com/jpexs/asdec/gui/graphics/loading.png"))); + ImageIcon icon = (new ImageIcon(this.getClass().getResource("/com/jpexs/decompiler/flash/gui/graphics/loading.png"))); animationImage = icon.getImage(); java.util.Timer timer = new java.util.Timer(); timer.schedule(new java.util.TimerTask() { diff --git a/trunk/src/com/jpexs/asdec/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java similarity index 86% rename from trunk/src/com/jpexs/asdec/gui/MainFrame.java rename to trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java index 25f00f827..d99c89509 100644 --- a/trunk/src/com/jpexs/asdec/gui/MainFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -14,46 +14,46 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.Configuration; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWF; -import com.jpexs.asdec.abc.gui.ABCPanel; -import com.jpexs.asdec.abc.gui.DeobfuscationDialog; -import com.jpexs.asdec.abc.gui.TreeLeafScript; -import com.jpexs.asdec.action.gui.ActionPanel; -import com.jpexs.asdec.helpers.Helper; -import com.jpexs.asdec.tags.DefineBitsJPEG2Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG3Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG4Tag; -import com.jpexs.asdec.tags.DefineBitsLossless2Tag; -import com.jpexs.asdec.tags.DefineBitsLosslessTag; -import com.jpexs.asdec.tags.DefineBitsTag; -import com.jpexs.asdec.tags.DefineButton2Tag; -import com.jpexs.asdec.tags.DefineButtonTag; -import com.jpexs.asdec.tags.DefineEditTextTag; -import com.jpexs.asdec.tags.DefineFont2Tag; -import com.jpexs.asdec.tags.DefineFont3Tag; -import com.jpexs.asdec.tags.DefineFont4Tag; -import com.jpexs.asdec.tags.DefineFontTag; -import com.jpexs.asdec.tags.DefineMorphShape2Tag; -import com.jpexs.asdec.tags.DefineMorphShapeTag; -import com.jpexs.asdec.tags.DefineShape2Tag; -import com.jpexs.asdec.tags.DefineShape3Tag; -import com.jpexs.asdec.tags.DefineShape4Tag; -import com.jpexs.asdec.tags.DefineShapeTag; -import com.jpexs.asdec.tags.DefineSpriteTag; -import com.jpexs.asdec.tags.DefineText2Tag; -import com.jpexs.asdec.tags.DefineTextTag; -import com.jpexs.asdec.tags.DoABCTag; -import com.jpexs.asdec.tags.DoInitActionTag; -import com.jpexs.asdec.tags.ExportAssetsTag; -import com.jpexs.asdec.tags.JPEGTablesTag; -import com.jpexs.asdec.tags.ShowFrameTag; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.tags.base.ASMSource; -import com.jpexs.asdec.tags.base.Container; +import com.jpexs.decompiler.flash.Configuration; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.abc.gui.ABCPanel; +import com.jpexs.decompiler.flash.abc.gui.DeobfuscationDialog; +import com.jpexs.decompiler.flash.abc.gui.TreeLeafScript; +import com.jpexs.decompiler.flash.action.gui.ActionPanel; +import com.jpexs.decompiler.flash.helpers.Helper; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG4Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLossless2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLosslessTag; +import com.jpexs.decompiler.flash.tags.DefineBitsTag; +import com.jpexs.decompiler.flash.tags.DefineButton2Tag; +import com.jpexs.decompiler.flash.tags.DefineButtonTag; +import com.jpexs.decompiler.flash.tags.DefineEditTextTag; +import com.jpexs.decompiler.flash.tags.DefineFont2Tag; +import com.jpexs.decompiler.flash.tags.DefineFont3Tag; +import com.jpexs.decompiler.flash.tags.DefineFont4Tag; +import com.jpexs.decompiler.flash.tags.DefineFontTag; +import com.jpexs.decompiler.flash.tags.DefineMorphShape2Tag; +import com.jpexs.decompiler.flash.tags.DefineMorphShapeTag; +import com.jpexs.decompiler.flash.tags.DefineShape2Tag; +import com.jpexs.decompiler.flash.tags.DefineShape3Tag; +import com.jpexs.decompiler.flash.tags.DefineShape4Tag; +import com.jpexs.decompiler.flash.tags.DefineShapeTag; +import com.jpexs.decompiler.flash.tags.DefineSpriteTag; +import com.jpexs.decompiler.flash.tags.DefineText2Tag; +import com.jpexs.decompiler.flash.tags.DefineTextTag; +import com.jpexs.decompiler.flash.tags.DoABCTag; +import com.jpexs.decompiler.flash.tags.DoInitActionTag; +import com.jpexs.decompiler.flash.tags.ExportAssetsTag; +import com.jpexs.decompiler.flash.tags.JPEGTablesTag; +import com.jpexs.decompiler.flash.tags.ShowFrameTag; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.tags.base.ASMSource; +import com.jpexs.decompiler.flash.tags.base.Container; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; @@ -162,30 +162,30 @@ public class MainFrame extends JFrame implements ActionListener { JMenu menuFile = new JMenu("File"); JMenuItem miOpen = new JMenuItem("Open..."); - miOpen.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/open16.png"))); + miOpen.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/open16.png"))); miOpen.setActionCommand("OPEN"); miOpen.addActionListener(this); JMenuItem miSave = new JMenuItem("Save"); - miSave.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/save16.png"))); + miSave.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/save16.png"))); miSave.setActionCommand("SAVE"); miSave.addActionListener(this); JMenuItem miSaveAs = new JMenuItem("Save as..."); - miSaveAs.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/saveas16.png"))); + miSaveAs.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/saveas16.png"))); miSaveAs.setActionCommand("SAVEAS"); miSaveAs.addActionListener(this); JMenu menuExportAll = new JMenu("Export all"); JMenuItem miExportAllAS = new JMenuItem("ActionScript..."); - miExportAllAS.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/as16.png"))); + miExportAllAS.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/as16.png"))); miExportAllAS.setActionCommand("EXPORT"); miExportAllAS.addActionListener(this); JMenuItem miExportAllPCode = new JMenuItem("PCode..."); - miExportAllPCode.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/pcode16.png"))); + miExportAllPCode.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/pcode16.png"))); miExportAllPCode.setActionCommand("EXPORTPCODE"); miExportAllPCode.addActionListener(this); JMenuItem miExportImages = new JMenuItem("Images..."); - miExportImages.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/image16.png"))); + miExportImages.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/image16.png"))); miExportImages.setActionCommand("EXPORTIMAGES"); miExportImages.addActionListener(this); @@ -196,17 +196,17 @@ public class MainFrame extends JFrame implements ActionListener { JMenu menuExportSel = new JMenu("Export selection"); JMenuItem miExportSelAS = new JMenuItem("ActionScript..."); - miExportSelAS.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/as16.png"))); + miExportSelAS.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/as16.png"))); miExportSelAS.setActionCommand("EXPORTSEL"); miExportSelAS.addActionListener(this); JMenuItem miExportSelPCode = new JMenuItem("PCode..."); - miExportSelPCode.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/pcode16.png"))); + miExportSelPCode.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/pcode16.png"))); miExportSelPCode.setActionCommand("EXPORTPCODESEL"); miExportSelPCode.addActionListener(this); JMenuItem miExportSelImages = new JMenuItem("Images..."); - miExportSelImages.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/image16.png"))); + miExportSelImages.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/image16.png"))); miExportSelImages.setActionCommand("EXPORTIMAGESSEL"); miExportSelImages.addActionListener(this); @@ -222,7 +222,7 @@ public class MainFrame extends JFrame implements ActionListener { menuFile.add(menuExportSel); menuFile.addSeparator(); JMenuItem miClose = new JMenuItem("Exit"); - miClose.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exit16.png"))); + miClose.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/exit16.png"))); miClose.setActionCommand("EXIT"); miClose.addActionListener(this); menuFile.add(miClose); @@ -283,7 +283,7 @@ public class MainFrame extends JFrame implements ActionListener { JMenu menuTools = new JMenu("Tools"); JMenuItem miProxy = new JMenuItem("Proxy"); miProxy.setActionCommand("SHOWPROXY"); - miProxy.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/proxy16.png"))); + miProxy.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy16.png"))); miProxy.addActionListener(this); menuTools.add(miProxy); @@ -328,35 +328,35 @@ public class MainFrame extends JFrame implements ActionListener { getContentPane().add(tabPane, BorderLayout.CENTER); if (!abcList.isEmpty()) { - addTab(tabPane, abcPanel = new ABCPanel(abcList), "ActionScript3", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/as16.png"))); + addTab(tabPane, abcPanel = new ABCPanel(abcList), "ActionScript3", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/as16.png"))); } else { actionPanel = new ActionPanel(swf.tags); if (actionPanel.tagTree.getRowCount() > 1) { - addTab(tabPane, actionPanel, "ActionScript", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/as16.png"))); + addTab(tabPane, actionPanel, "ActionScript", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/as16.png"))); } menuDeobfuscation.setEnabled(false); } if (!shapes.isEmpty()) { - addTab(tabPane, shapesTagPanel = new TagPanel(shapes, swf), "Shapes", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/shape16.png"))); + addTab(tabPane, shapesTagPanel = new TagPanel(shapes, swf), "Shapes", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/shape16.png"))); } if (!morphShapes.isEmpty()) { - addTab(tabPane, morphshapesTagPanel = new TagPanel(morphShapes, swf), "MorphShapes", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/morphshape16.png"))); + addTab(tabPane, morphshapesTagPanel = new TagPanel(morphShapes, swf), "MorphShapes", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/morphshape16.png"))); } if (!images.isEmpty()) { - addTab(tabPane, imagesTagPanel = new TagPanel(images, swf), "Images", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/image16.png"))); + addTab(tabPane, imagesTagPanel = new TagPanel(images, swf), "Images", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/image16.png"))); } if (!sprites.isEmpty()) { - addTab(tabPane, spritesTagPanel = new TagPanel(sprites, swf), "Sprites", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/sprite16.png"))); + addTab(tabPane, spritesTagPanel = new TagPanel(sprites, swf), "Sprites", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/sprite16.png"))); } if (!fonts.isEmpty()) { - addTab(tabPane, fontsTagPanel = new TagPanel(fonts, swf), "Fonts", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/font16.png"))); + addTab(tabPane, fontsTagPanel = new TagPanel(fonts, swf), "Fonts", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/font16.png"))); } if (!texts.isEmpty()) { - addTab(tabPane, textsTagPanel = new TagPanel(texts, swf), "Texts", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/text16.png"))); + addTab(tabPane, textsTagPanel = new TagPanel(texts, swf), "Texts", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/text16.png"))); } if (!buttons.isEmpty()) { - addTab(tabPane, buttonsTagPanel = new TagPanel(buttons, swf), "Buttons", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/asdec/gui/graphics/button16.png"))); + addTab(tabPane, buttonsTagPanel = new TagPanel(buttons, swf), "Buttons", new ImageIcon(this.getClass().getClassLoader().getResource("com/jpexs/decompiler/flash/gui/graphics/button16.png"))); } @@ -670,7 +670,7 @@ public class MainFrame extends JFrame implements ActionListener { try { Main.saveFile(Main.file); } catch (IOException ex) { - Logger.getLogger(com.jpexs.asdec.abc.gui.ABCPanel.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(com.jpexs.decompiler.flash.abc.gui.ABCPanel.class.getName()).log(Level.SEVERE, null, ex); JOptionPane.showMessageDialog(null, "Cannot save file", "Error", JOptionPane.ERROR_MESSAGE); } } @@ -733,15 +733,15 @@ public class MainFrame extends JFrame implements ActionListener { tls.abc.script_info[tls.scriptIndex].export(tls.abc, abcPanel.list, selFile, isPcode); } } else if (actionPanel != null) { - List nodes = actionPanel.getSelectedNodes(); + List nodes = actionPanel.getSelectedNodes(); if (nodes.isEmpty()) { JOptionPane.showMessageDialog(null, "No nodes selected!"); } - com.jpexs.asdec.action.gui.TagTreeModel ttm = (com.jpexs.asdec.action.gui.TagTreeModel) actionPanel.tagTree.getModel(); - List allnodes = ttm.getNodeList(); - com.jpexs.asdec.action.TagNode.setExport(allnodes, false); - com.jpexs.asdec.action.TagNode.setExport(nodes, true); - com.jpexs.asdec.action.TagNode.exportNode(allnodes, selFile, isPcode); + com.jpexs.decompiler.flash.action.gui.TagTreeModel ttm = (com.jpexs.decompiler.flash.action.gui.TagTreeModel) actionPanel.tagTree.getModel(); + List allnodes = ttm.getNodeList(); + com.jpexs.decompiler.flash.action.TagNode.setExport(allnodes, false); + com.jpexs.decompiler.flash.action.TagNode.setExport(nodes, true); + com.jpexs.decompiler.flash.action.TagNode.exportNode(allnodes, selFile, isPcode); } } else { if (images) { diff --git a/trunk/src/com/jpexs/asdec/gui/ModeFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java similarity index 88% rename from trunk/src/com/jpexs/asdec/gui/ModeFrame.java rename to trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java index 61d0fd2de..2bc0749a9 100644 --- a/trunk/src/com/jpexs/asdec/gui/ModeFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ModeFrame.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.Main; +import com.jpexs.decompiler.flash.Main; import java.awt.Container; import java.awt.GridLayout; import java.awt.event.ActionEvent; @@ -43,21 +43,21 @@ public class ModeFrame extends JFrame implements ActionListener { * Constructor */ public ModeFrame() { - setSize(300, 200); + setSize(350, 200); openButton.addActionListener(this); openButton.setActionCommand("OPEN"); - openButton.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/open24.png"))); + openButton.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/open24.png"))); proxyButton.addActionListener(this); proxyButton.setActionCommand("PROXY"); - proxyButton.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/proxy24.png"))); + proxyButton.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy24.png"))); exitButton.addActionListener(this); exitButton.setActionCommand("EXIT"); - exitButton.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/exit24.png"))); + exitButton.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/exit24.png"))); setResizable(false); Container cont = getContentPane(); cont.setLayout(new GridLayout(4, 1)); JLabel logoLabel = new JLabel(); - logoLabel.setIcon(new ImageIcon(View.loadImage("com/jpexs/asdec/gui/graphics/logo.png"))); + logoLabel.setIcon(new ImageIcon(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/logo.png"))); cont.add(logoLabel); cont.add(openButton); cont.add(proxyButton); diff --git a/trunk/src/com/jpexs/asdec/gui/TagNode.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagNode.java similarity index 78% rename from trunk/src/com/jpexs/asdec/gui/TagNode.java rename to trunk/src/com/jpexs/decompiler/flash/gui/TagNode.java index b4440c143..f5c44a6d2 100644 --- a/trunk/src/com/jpexs/asdec/gui/TagNode.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagNode.java @@ -14,35 +14,35 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.tags.DefineBitsJPEG2Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG3Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG4Tag; -import com.jpexs.asdec.tags.DefineBitsLossless2Tag; -import com.jpexs.asdec.tags.DefineBitsLosslessTag; -import com.jpexs.asdec.tags.DefineBitsTag; -import com.jpexs.asdec.tags.DefineButton2Tag; -import com.jpexs.asdec.tags.DefineButtonTag; -import com.jpexs.asdec.tags.DefineEditTextTag; -import com.jpexs.asdec.tags.DefineFont2Tag; -import com.jpexs.asdec.tags.DefineFont3Tag; -import com.jpexs.asdec.tags.DefineFont4Tag; -import com.jpexs.asdec.tags.DefineFontTag; -import com.jpexs.asdec.tags.DefineMorphShape2Tag; -import com.jpexs.asdec.tags.DefineMorphShapeTag; -import com.jpexs.asdec.tags.DefineShape2Tag; -import com.jpexs.asdec.tags.DefineShape3Tag; -import com.jpexs.asdec.tags.DefineShape4Tag; -import com.jpexs.asdec.tags.DefineShapeTag; -import com.jpexs.asdec.tags.DefineSpriteTag; -import com.jpexs.asdec.tags.DefineText2Tag; -import com.jpexs.asdec.tags.DefineTextTag; -import com.jpexs.asdec.tags.DoInitActionTag; -import com.jpexs.asdec.tags.ExportAssetsTag; -import com.jpexs.asdec.tags.ShowFrameTag; -import com.jpexs.asdec.tags.base.ASMSource; -import com.jpexs.asdec.tags.base.Container; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG4Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLossless2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLosslessTag; +import com.jpexs.decompiler.flash.tags.DefineBitsTag; +import com.jpexs.decompiler.flash.tags.DefineButton2Tag; +import com.jpexs.decompiler.flash.tags.DefineButtonTag; +import com.jpexs.decompiler.flash.tags.DefineEditTextTag; +import com.jpexs.decompiler.flash.tags.DefineFont2Tag; +import com.jpexs.decompiler.flash.tags.DefineFont3Tag; +import com.jpexs.decompiler.flash.tags.DefineFont4Tag; +import com.jpexs.decompiler.flash.tags.DefineFontTag; +import com.jpexs.decompiler.flash.tags.DefineMorphShape2Tag; +import com.jpexs.decompiler.flash.tags.DefineMorphShapeTag; +import com.jpexs.decompiler.flash.tags.DefineShape2Tag; +import com.jpexs.decompiler.flash.tags.DefineShape3Tag; +import com.jpexs.decompiler.flash.tags.DefineShape4Tag; +import com.jpexs.decompiler.flash.tags.DefineShapeTag; +import com.jpexs.decompiler.flash.tags.DefineSpriteTag; +import com.jpexs.decompiler.flash.tags.DefineText2Tag; +import com.jpexs.decompiler.flash.tags.DefineTextTag; +import com.jpexs.decompiler.flash.tags.DoInitActionTag; +import com.jpexs.decompiler.flash.tags.ExportAssetsTag; +import com.jpexs.decompiler.flash.tags.ShowFrameTag; +import com.jpexs.decompiler.flash.tags.base.ASMSource; +import com.jpexs.decompiler.flash.tags.base.Container; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/gui/TagPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagPanel.java similarity index 85% rename from trunk/src/com/jpexs/asdec/gui/TagPanel.java rename to trunk/src/com/jpexs/decompiler/flash/gui/TagPanel.java index 189964f25..9ad28b8ae 100644 --- a/trunk/src/com/jpexs/asdec/gui/TagPanel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagPanel.java @@ -14,35 +14,35 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.SWF; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.DefineBitsJPEG2Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG3Tag; -import com.jpexs.asdec.tags.DefineBitsJPEG4Tag; -import com.jpexs.asdec.tags.DefineBitsLossless2Tag; -import com.jpexs.asdec.tags.DefineBitsLosslessTag; -import com.jpexs.asdec.tags.DefineBitsTag; -import com.jpexs.asdec.tags.DefineMorphShape2Tag; -import com.jpexs.asdec.tags.DefineMorphShapeTag; -import com.jpexs.asdec.tags.DefineTextTag; -import com.jpexs.asdec.tags.EndTag; -import com.jpexs.asdec.tags.JPEGTablesTag; -import com.jpexs.asdec.tags.PlaceObject2Tag; -import com.jpexs.asdec.tags.SetBackgroundColorTag; -import com.jpexs.asdec.tags.ShowFrameTag; -import com.jpexs.asdec.tags.Tag; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.tags.base.Container; -import com.jpexs.asdec.tags.base.FontTag; -import com.jpexs.asdec.types.GLYPHENTRY; -import com.jpexs.asdec.types.MATRIX; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.RGB; -import com.jpexs.asdec.types.TEXTRECORD; +import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsJPEG4Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLossless2Tag; +import com.jpexs.decompiler.flash.tags.DefineBitsLosslessTag; +import com.jpexs.decompiler.flash.tags.DefineBitsTag; +import com.jpexs.decompiler.flash.tags.DefineMorphShape2Tag; +import com.jpexs.decompiler.flash.tags.DefineMorphShapeTag; +import com.jpexs.decompiler.flash.tags.DefineTextTag; +import com.jpexs.decompiler.flash.tags.EndTag; +import com.jpexs.decompiler.flash.tags.JPEGTablesTag; +import com.jpexs.decompiler.flash.tags.PlaceObject2Tag; +import com.jpexs.decompiler.flash.tags.SetBackgroundColorTag; +import com.jpexs.decompiler.flash.tags.ShowFrameTag; +import com.jpexs.decompiler.flash.tags.Tag; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.Container; +import com.jpexs.decompiler.flash.tags.base.FontTag; +import com.jpexs.decompiler.flash.types.GLYPHENTRY; +import com.jpexs.decompiler.flash.types.MATRIX; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.RGB; +import com.jpexs.decompiler.flash.types.TEXTRECORD; import com.jpexs.flashplayer.FlashPanel; import java.awt.BorderLayout; import java.awt.CardLayout; diff --git a/trunk/src/com/jpexs/asdec/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java similarity index 93% rename from trunk/src/com/jpexs/asdec/gui/TagTreeModel.java rename to trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java index 1c9fabab0..5bae9c716 100644 --- a/trunk/src/com/jpexs/asdec/gui/TagTreeModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; -import com.jpexs.asdec.tags.*; +import com.jpexs.decompiler.flash.tags.*; import java.util.ArrayList; import java.util.List; import javax.swing.event.TreeModelListener; diff --git a/trunk/src/com/jpexs/asdec/gui/View.java b/trunk/src/com/jpexs/decompiler/flash/gui/View.java similarity index 81% rename from trunk/src/com/jpexs/asdec/gui/View.java rename to trunk/src/com/jpexs/decompiler/flash/gui/View.java index 0f85b6681..888f3058e 100644 --- a/trunk/src/com/jpexs/asdec/gui/View.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/View.java @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui; +package com.jpexs.decompiler.flash.gui; import java.awt.*; import java.util.ArrayList; +import javax.swing.JDialog; +import javax.swing.JFrame; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -42,6 +44,9 @@ public class View { } catch (IllegalAccessException ignored) { } + + JFrame.setDefaultLookAndFeelDecorated(true); + JDialog.setDefaultLookAndFeelDecorated(true); } /** @@ -63,9 +68,9 @@ public class View { */ public static void setWindowIcon(Window f) { java.util.List images = new ArrayList(); - images.add(loadImage("com/jpexs/asdec/gui/graphics/icon16.png")); - images.add(loadImage("com/jpexs/asdec/gui/graphics/icon32.png")); - images.add(loadImage("com/jpexs/asdec/gui/graphics/icon48.png")); + images.add(loadImage("com/jpexs/decompiler/flash/gui/graphics/icon16.png")); + images.add(loadImage("com/jpexs/decompiler/flash/gui/graphics/icon32.png")); + images.add(loadImage("com/jpexs/decompiler/flash/gui/graphics/icon48.png")); f.setIconImages(images); } diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/as16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/as16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/as16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/as16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/button16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/button16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/button16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/button16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/exit16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exit16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/exit16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/exit16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/exit24.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/exit24.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/exit24.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/exit24.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/font16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/font16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/font16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/font16.png diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png new file mode 100644 index 0000000000000000000000000000000000000000..c2cd4d0e4082cb91cf7028eb5602c0dab8da1324 GIT binary patch literal 644 zcmV-~0( zK~y-)rIWErBT*EFzqyl{$y_r@SQa*ui5N75ZPsQ>i@borHXvzI*jU(DiVq+b_Et6q zM8sCCQVG%3fGldUDcoSPtWn~UKy<=vA(`D_>^#-w{OA7nJLhl}z~dbe0a#sKWiS}< z^70Z8P18gOLBHP*y4^0iuKR_yZ8JMN%l`g8mSy>QP17hA zi~k6uln5bk9EVD!5_s+E>WYbp2^JR@$z(Ebw=hN>3E=U zrfE{CRLJM^Z?`Ze7@z+S!!S@31;a2xT8O~&JWSIJ6pXi`>v~87Pynx1t1%o7X}8;C zvssec+dP!Zh-egmySqE$@i?(qEO5C{C?LiJ$z+nRs!FO_MZLa813q0|Vl^7f%*>Dm zoPz_R-7cnS`ZWFwl;MyMTU&gaoWyy2#6CTx)o74BQc8a#zJZhyV`qn-x3~1>=g}7y__(sdk6MjCqY=^FU4GZ={JOsn e7%1=k&VK=YZls6Yq5}>90000Ffz*&sepE#E52 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 literal 0 HcmV?d00001 diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd361b1bcbafaf76049d84025c574ce624ad5d9 GIT binary patch literal 2409 zcmV-v36}PWP)4g;8F z-{jo9=bh($|If$&dERG^1lZicLjic{rI+r=!@v9PyR!gfS-!I^@P7}$wo4BaNs?}x ztR(@2LLu7P+DhJZ!-fs4S+fR3Q4m6K@ZdqB(P&As>gwufZEZzS6l7Um07L;$6eTa( z$;ru*wG|45uq+F|-;ZG!OifJ@i9|}0H9kI0C=|ly^Wk>87l0^efn0O>{rF8&w|jxY3j)ZUyZi3DF$@ET!;#lwxkCtn z)9FOhv_Br9p0-#N%;NsZ>^0$t>ja`SAPwSeBJFXQ5#j2Ib}D=(?VjJ%3|| z!+~X4R99DLOM^ld&~+W3&zH?7B?C}Zm9nxj8X6k#`Fu-iO$dRaDA_EV8^n?%;c~gC zudk=7s;VG>4D-#GRWblclF)S>r_;Hl*77Btd;nBc#pQD0@py_VO$sTjXd2Dc#;rlS4VTMR)SbBG#+ITeXqtw{<5`r@03;wCj}tn1lFD`KP=Y}y03bt|PNy?l zUgRqce%;pM+yT<@I8sK=4bbba+8fn|hpGAC16=3MkH*Q4C%z$AmU?_yZedY{S zTN~zu3&eds!uQ_G(6i4X9F7Gprj3jcICv0eR~I%g)zn02+cstz8wbhy>n;-0)6{(O2_l^)ZJMOh>1+jB{@G{Lz4|KgK!6F$qP(k%y0d5Dn{OC+ z;|&~v0Fo@@Ja>*&d-fnlB1BfKKnjNm{PYvn(W7*H_#y6K5XCf??>{YdBg;HB@4SPE zM)}7JFYunG@qsLJpt6#PEHgbgh@DI#gg}c#Sn<|dOm5gf`@;|O>DU+t0s;Qz@le;* z#eeqhCEC}AEJ@V8_8JJmsolHz2zbvh_={yRECm1Dzn`IF#}Kx?iWT(q^rtJ~EDL4s$3h6S!9nCmgg<7w&~LxJK$fW}q+&6Y%a;Kd?CZl93{t*&HHyPA zOSg)Gs_W<;Pr;mWLjc5FfL|XS#jL7Anb+%-=0Ic;m2DWzR9Exoi3x=uyfN3FNtYNR(I)Eo*^Pb29*q$s}K0yM~xsFD51slanw(}Eta)du5lUy}TYBp^`*0ec6DU^W$lJ)gaRRzF3l0;`H^h**1l%5`v!C>ABwj>(0 zgF)i!*74hs5!QBhBOO1E>!XjbT3eArA?#!_TPnn!c!ESz6Zg%`P=E9&^6AqUJw132 zA11JME6(G`Nk$^1o13}*$Rn%?hxy%i-;wO-KtF#T-k)&mDv`QU?y!9kR#pT^hQyFfpE+9?Lw$(!E;%bRa_=!?OMVoPH<`0 zE@HjC3^*K&o;^#Iu46Vdp!M~k%-t2FRjZgeae|J0`-q)9i6%)*`+W4KQpDTaQB8BU zgs!MyroEl6S6(4<>=;6pnW(6sKOBZbhgiFFXHl^s0rs_dnqBHrGCeZFPoI9u=#M{Q zS{5reZ^m6$$G^Y)lHY9Iim#yoNeFD)CO$dIU}q;o-+#|ke?N+8Qr_6e%GOrO8ymCh z5|Ic4-+s$bXD5?`gP4_-)Nb5J-Tn8Yx?D@ff!FJu1yJYAY9Mik be{S<%><8CsoXGtB00000NkvXXu0mjfk-eK7 literal 0 HcmV?d00001 diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/image16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/image16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/image16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/image16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/loading.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/loading.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/loading.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/loading.png diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/logo.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4a2d9aec143be491cfa0b8fb797e774eb2fa4418 GIT binary patch literal 11777 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. */ -package com.jpexs.asdec.gui.proxy; +package com.jpexs.decompiler.flash.gui.proxy; -import com.jpexs.asdec.Configuration; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.gui.View; +import com.jpexs.decompiler.flash.Configuration; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.gui.View; import com.jpexs.proxy.CatchedListener; import com.jpexs.proxy.ReplacedListener; import com.jpexs.proxy.Replacement; @@ -154,10 +154,10 @@ public class ProxyFrame extends JFrame implements ActionListener, CatchedListene } }); java.util.List images = new ArrayList(); - images.add(View.loadImage("com/jpexs/asdec/gui/graphics/proxy16.png")); - images.add(View.loadImage("com/jpexs/asdec/gui/graphics/proxy24.png")); - images.add(View.loadImage("com/jpexs/asdec/gui/graphics/proxy32.png")); - images.add(View.loadImage("com/jpexs/asdec/gui/graphics/proxy48.png")); + images.add(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy16.png")); + images.add(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy24.png")); + images.add(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy32.png")); + images.add(View.loadImage("com/jpexs/decompiler/flash/gui/graphics/proxy48.png")); setIconImages(images); } diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java similarity index 95% rename from trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java rename to trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java index a8c730900..c9367a777 100644 --- a/trunk/src/com/jpexs/asdec/gui/proxy/SWFListModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/SWFListModel.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.gui.proxy; +package com.jpexs.decompiler.flash.gui.proxy; import com.jpexs.proxy.Replacement; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/helpers/Helper.java b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java similarity index 96% rename from trunk/src/com/jpexs/asdec/helpers/Helper.java rename to trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java index e58409634..b9cc97175 100644 --- a/trunk/src/com/jpexs/asdec/helpers/Helper.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.helpers; +package com.jpexs.decompiler.flash.helpers; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/asdec/helpers/Highlighting.java b/trunk/src/com/jpexs/decompiler/flash/helpers/Highlighting.java similarity index 96% rename from trunk/src/com/jpexs/asdec/helpers/Highlighting.java rename to trunk/src/com/jpexs/decompiler/flash/helpers/Highlighting.java index e7fc6ac8a..4f887f2eb 100644 --- a/trunk/src/com/jpexs/asdec/helpers/Highlighting.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/Highlighting.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.helpers; +package com.jpexs.decompiler.flash.helpers; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/tags/CSMTextSettingsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/CSMTextSettingsTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java index 639ef84b3..da7b54cfa 100644 --- a/trunk/src/com/jpexs/asdec/tags/CSMTextSettingsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/CSMTextSettingsTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DebugIDTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DebugIDTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java index 1b992df36..6623f2429 100644 --- a/trunk/src/com/jpexs/asdec/tags/DebugIDTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DebugIDTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java index 01447b0c6..904656603 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBinaryDataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBinaryDataTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java similarity index 84% rename from trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java index a8cc2ee17..68fb64a58 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG2Tag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java similarity index 86% rename from trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java index c9f36ec6c..f56b02663 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG3Tag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java index 0206c4635..43b4cd9fe 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsJPEG4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsJPEG4Tag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java index 4051a9b80..f4ef6ec0e 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsLossless2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.ALPHABITMAPDATA; -import com.jpexs.asdec.types.ALPHACOLORMAPDATA; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.ALPHABITMAPDATA; +import com.jpexs.decompiler.flash.types.ALPHACOLORMAPDATA; +import com.jpexs.decompiler.flash.types.RGBA; import java.awt.Color; import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java index 35701d03c..f45abec06 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsLosslessTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLosslessTag.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.BITMAPDATA; -import com.jpexs.asdec.types.COLORMAPDATA; -import com.jpexs.asdec.types.RGB; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.BITMAPDATA; +import com.jpexs.decompiler.flash.types.COLORMAPDATA; +import com.jpexs.decompiler.flash.types.RGB; import java.awt.Color; import java.awt.Graphics; import java.awt.image.BufferedImage; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java index c3550e8d5..092367e18 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineBitsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsTag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWF; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWF; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java similarity index 88% rename from trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java index d34c40716..e7ffb7d67 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButton2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButton2Tag.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.tags.base.Container; -import com.jpexs.asdec.types.BUTTONCONDACTION; -import com.jpexs.asdec.types.BUTTONRECORD; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.Container; +import com.jpexs.decompiler.flash.types.BUTTONCONDACTION; +import com.jpexs.decompiler.flash.types.BUTTONRECORD; +import com.jpexs.decompiler.flash.types.RECT; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java similarity index 88% rename from trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java index 2def6dd6f..d44749fa5 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonCxformTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonCxformTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.CXFORM; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.CXFORM; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java index 54a213d25..2997082a4 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonSoundTag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.SOUNDINFO; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.SOUNDINFO; 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/decompiler/flash/tags/DefineButtonTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java index 43fb9d8ff..627226fe5 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineButtonTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.tags.base.ASMSource; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.BUTTONRECORD; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.tags.base.ASMSource; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.BUTTONRECORD; +import com.jpexs.decompiler.flash.types.RECT; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java index 7d508ed53..f256fbb64 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineEditTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.RGBA; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java index d32fc8bd1..9af589f04 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.tags.base.FontTag; -import com.jpexs.asdec.types.KERNINGRECORD; -import com.jpexs.asdec.types.LANGCODE; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.FontTag; +import com.jpexs.decompiler.flash.types.KERNINGRECORD; +import com.jpexs.decompiler.flash.types.LANGCODE; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java index 6beb52554..71af9bd28 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.tags.base.FontTag; -import com.jpexs.asdec.types.KERNINGRECORD; -import com.jpexs.asdec.types.LANGCODE; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPE; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.FontTag; +import com.jpexs.decompiler.flash.types.KERNINGRECORD; +import com.jpexs.decompiler.flash.types.LANGCODE; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java index d4e22f26d..465883281 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFont4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont4Tag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java similarity index 88% rename from trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java index 856a8d3c4..d484b46f8 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontAlignZonesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontAlignZonesTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.ZONERECORD; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.ZONERECORD; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java index d49fd1a3a..f7a0ac43d 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontInfo2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.LANGCODE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.LANGCODE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java similarity index 93% rename from trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java index cdf4b1dee..ee0167920 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontInfoTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java index 6485a3d83..9661a65e1 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontNameTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontNameTag.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; +import com.jpexs.decompiler.flash.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineFontTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java similarity index 86% rename from trunk/src/com/jpexs/asdec/tags/DefineFontTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java index 807ea781d..20d6dd024 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineFontTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.tags.base.FontTag; -import com.jpexs.asdec.types.SHAPE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.FontTag; +import com.jpexs.decompiler.flash.types.SHAPE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java similarity index 85% rename from trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java index 7994ad100..01ef2cbba 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineMorphShape2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShape2Tag.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.MORPHFILLSTYLEARRAY; -import com.jpexs.asdec.types.MORPHLINESTYLEARRAY; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.MORPHFILLSTYLEARRAY; +import com.jpexs.decompiler.flash.types.MORPHLINESTYLEARRAY; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java similarity index 83% rename from trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java index 751443ca6..5203ae7a3 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineMorphShapeTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineMorphShapeTag.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.MORPHFILLSTYLEARRAY; -import com.jpexs.asdec.types.MORPHLINESTYLEARRAY; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.MORPHFILLSTYLEARRAY; +import com.jpexs.decompiler.flash.types.MORPHLINESTYLEARRAY; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPE; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java index e80cc0d4c..b7a2c4e2a 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineScalingGridTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineScalingGridTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.RECT; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java similarity index 92% rename from trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java index 6d9a20add..06232225d 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSceneAndFrameLabelDataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSceneAndFrameLabelDataTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java similarity index 78% rename from trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java index b4b6af06e..33c5e0afa 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShape2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShape2Tag.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPEWITHSTYLE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java similarity index 78% rename from trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java index 9fb78e3d9..2e28c2705 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShape3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShape3Tag.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPEWITHSTYLE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java similarity index 81% rename from trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java index 8306e1f61..efac805e6 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShape4Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShape4Tag.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPEWITHSTYLE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java similarity index 78% rename from trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java index a135004f3..327212b23 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineShapeTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineShapeTag.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.tags.base.AloneTag; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.SHAPEWITHSTYLE; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.tags.base.AloneTag; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SHAPEWITHSTYLE; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java index 7c1b8f165..ab85b697d 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java similarity index 88% rename from trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java index a8d9d7ab4..c3f001677 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineSpriteTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineSpriteTag.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.tags.base.Container; -import com.jpexs.asdec.types.MATRIX; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.Container; +import com.jpexs.decompiler.flash.types.MATRIX; +import com.jpexs.decompiler.flash.types.RECT; import java.awt.Point; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java similarity index 85% rename from trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index f4f9526d0..bdfff5937 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineText2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.MATRIX; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.TEXTRECORD; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.MATRIX; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.TEXTRECORD; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/DefineTextTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java index c629cf20d..2fd1b9ee8 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.BoundedTag; -import com.jpexs.asdec.tags.base.CharacterTag; -import com.jpexs.asdec.types.MATRIX; -import com.jpexs.asdec.types.RECT; -import com.jpexs.asdec.types.TEXTRECORD; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.BoundedTag; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.types.MATRIX; +import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.TEXTRECORD; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java index d65e16705..4d0492211 100644 --- a/trunk/src/com/jpexs/asdec/tags/DefineVideoStreamTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; 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/decompiler/flash/tags/DoABCTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/DoABCTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java index 4194769be..b9815f170 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoABCTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoABCTag.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.ABC; -import com.jpexs.asdec.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.ABC; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; import java.io.*; /** diff --git a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/DoActionTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java index 936fcc276..10a567749 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.tags.base.ASMSource; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.tags.base.ASMSource; 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/decompiler/flash/tags/DoInitActionTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java index 6ae66f5ac..f18964443 100644 --- a/trunk/src/com/jpexs/asdec/tags/DoInitActionTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.tags.base.ASMSource; -import com.jpexs.asdec.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.tags.base.ASMSource; +import com.jpexs.decompiler.flash.tags.base.CharacterTag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java index 53e492776..6a3a285ac 100644 --- a/trunk/src/com/jpexs/asdec/tags/EnableDebugger2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebugger2Tag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java index fde6520db..2d7b3c52d 100644 --- a/trunk/src/com/jpexs/asdec/tags/EnableDebuggerTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EnableDebuggerTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/EndTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/EndTag.java similarity index 93% rename from trunk/src/com/jpexs/asdec/tags/EndTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/EndTag.java index c7bea240e..85003deba 100644 --- a/trunk/src/com/jpexs/asdec/tags/EndTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/EndTag.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java index 004aae8e6..12fec0548 100644 --- a/trunk/src/com/jpexs/asdec/tags/ExportAssetsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ExportAssetsTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java similarity index 92% rename from trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java index 1b3b66e69..362759674 100644 --- a/trunk/src/com/jpexs/asdec/tags/FileAttributesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/FileAttributesTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java index 7bca5590f..fd0129007 100644 --- a/trunk/src/com/jpexs/asdec/tags/FrameLabelTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/FrameLabelTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java index e9976b988..f7a6d36d5 100644 --- a/trunk/src/com/jpexs/asdec/tags/ImportAssets2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssets2Tag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java index c20bd73ed..e4deecc89 100644 --- a/trunk/src/com/jpexs/asdec/tags/ImportAssetsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ImportAssetsTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/JPEGTablesTag.java similarity index 93% rename from trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/JPEGTablesTag.java index f30261a7d..fef6a8622 100644 --- a/trunk/src/com/jpexs/asdec/tags/JPEGTablesTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/JPEGTablesTag.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/MetadataTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/MetadataTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java index 9ce05ce80..8936598d4 100644 --- a/trunk/src/com/jpexs/asdec/tags/MetadataTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/MetadataTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java index 106ef6cf0..08469d697 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject2Tag.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.Container; -import com.jpexs.asdec.types.CLIPACTIONS; -import com.jpexs.asdec.types.CXFORMWITHALPHA; -import com.jpexs.asdec.types.MATRIX; +import com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.tags.base.Container; +import com.jpexs.decompiler.flash.types.CLIPACTIONS; +import com.jpexs.decompiler.flash.types.CXFORMWITHALPHA; +import com.jpexs.decompiler.flash.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/decompiler/flash/tags/PlaceObject3Tag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java index c349b72c2..fa0bf5969 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObject3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObject3Tag.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.Main; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.abc.CopyOutputStream; -import com.jpexs.asdec.tags.base.Container; -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 com.jpexs.decompiler.flash.Main; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.abc.CopyOutputStream; +import com.jpexs.decompiler.flash.tags.base.Container; +import com.jpexs.decompiler.flash.types.CLIPACTIONS; +import com.jpexs.decompiler.flash.types.CXFORMWITHALPHA; +import com.jpexs.decompiler.flash.types.MATRIX; +import com.jpexs.decompiler.flash.types.filters.FILTER; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java index 7d3d981cf..92aa6d0fd 100644 --- a/trunk/src/com/jpexs/asdec/tags/PlaceObjectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/PlaceObjectTag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.CXFORM; -import com.jpexs.asdec.types.MATRIX; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.CXFORM; +import com.jpexs.decompiler.flash.types.MATRIX; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java similarity index 92% rename from trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java index 220d24ba8..eeb07ee0e 100644 --- a/trunk/src/com/jpexs/asdec/tags/ProductInfoTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ProductInfoTag.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; +import com.jpexs.decompiler.flash.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ProtectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/ProtectTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java index e7696215b..2761b16ec 100644 --- a/trunk/src/com/jpexs/asdec/tags/ProtectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ProtectTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObject2Tag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/RemoveObject2Tag.java index c6d3d14e2..8cdf62094 100644 --- a/trunk/src/com/jpexs/asdec/tags/RemoveObject2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObject2Tag.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; +import com.jpexs.decompiler.flash.SWFInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java index d6f8b9ccf..e1a2a071c 100644 --- a/trunk/src/com/jpexs/asdec/tags/RemoveObjectTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/RemoveObjectTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java index d9d281025..11c7f37c5 100644 --- a/trunk/src/com/jpexs/asdec/tags/ScriptLimitsTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ScriptLimitsTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java index 41fccba45..5e40c39f1 100644 --- a/trunk/src/com/jpexs/asdec/tags/SetBackgroundColorTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SetBackgroundColorTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.RGB; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.RGB; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java index 0594a84b5..a9225042f 100644 --- a/trunk/src/com/jpexs/asdec/tags/SetTabIndexTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SetTabIndexTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java similarity index 93% rename from trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java index 8ce1f9326..03da654c3 100644 --- a/trunk/src/com/jpexs/asdec/tags/ShowFrameTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/ShowFrameTag.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; /** * Instructs Flash Player to display the contents of the display list diff --git a/trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamBlockTag.java similarity index 93% rename from trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamBlockTag.java index 0028fc822..2f87370d9 100644 --- a/trunk/src/com/jpexs/asdec/tags/SoundStreamBlockTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamBlockTag.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java similarity index 92% rename from trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java index b6b5eca3f..e2553323c 100644 --- a/trunk/src/com/jpexs/asdec/tags/SoundStreamHead2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java similarity index 92% rename from trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java index 8f1b8e395..2c2060ede 100644 --- a/trunk/src/com/jpexs/asdec/tags/SoundStreamHeadTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java index fa580c70c..54419a4ed 100644 --- a/trunk/src/com/jpexs/asdec/tags/StartSound2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/StartSound2Tag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.SOUNDINFO; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.SOUNDINFO; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/StartSoundTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/StartSoundTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java index c669b46f3..acb7bb457 100644 --- a/trunk/src/com/jpexs/asdec/tags/StartSoundTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/StartSoundTag.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; -import com.jpexs.asdec.types.SOUNDINFO; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.types.SOUNDINFO; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java index a1c5a95e0..6ff9030da 100644 --- a/trunk/src/com/jpexs/asdec/tags/SymbolClassTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/SymbolClassTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/Tag.java similarity index 93% rename from trunk/src/com/jpexs/asdec/tags/Tag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/Tag.java index c4a325e17..31d3fb74f 100644 --- a/trunk/src/com/jpexs/asdec/tags/Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/Tag.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; import java.util.HashSet; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/tags/TagStub.java b/trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java similarity index 89% rename from trunk/src/com/jpexs/asdec/tags/TagStub.java rename to trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java index 78484778d..edd5b1e29 100644 --- a/trunk/src/com/jpexs/asdec/tags/TagStub.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/TagStub.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java index 0c08960f1..24f2b1108 100644 --- a/trunk/src/com/jpexs/asdec/tags/VideoFrameTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/VideoFrameTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags; +package com.jpexs.decompiler.flash.tags; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.SWFOutputStream; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.SWFOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/trunk/src/com/jpexs/asdec/tags/base/ASMSource.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java similarity index 90% rename from trunk/src/com/jpexs/asdec/tags/base/ASMSource.java rename to trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java index 6674067e3..0b05d00a5 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/ASMSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ASMSource.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags.base; +package com.jpexs.decompiler.flash.tags.base; -import com.jpexs.asdec.action.Action; +import com.jpexs.decompiler.flash.action.Action; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/tags/base/AloneTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/AloneTag.java similarity index 91% rename from trunk/src/com/jpexs/asdec/tags/base/AloneTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/base/AloneTag.java index 879568aa6..4a86cb9b9 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/AloneTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/AloneTag.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags.base; +package com.jpexs.decompiler.flash.tags.base; /** * diff --git a/trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/BoundedTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/base/BoundedTag.java index 1e5229e7b..29227acc2 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/BoundedTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/BoundedTag.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags.base; +package com.jpexs.decompiler.flash.tags.base; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.types.RECT; import java.util.HashMap; /** diff --git a/trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java similarity index 88% rename from trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java index cc5c45892..51df164c5 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/CharacterTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags.base; +package com.jpexs.decompiler.flash.tags.base; -import com.jpexs.asdec.tags.ExportAssetsTag; -import com.jpexs.asdec.tags.Tag; +import com.jpexs.decompiler.flash.tags.ExportAssetsTag; +import com.jpexs.decompiler.flash.tags.Tag; import java.util.ArrayList; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/tags/base/Container.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java similarity index 92% rename from trunk/src/com/jpexs/asdec/tags/base/Container.java rename to trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java index 83296876b..01a4207ff 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/Container.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/Container.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags.base; +package com.jpexs.decompiler.flash.tags.base; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/tags/base/FontTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java similarity index 87% rename from trunk/src/com/jpexs/asdec/tags/base/FontTag.java rename to trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java index 8daba2b55..33086cff2 100644 --- a/trunk/src/com/jpexs/asdec/tags/base/FontTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.tags.base; +package com.jpexs.decompiler.flash.tags.base; -import com.jpexs.asdec.types.SHAPE; +import com.jpexs.decompiler.flash.types.SHAPE; /** * diff --git a/trunk/src/com/jpexs/asdec/types/ALPHABITMAPDATA.java b/trunk/src/com/jpexs/decompiler/flash/types/ALPHABITMAPDATA.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/ALPHABITMAPDATA.java rename to trunk/src/com/jpexs/decompiler/flash/types/ALPHABITMAPDATA.java index 65bfabf95..5cf89f328 100644 --- a/trunk/src/com/jpexs/asdec/types/ALPHABITMAPDATA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/ALPHABITMAPDATA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/ALPHACOLORMAPDATA.java b/trunk/src/com/jpexs/decompiler/flash/types/ALPHACOLORMAPDATA.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/ALPHACOLORMAPDATA.java rename to trunk/src/com/jpexs/decompiler/flash/types/ALPHACOLORMAPDATA.java index 7cc4479d1..c3cb5e3dc 100644 --- a/trunk/src/com/jpexs/asdec/types/ALPHACOLORMAPDATA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/ALPHACOLORMAPDATA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/ARGB.java b/trunk/src/com/jpexs/decompiler/flash/types/ARGB.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/ARGB.java rename to trunk/src/com/jpexs/decompiler/flash/types/ARGB.java index 0565e3035..5b54081ae 100644 --- a/trunk/src/com/jpexs/asdec/types/ARGB.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/ARGB.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/BITMAPDATA.java b/trunk/src/com/jpexs/decompiler/flash/types/BITMAPDATA.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/BITMAPDATA.java rename to trunk/src/com/jpexs/decompiler/flash/types/BITMAPDATA.java index 27cdcfbe3..ba85cc8d1 100644 --- a/trunk/src/com/jpexs/asdec/types/BITMAPDATA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BITMAPDATA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java similarity index 91% rename from trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java rename to trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java index 594452dd4..6f206f126 100644 --- a/trunk/src/com/jpexs/asdec/types/BUTTONCONDACTION.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.tags.base.ASMSource; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.tags.base.ASMSource; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java similarity index 91% rename from trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java index 0ab5f8031..de7d18a33 100644 --- a/trunk/src/com/jpexs/asdec/types/BUTTONRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONRECORD.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; -import com.jpexs.asdec.types.filters.FILTER; +import com.jpexs.decompiler.flash.types.filters.FILTER; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java index e412af3dd..d6bfc6d44 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPACTIONRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; -import com.jpexs.asdec.SWFInputStream; -import com.jpexs.asdec.action.Action; -import com.jpexs.asdec.tags.base.ASMSource; +import com.jpexs.decompiler.flash.SWFInputStream; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.tags.base.ASMSource; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONS.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java rename to trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONS.java index ff4375382..1a7f17852 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPACTIONS.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONS.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; import java.util.List; diff --git a/trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java similarity index 95% rename from trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java rename to trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java index d72d910cd..44db2a4f7 100644 --- a/trunk/src/com/jpexs/asdec/types/CLIPEVENTFLAGS.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPEVENTFLAGS.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Specifies one or more sprite events to which an event handler applies. diff --git a/trunk/src/com/jpexs/asdec/types/COLORMAPDATA.java b/trunk/src/com/jpexs/decompiler/flash/types/COLORMAPDATA.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/COLORMAPDATA.java rename to trunk/src/com/jpexs/decompiler/flash/types/COLORMAPDATA.java index 55a4b144e..bfa571a48 100644 --- a/trunk/src/com/jpexs/asdec/types/COLORMAPDATA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/COLORMAPDATA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/CXFORM.java b/trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/CXFORM.java rename to trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java index e1e45a854..956146b8e 100644 --- a/trunk/src/com/jpexs/asdec/types/CXFORM.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CXFORM.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Defines a transform that can be applied to the color space of a graphic diff --git a/trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java b/trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java rename to trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java index ce1d5a100..cb46ede67 100644 --- a/trunk/src/com/jpexs/asdec/types/CXFORMWITHALPHA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/CXFORMWITHALPHA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Defines a transform that can be applied to the color space of a graphic diff --git a/trunk/src/com/jpexs/asdec/types/FILLSTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/FILLSTYLE.java rename to trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java index fbd1c2fc1..b0237017d 100644 --- a/trunk/src/com/jpexs/asdec/types/FILLSTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLE.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/FILLSTYLEARRAY.java b/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLEARRAY.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/FILLSTYLEARRAY.java rename to trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLEARRAY.java index c7b833478..8631eafce 100644 --- a/trunk/src/com/jpexs/asdec/types/FILLSTYLEARRAY.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/FILLSTYLEARRAY.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/FOCALGRADIENT.java b/trunk/src/com/jpexs/decompiler/flash/types/FOCALGRADIENT.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/FOCALGRADIENT.java rename to trunk/src/com/jpexs/decompiler/flash/types/FOCALGRADIENT.java index 368ec6f54..c1ad50e55 100644 --- a/trunk/src/com/jpexs/asdec/types/FOCALGRADIENT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/FOCALGRADIENT.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/GLYPHENTRY.java b/trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/GLYPHENTRY.java rename to trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java index a71724912..717dfc5fe 100644 --- a/trunk/src/com/jpexs/asdec/types/GLYPHENTRY.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/GLYPHENTRY.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/GRADIENT.java b/trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/GRADIENT.java rename to trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java index 8eb924ccd..5360adc92 100644 --- a/trunk/src/com/jpexs/asdec/types/GRADIENT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/GRADIENT.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/GRADRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/GRADRECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java index ad00ba2f8..f45da3a64 100644 --- a/trunk/src/com/jpexs/asdec/types/GRADRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/GRADRECORD.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/KERNINGRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/KERNINGRECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java index c8231eeec..072a3fdff 100644 --- a/trunk/src/com/jpexs/asdec/types/KERNINGRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/KERNINGRECORD.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 24-bit red, green, blue value diff --git a/trunk/src/com/jpexs/asdec/types/LANGCODE.java b/trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/LANGCODE.java rename to trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java index e805ab9f0..847524797 100644 --- a/trunk/src/com/jpexs/asdec/types/LANGCODE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LANGCODE.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/LINESTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/LINESTYLE.java rename to trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java index aaf9e49f8..7e560980e 100644 --- a/trunk/src/com/jpexs/asdec/types/LINESTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/LINESTYLE2.java b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/LINESTYLE2.java rename to trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java index 51bc6149e..962e5b748 100644 --- a/trunk/src/com/jpexs/asdec/types/LINESTYLE2.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLE2.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/LINESTYLEARRAY.java b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLEARRAY.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/LINESTYLEARRAY.java rename to trunk/src/com/jpexs/decompiler/flash/types/LINESTYLEARRAY.java index 9dea247ed..a50d6956b 100644 --- a/trunk/src/com/jpexs/asdec/types/LINESTYLEARRAY.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/LINESTYLEARRAY.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MATRIX.java b/trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/MATRIX.java rename to trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java index fd5ef22c4..a4915e242 100644 --- a/trunk/src/com/jpexs/asdec/types/MATRIX.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MATRIX.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; import java.awt.Point; diff --git a/trunk/src/com/jpexs/asdec/types/MORPHFILLSTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/MORPHFILLSTYLE.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java index b1b050b4a..03b0a8e87 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHFILLSTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLE.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MORPHFILLSTYLEARRAY.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLEARRAY.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/MORPHFILLSTYLEARRAY.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLEARRAY.java index 0a4c325b4..33917d74b 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHFILLSTYLEARRAY.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHFILLSTYLEARRAY.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MORPHGRADIENT.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/MORPHGRADIENT.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java index 83646b37e..28d196258 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHGRADIENT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADIENT.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MORPHGRADRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/MORPHGRADRECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java index eb659c8b3..ee9ebd701 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHGRADRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHGRADRECORD.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MORPHLINESTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/MORPHLINESTYLE.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE.java index 15fd6987c..1f6117823 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHLINESTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MORPHLINESTYLE2.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/MORPHLINESTYLE2.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java index 4bcf4c401..1eb62eb42 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHLINESTYLE2.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLE2.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/MORPHLINESTYLEARRAY.java b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLEARRAY.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/MORPHLINESTYLEARRAY.java rename to trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLEARRAY.java index 51768330f..c4c599668 100644 --- a/trunk/src/com/jpexs/asdec/types/MORPHLINESTYLEARRAY.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/MORPHLINESTYLEARRAY.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/PIX15.java b/trunk/src/com/jpexs/decompiler/flash/types/PIX15.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/PIX15.java rename to trunk/src/com/jpexs/decompiler/flash/types/PIX15.java index 7a1f1146d..863ccc6e3 100644 --- a/trunk/src/com/jpexs/asdec/types/PIX15.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/PIX15.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 15-bit red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/PIX24.java b/trunk/src/com/jpexs/decompiler/flash/types/PIX24.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/PIX24.java rename to trunk/src/com/jpexs/decompiler/flash/types/PIX24.java index 6a5238bbd..fbe1833b0 100644 --- a/trunk/src/com/jpexs/asdec/types/PIX24.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/PIX24.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 15-bit red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/RECT.java b/trunk/src/com/jpexs/decompiler/flash/types/RECT.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/RECT.java rename to trunk/src/com/jpexs/decompiler/flash/types/RECT.java index d4350143c..b711894ad 100644 --- a/trunk/src/com/jpexs/asdec/types/RECT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RECT.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * A rectangle value represents a rectangular region. diff --git a/trunk/src/com/jpexs/asdec/types/RGB.java b/trunk/src/com/jpexs/decompiler/flash/types/RGB.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/RGB.java rename to trunk/src/com/jpexs/decompiler/flash/types/RGB.java index ba2a0941e..797f1d374 100644 --- a/trunk/src/com/jpexs/asdec/types/RGB.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RGB.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 24-bit red, green, blue value diff --git a/trunk/src/com/jpexs/asdec/types/RGBA.java b/trunk/src/com/jpexs/decompiler/flash/types/RGBA.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/RGBA.java rename to trunk/src/com/jpexs/decompiler/flash/types/RGBA.java index 91cf1ccb4..a9d752ded 100644 --- a/trunk/src/com/jpexs/asdec/types/RGBA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RGBA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit red, green, blue and alpha value diff --git a/trunk/src/com/jpexs/asdec/types/SHAPE.java b/trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java similarity index 88% rename from trunk/src/com/jpexs/asdec/types/SHAPE.java rename to trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java index 84f898bef..9d2266a45 100644 --- a/trunk/src/com/jpexs/asdec/types/SHAPE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/SHAPE.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; -import com.jpexs.asdec.types.shaperecords.SHAPERECORD; +import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/types/SHAPEWITHSTYLE.java b/trunk/src/com/jpexs/decompiler/flash/types/SHAPEWITHSTYLE.java similarity index 89% rename from trunk/src/com/jpexs/asdec/types/SHAPEWITHSTYLE.java rename to trunk/src/com/jpexs/decompiler/flash/types/SHAPEWITHSTYLE.java index 13030131d..3b887dbbb 100644 --- a/trunk/src/com/jpexs/asdec/types/SHAPEWITHSTYLE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/SHAPEWITHSTYLE.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; -import com.jpexs.asdec.types.shaperecords.SHAPERECORD; +import com.jpexs.decompiler.flash.types.shaperecords.SHAPERECORD; import java.util.List; /** diff --git a/trunk/src/com/jpexs/asdec/types/SOUNDENVELOPE.java b/trunk/src/com/jpexs/decompiler/flash/types/SOUNDENVELOPE.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/SOUNDENVELOPE.java rename to trunk/src/com/jpexs/decompiler/flash/types/SOUNDENVELOPE.java index 630d88d02..b410f8e50 100644 --- a/trunk/src/com/jpexs/asdec/types/SOUNDENVELOPE.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/SOUNDENVELOPE.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/SOUNDINFO.java b/trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/SOUNDINFO.java rename to trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java index dbd738734..45e51d229 100644 --- a/trunk/src/com/jpexs/asdec/types/SOUNDINFO.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/SOUNDINFO.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/TEXTRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/TEXTRECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java index f99074343..1c3f56f4a 100644 --- a/trunk/src/com/jpexs/asdec/types/TEXTRECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/TEXTRECORD.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * diff --git a/trunk/src/com/jpexs/asdec/types/ZONEDATA.java b/trunk/src/com/jpexs/decompiler/flash/types/ZONEDATA.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/ZONEDATA.java rename to trunk/src/com/jpexs/decompiler/flash/types/ZONEDATA.java index a050c6dc8..ddbcd542f 100644 --- a/trunk/src/com/jpexs/asdec/types/ZONEDATA.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/ZONEDATA.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/ZONERECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/ZONERECORD.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/ZONERECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/ZONERECORD.java index 076efd703..356964efb 100644 --- a/trunk/src/com/jpexs/asdec/types/ZONERECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/ZONERECORD.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types; +package com.jpexs.decompiler.flash.types; /** * Represents 32-bit alpha, red, green and blue value diff --git a/trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java index 0a14ece6e..ab8d48dc0 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/BEVELFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/BEVELFILTER.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.types.RGBA; /** * The Bevel filter creates a smooth bevel on display list objects. diff --git a/trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java index ec4362261..aef76340d 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/BLURFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/BLURFILTER.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; /** * Blur filter based on a sub-pixel precise median filter diff --git a/trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java similarity index 92% rename from trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java index 8ebb56118..9c571ca51 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/COLORMATRIXFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/COLORMATRIXFILTER.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; /** * Applies a color transformation on the pixels of a display list object diff --git a/trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java index c7f3675a1..f634a7697 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/CONVOLUTIONFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/CONVOLUTIONFILTER.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.types.RGBA; /** * Two-dimensional discrete convolution filter. diff --git a/trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java index 6d328fd72..3ff46ea7c 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/DROPSHADOWFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/DROPSHADOWFILTER.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.types.RGBA; /** * Drop shadow filter based on the same median filter as the blur filter diff --git a/trunk/src/com/jpexs/asdec/types/filters/FILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java similarity index 91% rename from trunk/src/com/jpexs/asdec/types/filters/FILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java index 9a50f8cbc..7de5e8ed2 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/FILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/FILTER.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; /** * Bitmap filter diff --git a/trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java similarity index 89% rename from trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java index c59d37b09..211f9c34a 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/GLOWFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/GLOWFILTER.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.types.RGBA; /** * Glow filter diff --git a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java index 6fed2c5ab..e525412b2 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTBEVELFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTBEVELFILTER.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.types.RGBA; /** * Bevel filter with gradient instead of single color diff --git a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java rename to trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java index 9b0a73bb5..28b308ba6 100644 --- a/trunk/src/com/jpexs/asdec/types/filters/GRADIENTGLOWFILTER.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/filters/GRADIENTGLOWFILTER.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.filters; +package com.jpexs.decompiler.flash.types.filters; -import com.jpexs.asdec.types.RGBA; +import com.jpexs.decompiler.flash.types.RGBA; /** * Glow filter with gradient instead of single color diff --git a/trunk/src/com/jpexs/asdec/types/shaperecords/CurvedEdgeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java similarity index 94% rename from trunk/src/com/jpexs/asdec/types/shaperecords/CurvedEdgeRecord.java rename to trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java index 78c87fde5..1fa85f83a 100644 --- a/trunk/src/com/jpexs/asdec/types/shaperecords/CurvedEdgeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/CurvedEdgeRecord.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.shaperecords; +package com.jpexs.decompiler.flash.types.shaperecords; /** * diff --git a/trunk/src/com/jpexs/asdec/types/shaperecords/EndShapeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java similarity index 91% rename from trunk/src/com/jpexs/asdec/types/shaperecords/EndShapeRecord.java rename to trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java index 05d33ea28..e1ded1f0c 100644 --- a/trunk/src/com/jpexs/asdec/types/shaperecords/EndShapeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/EndShapeRecord.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.shaperecords; +package com.jpexs.decompiler.flash.types.shaperecords; /** * diff --git a/trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java rename to trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java index ad66fce6e..9d6a23d53 100644 --- a/trunk/src/com/jpexs/asdec/types/shaperecords/SHAPERECORD.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/SHAPERECORD.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.shaperecords; +package com.jpexs.decompiler.flash.types.shaperecords; -import com.jpexs.asdec.types.FILLSTYLE; -import com.jpexs.asdec.types.FILLSTYLEARRAY; -import com.jpexs.asdec.types.LINESTYLE; -import com.jpexs.asdec.types.LINESTYLE2; -import com.jpexs.asdec.types.LINESTYLEARRAY; -import com.jpexs.asdec.types.RECT; +import com.jpexs.decompiler.flash.types.FILLSTYLE; +import com.jpexs.decompiler.flash.types.FILLSTYLEARRAY; +import com.jpexs.decompiler.flash.types.LINESTYLE; +import com.jpexs.decompiler.flash.types.LINESTYLE2; +import com.jpexs.decompiler.flash.types.LINESTYLEARRAY; +import com.jpexs.decompiler.flash.types.RECT; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; diff --git a/trunk/src/com/jpexs/asdec/types/shaperecords/StraightEdgeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java similarity index 93% rename from trunk/src/com/jpexs/asdec/types/shaperecords/StraightEdgeRecord.java rename to trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java index 1a69c550a..3c864c1ca 100644 --- a/trunk/src/com/jpexs/asdec/types/shaperecords/StraightEdgeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StraightEdgeRecord.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.shaperecords; +package com.jpexs.decompiler.flash.types.shaperecords; /** * diff --git a/trunk/src/com/jpexs/asdec/types/shaperecords/StyleChangeRecord.java b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java similarity index 90% rename from trunk/src/com/jpexs/asdec/types/shaperecords/StyleChangeRecord.java rename to trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java index a4079fc56..a6dca335b 100644 --- a/trunk/src/com/jpexs/asdec/types/shaperecords/StyleChangeRecord.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/shaperecords/StyleChangeRecord.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.asdec.types.shaperecords; +package com.jpexs.decompiler.flash.types.shaperecords; -import com.jpexs.asdec.types.FILLSTYLEARRAY; -import com.jpexs.asdec.types.LINESTYLEARRAY; +import com.jpexs.decompiler.flash.types.FILLSTYLEARRAY; +import com.jpexs.decompiler.flash.types.LINESTYLEARRAY; /** *