From c7fb387859a70d713c87fdfe2290d1b7e9da4476 Mon Sep 17 00:00:00 2001
From: honfika <honfika@gmail.com>
Date: Thu, 31 Jul 2014 18:46:21 +0200
Subject: [PATCH] #627 Filter swf not working fixed

---
 .../decompiler/flash/action/ActionListReader.java      | 10 ++++------
 src/com/jpexs/decompiler/flash/gui/MainPanel.java      |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/com/jpexs/decompiler/flash/action/ActionListReader.java b/src/com/jpexs/decompiler/flash/action/ActionListReader.java
index 7defc12d4..cc74a3d41 100644
--- a/src/com/jpexs/decompiler/flash/action/ActionListReader.java
+++ b/src/com/jpexs/decompiler/flash/action/ActionListReader.java
@@ -122,9 +122,7 @@ public class ActionListReader {
      * @throws IOException
      * @throws java.lang.InterruptedException
      */
-    public static List<Action> readActionList(List<DisassemblyListener> listeners, SWFInputStream sis, int version, int ip, int endIp, String path) throws IOException, InterruptedException {
-        boolean deobfuscate = Configuration.autoDeobfuscate.get();
-
+    private static List<Action> readActionList(List<DisassemblyListener> listeners, SWFInputStream sis, int version, int ip, int endIp, String path) throws IOException, InterruptedException {
         ConstantPool cpool = new ConstantPool();
 
         // List of the actions. N. item contains the action which starts in offset N.
@@ -189,7 +187,7 @@ public class ActionListReader {
         updateContainerSizes(actions, containerLastActions);
         updateActionLengths(actions, version);
 
-        if (deobfuscate) {
+        if (Configuration.autoDeobfuscate.get()) {
             try {
                 actions = deobfuscateActionList(listeners, actions, version, ip, path);
                 updateActionLengths(actions, version);
@@ -216,7 +214,7 @@ public class ActionListReader {
      * @throws IOException
      * @throws java.lang.InterruptedException
      */
-    public static List<Action> deobfuscateActionList(List<DisassemblyListener> listeners, List<Action> actions, int version, int ip, String path) throws IOException, InterruptedException {
+    private static List<Action> deobfuscateActionList(List<DisassemblyListener> listeners, List<Action> actions, int version, int ip, String path) throws IOException, InterruptedException {
         if (actions.isEmpty()) {
             return actions;
         }
@@ -525,7 +523,7 @@ public class ActionListReader {
      * @param removeWhenLast
      * @return
      */
-    public static boolean removeAction(List<Action> actions, int index, int version, boolean removeWhenLast) {
+    private static boolean removeAction(List<Action> actions, int index, int version, boolean removeWhenLast) {
 
         if (index < 0 || actions.size() <= index) {
             return false;
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 1daa51850..7f93e81c5 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -2139,6 +2139,7 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
             showDetail(DETAILCARDEMPTYPANEL);
         } else {
             treePanel.add(new JScrollPane(tagTree), BorderLayout.CENTER);
+            treePanel.add(searchPanel, BorderLayout.SOUTH);
             treePanelMode = TreePanelMode.TAG_TREE;
         }
         reload(true);