Make reload resources actually update viewer panes' contents

rcx · rcx · commit 3f9cf198c3bf · 2018-05-30T04:53:55.000-04:00
Refactor MainViewerGUI#setIcon into JDA#setBusy and make thread-safe
diff --git a/src/main/java/club/bytecode/the/jda/JDA.java b/src/main/java/club/bytecode/the/jda/JDA.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class JDA {
     /*per version*/
@@ -49,6 +50,7 @@ public class JDA {
     public static String lastDirectory = "";
     public static List<Process> createdProcesses = new ArrayList<>();
     public static List<Plugin> plugins = new ArrayList<>();
+    private static AtomicInteger jobCount = new AtomicInteger(0);
 
     /**
      * Main startup
@@ -152,6 +154,34 @@ private static void onExit() {
             viewer.unmaximizedPos = viewer.getLocation();
         Settings.saveGUI();
     }
+    
+    /**
+     * Waits for all busy-setting tasks to complete.
+     */
+    public static void waitForTasks() {
+        while (jobCount.get() > 0) {
+            try {
+                Thread.sleep(10L);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Sets the busy state, and toggles the spinner icon
+     * Make sure to call me OUTSIDE of your worker thread for busy=true!
+     * Then, you must call again busy=false once your worker thread finishes!
+     * @param busy whether a background task is running
+     */
+    public static void setBusy(boolean busy) {
+        if (busy)
+            jobCount.incrementAndGet();
+        else
+            jobCount.decrementAndGet();
+        assert (jobCount.get() >= 0);
+        viewer.setIcon(busy);
+    }
 
     public static byte[] getFileBytes(ViewerFile file) {
         if (file.container != null)
@@ -261,13 +291,13 @@ public static void openFiles(final File[] files, boolean recentFiles) {
     }
 
     public static void openFiles(final File[] files, boolean recentFiles, FileNavigationPane.FileNode parent) {
+        JDA.setBusy(true);
+        
         if (recentFiles)
             for (File f : files)
                 if (f.exists())
                     JDA.addRecentFile(f);
 
-        JDA.viewer.setIcon(true);
-
         FileNavigationPane fnp = MainViewerGUI.getComponent(FileNavigationPane.class);
 
         (new Thread(() -> {
@@ -304,7 +334,7 @@ public static void openFiles(final File[] files, boolean recentFiles, FileNaviga
             } catch (final Exception e) {
                 new ExceptionUI(e);
             } finally {
-                JDA.viewer.setIcon(false);
+                JDA.setBusy(false);
             }
         })).start();
     }
@@ -559,12 +589,12 @@ public String getDescription() {
 
                         final File file2 = file;
 
-                        JDA.viewer.setIcon(true);
+                        JDA.setBusy(true);
                         Thread t = new Thread() {
                             @Override
                             public void run() {
                                 JarUtils.saveAsJar(JDA.getLoadedBytes(), file2.getAbsolutePath());
-                                JDA.viewer.setIcon(false);
+                                JDA.setBusy(false);
                             }
                         };
                         t.start();
@@ -595,9 +625,9 @@ public static void openFileChooser() {
         if (returnVal == JFileChooser.APPROVE_OPTION) {
             JDA.lastDirectory = fc.getSelectedFile().getAbsolutePath();
             try {
-                JDA.viewer.setIcon(true);
+                JDA.setBusy(true);
                 JDA.openFiles(new File[]{fc.getSelectedFile()}, true);
-                JDA.viewer.setIcon(false);
+                JDA.setBusy(false);
             } catch (Exception e1) {
                 new ExceptionUI(e1);
             }
diff --git a/src/main/java/club/bytecode/the/jda/gui/MainViewerGUI.java b/src/main/java/club/bytecode/the/jda/gui/MainViewerGUI.java
@@ -382,6 +382,11 @@ public void closeResources() {
         fileViewerPane.resetWorkspace();
     }
 
+    /**
+     * Toggles the spinner icon on and off.
+     * DON'T CALL ME DIRECTLY. CALL JDA.setBusy INSTEAD!!!!
+     * @param busy whether to show the busy spinner icon or not
+     */
     public void setIcon(final boolean busy) {
         SwingUtilities.invokeLater(() -> {
             if (busy) {
@@ -430,14 +435,26 @@ public void reloadResources() {
                 result = k;
 
         if (result == 0) {
-            ArrayList<File> reopen = new ArrayList<>();
+            List<File> reopenContainers = new ArrayList<>();
             for (FileContainer container : JDA.files)
-                reopen.add(container.file);
+                reopenContainers.add(container.file);
 
             JDA.files.clear();
-            closeResources();
-
-            JDA.openFiles(reopen.toArray(new File[reopen.size()]), false);
+            navigator.resetWorkspace();
+
+            JDA.openFiles(reopenContainers.toArray(new File[reopenContainers.size()]), false);
+            JDA.waitForTasks(); // this is not really ideal, but whatever.
+            assert(JDA.files.size() > 0);
+            for (Viewer v : fileViewerPane.getLoadedViewers()) {
+                for (FileContainer newContainer : JDA.files) {
+                    if (newContainer.file.equals(v.getFile().container.file)) {
+                        v.setFile(new ViewerFile(newContainer, v.getFile().name));
+                        v.refresh(null);
+                        System.out.println("Found it");
+                        break;
+                    }
+                }
+            }
             refreshView();
         }
     }
diff --git a/src/main/java/club/bytecode/the/jda/gui/dialogs/ExportJar.java b/src/main/java/club/bytecode/the/jda/gui/dialogs/ExportJar.java
@@ -36,12 +36,12 @@ public ExportJar(final String jarPath) {
         getContentPane().add(btnNewButton);
 
         btnNewButton.addActionListener(arg0 -> {
-            JDA.viewer.setIcon(true);
+            JDA.setBusy(true);
             Thread t = new Thread() {
                 @Override
                 public void run() {
                     JarUtils.saveAsJar(JDA.getLoadedClasses(), jarPath, mani.getText());
-                    JDA.viewer.setIcon(false);
+                    JDA.setBusy(false);
                 }
             };
             t.start();
diff --git a/src/main/java/club/bytecode/the/jda/gui/fileviewer/ClassViewer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/ClassViewer.java
@@ -2,6 +2,7 @@
 
 import club.bytecode.the.jda.JDA;
 import club.bytecode.the.jda.decompilers.JDADecompiler;
+import com.strobel.annotations.Nullable;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.objectweb.asm.tree.ClassNode;
 
@@ -108,7 +109,6 @@ public ClassViewer(ViewerFile file, final ClassNode cn) {
         this.sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, sp, panels.get(2));
         this.add(sp2, BorderLayout.CENTER);
 
-        JDA.viewer.setIcon(true);
         refresh(null);
         this.addComponentListener(new ComponentAdapter() {
             public void componentResized(ComponentEvent e) {
@@ -162,7 +162,7 @@ public void resetDivider() {
     }
 
     @Override
-    public void refresh(final JButton button) {
+    public void refresh(@Nullable final JButton button) {
         this.cn = getFile().container.getClassNode(cn.name); //update the classnode
         setPanes();
 
diff --git a/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewer.java
@@ -1,6 +1,7 @@
 package club.bytecode.the.jda.gui.fileviewer;
 
 import club.bytecode.the.jda.api.ExceptionUI;
+import com.strobel.annotations.Nullable;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rtextarea.RTextScrollPane;
@@ -159,9 +160,11 @@ public FileViewer(ViewerFile file, final byte[] contents) {
     }
 
     @Override
-    public void refresh(JButton src) {
+    public void refresh(@Nullable JButton src) {
         if (!canRefresh) {
-            src.setEnabled(true);
+            if (src != null) { // this is such a kludge
+                src.setEnabled(true);
+            }
             return;
         }
 
@@ -175,6 +178,8 @@ public void refresh(JButton src) {
         panel2.add(label, BorderLayout.CENTER);
         panel2.updateUI();
 
-        src.setEnabled(true);
+        if (src != null) {
+            src.setEnabled(true);
+        }
     }
 }
diff --git a/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewerPane.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/FileViewerPane.java
@@ -55,9 +55,9 @@ public FileViewerPane(final FileChangeNotifier fcn) {
             if (tabComp != null) {
                 assert(tabComp instanceof Viewer);
                 Viewer viewer = (Viewer) tabComp;
-                JDA.viewer.setIcon(true);
+                JDA.setBusy(true);
                 viewer.refresh(refreshClass);
-                JDA.viewer.setIcon(false);
+                JDA.setBusy(false);
             }
         })).start());
 
@@ -136,8 +136,13 @@ public Viewer getCurrentViewer() {
         return (Viewer) tabs.getSelectedComponent();
     }
     
-    public Viewer[] getLoadedViewers() {
-        return (Viewer[]) tabs.getComponents();
+    public List<Viewer> getLoadedViewers() {
+        ArrayList<Viewer> result = new ArrayList<>();
+        for (Component c : tabs.getComponents()) {
+            if (c instanceof Viewer)
+                result.add((Viewer) c);
+        }
+        return result;
     }
 
     /**
diff --git a/src/main/java/club/bytecode/the/jda/gui/fileviewer/PaneUpdaterThread.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/PaneUpdaterThread.java
@@ -5,6 +5,7 @@
 import club.bytecode.the.jda.decompilers.JDADecompiler;
 import club.bytecode.the.jda.decompilers.bytecode.BytecodeDecompiler;
 import club.bytecode.the.jda.settings.Settings;
+import com.strobel.annotations.Nullable;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.fife.ui.rtextarea.RTextScrollPane;
@@ -23,14 +24,15 @@ public class PaneUpdaterThread extends Thread {
     private int paneId;
     private JPanel target;
     private ClassViewer viewer;
-    private JButton button; // this needs to be refactored into something event-based, not a stupid hack like this! 
+    @Nullable private JButton button; // this needs to be refactored into something event-based, not a stupid hack like this! 
 
-    public PaneUpdaterThread(ClassViewer viewer, JDADecompiler decompiler, int paneId, JPanel target, JButton button) {
+    public PaneUpdaterThread(ClassViewer viewer, JDADecompiler decompiler, int paneId, JPanel target, @Nullable JButton button) {
         this.decompiler = decompiler;
         this.paneId = paneId;
         this.target = target;
         this.viewer = viewer;
         this.button = button;
+        JDA.setBusy(true);
     }
 
     public void run() {
@@ -58,7 +60,7 @@ public void run() {
             new ExceptionUI(e);
         } finally {
             viewer.resetDivider();
-            JDA.viewer.setIcon(false);
+            JDA.setBusy(false);
             if (button != null)
                 button.setEnabled(true);
         }
@@ -70,14 +72,14 @@ private String stripUndisplayableChars(String s) {
         while (idx < s.length()) {
             char c = s.charAt(idx);
             if (isUndisplayable(c)) {
-                result.append(s.substring(startIdx, idx));
+                result.append(s, startIdx, idx);
                 result.append("\\u").append(Integer.toHexString(c));
                 startIdx = idx + 1;
             }
             idx++;
         }
         if (idx > startIdx)
-            result.append(s.substring(startIdx, idx));
+            result.append(s, startIdx, idx);
         return result.toString();
     }
 
diff --git a/src/main/java/club/bytecode/the/jda/gui/fileviewer/Viewer.java b/src/main/java/club/bytecode/the/jda/gui/fileviewer/Viewer.java
@@ -1,6 +1,7 @@
 package club.bytecode.the.jda.gui.fileviewer;
 
 import club.bytecode.the.jda.settings.Settings;
+import com.strobel.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -25,5 +26,5 @@ public void updateName() {
         this.setName(getFile().name + (Settings.SHOW_CONTAINER_NAME.getBool() ? "(" + getFile().container + ")" : ""));
     }
 
-    public abstract void refresh(JButton button);
+    public abstract void refresh(@Nullable JButton button);
 }
diff --git a/src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java b/src/main/java/club/bytecode/the/jda/gui/navigation/FileNavigationPane.java
@@ -448,7 +448,12 @@ public void openPath(TreePath path) {
                 openClassFileToWorkSpace(file, cn);
             }
         } else {
-            openFileToWorkSpace(file, JDA.getFileBytes(file));
+            byte[] fileContents = JDA.getFileBytes(file);
+            if (fileContents != null) { // if it's null, it's a directory or some non-leaf tree node
+                openFileToWorkSpace(file, fileContents);
+            } else {
+                tree.expandPath(path);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package club.bytecode.the.jda.gui.fileviewer;`
`2`	`2`
`3`	`3`	`import club.bytecode.the.jda.settings.Settings;`
	`4`	`+import com.strobel.annotations.Nullable;`
`4`	`5`
`5`	`6`	`import javax.swing.*;`
`6`	`7`
`@@ -25,5 +26,5 @@ public void updateName() {`
`25`	`26`	`this.setName(getFile().name + (Settings.SHOW_CONTAINER_NAME.getBool() ? "(" + getFile().container + ")" : ""));`
`26`	`27`	`}`
`27`	`28`
`28`		`- public abstract void refresh(JButton button);`
	`29`	`+ public abstract void refresh(@Nullable JButton button);`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,12 @@ public void openPath(TreePath path) {`
`448`	`448`	`openClassFileToWorkSpace(file, cn);`
`449`	`449`	`}`
`450`	`450`	`} else {`
`451`		`- openFileToWorkSpace(file, JDA.getFileBytes(file));`
	`451`	`+ byte[] fileContents = JDA.getFileBytes(file);`
	`452`	`+ if (fileContents != null) { // if it's null, it's a directory or some non-leaf tree node`
	`453`	`+ openFileToWorkSpace(file, fileContents);`
	`454`	`+ } else {`
	`455`	`+ tree.expandPath(path);`
	`456`	`+ }`
`452`	`457`	`}`
`453`	`458`	`}`
`454`	`459`