separating gui

trunk/src/com/jpexs/decompiler/flash/FrameNode.java

@@ -16,8 +16,6 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
-
 /**
  *
  * @author JPEXS

trunk/src/com/jpexs/decompiler/flash/PackageNode.java

@@ -16,8 +16,6 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
-
 /**
  *
  * @author JPEXS

trunk/src/com/jpexs/decompiler/flash/SWF.java

@@ -55,7 +55,6 @@ import com.jpexs.decompiler.flash.flv.AUDIODATA;
 import com.jpexs.decompiler.flash.flv.FLVOutputStream;
 import com.jpexs.decompiler.flash.flv.FLVTAG;
 import com.jpexs.decompiler.flash.flv.VIDEODATA;
-import com.jpexs.decompiler.flash.gui.SWFSourceInfo;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
 import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;

trunk/src/com/jpexs/decompiler/flash/SWFSourceInfo.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.jpexs.decompiler.flash.gui;
+package com.jpexs.decompiler.flash;
 
 import java.io.InputStream;
 

trunk/src/com/jpexs/decompiler/flash/StringNode.java

@@ -16,8 +16,6 @@
  */
 package com.jpexs.decompiler.flash;
 
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
-
 /**
  *
  * @author JPEXS

trunk/src/com/jpexs/decompiler/flash/TagNode.java

@@ -18,8 +18,6 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.TreeNode;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
 import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG2Tag;
 import com.jpexs.decompiler.flash.tags.DefineBitsJPEG3Tag;

trunk/src/com/jpexs/decompiler/flash/TreeElementItem.java

@@ -14,7 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.jpexs.decompiler.flash.gui.abc;
+package com.jpexs.decompiler.flash;
 
 /**
  *

trunk/src/com/jpexs/decompiler/flash/TreeNode.java

@@ -14,9 +14,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.jpexs.decompiler.flash.gui;
-
-import com.jpexs.decompiler.flash.SWF;
+package com.jpexs.decompiler.flash;
 
 /**
  *

trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java

@@ -16,12 +16,12 @@
  */
 package com.jpexs.decompiler.flash.abc;
 
+import com.jpexs.decompiler.flash.TreeElementItem;
 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.traits.Trait;
 import com.jpexs.decompiler.flash.configuration.Configuration;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
 import com.jpexs.decompiler.flash.helpers.FileTextWriter;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;

trunk/src/com/jpexs/decompiler/flash/gui/Main.java

@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui;
 import com.jpexs.decompiler.flash.ApplicationInfo;
 import com.jpexs.decompiler.flash.EventListener;
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.SWFSourceInfo;
 import com.jpexs.decompiler.flash.Version;
 import com.jpexs.decompiler.flash.abc.avm2.AVM2Code;
 import com.jpexs.decompiler.flash.configuration.Configuration;

trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java

@@ -23,6 +23,8 @@ import com.jpexs.decompiler.flash.PackageNode;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.TagNode;
+import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeNode;
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.RenameType;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
@@ -36,7 +38,6 @@ import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
 import com.jpexs.decompiler.flash.gui.abc.DeobfuscationDialog;
 import com.jpexs.decompiler.flash.gui.abc.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.gui.abc.TreeElement;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
 import com.jpexs.decompiler.flash.gui.action.ActionPanel;
 import com.jpexs.decompiler.flash.gui.player.FlashPlayerPanel;
 import com.jpexs.decompiler.flash.gui.player.PlayerControls;

trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java

@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.TagNode;
+import com.jpexs.decompiler.flash.TreeNode;
 import java.util.List;
 
 /**

trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java

@@ -20,7 +20,7 @@ import com.jpexs.decompiler.flash.FrameNode;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.StringNode;
 import com.jpexs.decompiler.flash.TagNode;
-import com.jpexs.decompiler.flash.gui.abc.ABCPanel;
+import com.jpexs.decompiler.flash.TreeNode;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
 import com.jpexs.decompiler.flash.gui.abc.TreeElement;
 import com.jpexs.decompiler.flash.tags.DefineSpriteTag;

trunk/src/com/jpexs/decompiler/flash/gui/TagTreeRoot.java

@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.TreeNode;
 
 /**
  *

trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java

@@ -17,14 +17,12 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.abc.ClassPath;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.View;
-import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import com.jpexs.helpers.CancellableWorker;
 import java.util.ArrayList;

trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTreeModel.java

@@ -17,12 +17,13 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeNode;
 import com.jpexs.decompiler.flash.abc.ClassPath;
 import com.jpexs.decompiler.flash.abc.ScriptPack;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitClass;
 import com.jpexs.decompiler.flash.gui.AppStrings;
-import com.jpexs.decompiler.flash.gui.TreeNode;
 import com.jpexs.decompiler.flash.helpers.collections.MyEntry;
 import java.util.ArrayList;
 import java.util.List;
@@ -84,7 +85,6 @@ public class ClassesListTreeModel implements TreeModel, TreeElementItem {
     private SWF swf;
     private Tree classTree;
     private List<MyEntry<ClassPath, ScriptPack>> list;
-    private String filter;
     private List<TreeModelListener> listeners = new ArrayList<>();
 
     public List<MyEntry<ClassPath, ScriptPack>> getList() {
@@ -110,7 +110,6 @@ public class ClassesListTreeModel implements TreeModel, TreeElementItem {
     }
     
     public final void setFilter(String filter) {
-        this.filter = filter;
         classTree = new Tree(swf);
         for (MyEntry<ClassPath, ScriptPack> item : list) {
             if (filter != null) {

trunk/src/com/jpexs/decompiler/flash/gui/abc/Tree.java

@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
+import com.jpexs.decompiler.flash.TreeElementItem;
 import java.util.StringTokenizer;
 
 public class Tree {

trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java

@@ -17,7 +17,8 @@
 package com.jpexs.decompiler.flash.gui.abc;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.gui.TreeNode;
+import com.jpexs.decompiler.flash.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeNode;
 import java.util.*;
 import javax.swing.tree.TreePath;
 

trunk/src/com/jpexs/decompiler/flash/tags/base/ContainerItem.java

@@ -17,7 +17,7 @@
 package com.jpexs.decompiler.flash.tags.base;
 
 import com.jpexs.decompiler.flash.SWF;
-import com.jpexs.decompiler.flash.gui.abc.TreeElementItem;
+import com.jpexs.decompiler.flash.TreeElementItem;
 
 /**
  * Object which contains other objects