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 af1b033c3..000000000 Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/icon16.png and /dev/null differ diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/icon256.png b/trunk/src/com/jpexs/asdec/gui/graphics/icon256.png deleted file mode 100644 index 795fbf28b..000000000 Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/icon256.png and /dev/null differ diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/icon32.png b/trunk/src/com/jpexs/asdec/gui/graphics/icon32.png deleted file mode 100644 index 341abba8d..000000000 Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/icon32.png and /dev/null differ 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 f99cff7e0..000000000 Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/icon48.png and /dev/null differ diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/logo.png b/trunk/src/com/jpexs/asdec/gui/graphics/logo.png deleted file mode 100644 index bb1fbccb2..000000000 Binary files a/trunk/src/com/jpexs/asdec/gui/graphics/logo.png and /dev/null differ 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 000000000..c2cd4d0e4 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon16.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png new file mode 100644 index 000000000..67422d30a Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon256.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png new file mode 100644 index 000000000..16ddcfdff Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon32.png differ diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png new file mode 100644 index 000000000..4dd361b1b Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/icon48.png differ 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 000000000..4a2d9aec1 Binary files /dev/null and b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/logo.png differ diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/morphshape16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/morphshape16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/morphshape16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/morphshape16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/open16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/open16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/open16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/open16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/open24.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/open24.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/open24.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/open24.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/pcode16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/pcode16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/pcode16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/pcode16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/proxy16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy24.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy24.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/proxy24.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy24.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy32.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy32.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/proxy32.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy32.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/proxy48.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy48.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/proxy48.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/proxy48.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/save16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/save16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/save16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/save16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/saveas16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveas16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/saveas16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveas16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/search.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/search.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/search.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/search.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/shape16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/shape16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/shape16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/shape16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/sprite16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/sprite16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/sprite16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/sprite16.png diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/text16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/text16.png similarity index 100% rename from trunk/src/com/jpexs/asdec/gui/graphics/text16.png rename to trunk/src/com/jpexs/decompiler/flash/gui/graphics/text16.png diff --git a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java similarity index 92% rename from trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java rename to trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java index b057bba76..3e6da6293 100644 --- a/trunk/src/com/jpexs/asdec/gui/proxy/ProxyFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.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.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; /** *