task

Author: Enaium

src/main/java/cn/enaium/joe/annotation/Indeterminate.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 Enaium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.enaium.joe.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Enaium
+ * @since 0.9.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Indeterminate {
+}

src/main/java/cn/enaium/joe/dialog/TaskDialog.java

@@ -17,8 +17,9 @@
 package cn.enaium.joe.gui.panel;
 
 import cn.enaium.joe.JavaOctetEditor;
-import cn.enaium.joe.dialog.TaskDialog;
+import cn.enaium.joe.annotation.Indeterminate;
 import cn.enaium.joe.task.AbstractTask;
+import cn.enaium.joe.task.DecompileTask;
 import org.benf.cfr.reader.bytecode.analysis.parse.utils.Pair;
 
 import javax.swing.*;
@@ -36,21 +37,12 @@
  * @author Enaium
  */
 public class BottomPanel extends JPanel {
-    private final JLabel scale = new JLabel();
 
     public BottomPanel() {
         super(new GridLayout(1, 4, 10, 10));
         this.setBorder(new EmptyBorder(5, 5, 5, 5));
 
-        JProgressBar jProgressBar = new JProgressBar() {{
-            addMouseListener(new MouseAdapter() {
-                @Override
-                public void mouseReleased(MouseEvent e) {
-                    new TaskDialog().setVisible(true);
-                    super.mouseReleased(e);
-                }
-            });
-        }};
+        JProgressBar jProgressBar = new JProgressBar();
 
         add(jProgressBar);
 
@@ -61,22 +53,28 @@ public void mouseReleased(MouseEvent e) {
                 SwingUtilities.invokeLater(() -> {
                     jProgressBar.setValue(0);
                     jProgressBar.setStringPainted(true);
+                    jProgressBar.setIndeterminate(false);
                     jProgressBar.setString("");
                     jProgressBar.repaint();
                 });
             } else {
-                Pair<AbstractTask<?>, CompletableFuture<?>> classCompletableFuturePair = task.get(0);
+                Pair<AbstractTask<?>, CompletableFuture<?>> classCompletableFuturePair = task.get(task.size() - 1);
                 SwingUtilities.invokeLater(() -> {
                     int progress = classCompletableFuturePair.getFirst().getProgress();
-                    jProgressBar.setValue(progress);
-                    jProgressBar.setStringPainted(true);
-                    jProgressBar.setString(String.format("%s:%s", classCompletableFuturePair.getFirst().getName(), progress) + "%");
+                    if (!classCompletableFuturePair.getFirst().getClass().isAnnotationPresent(Indeterminate.class)) {
+                        jProgressBar.setValue(progress);
+                        jProgressBar.setStringPainted(true);
+                        jProgressBar.setIndeterminate(false);
+                        jProgressBar.setString(String.format("%s:%s", classCompletableFuturePair.getFirst().getName(), progress) + "%");
+                    } else {
+                        jProgressBar.setString(classCompletableFuturePair.getFirst().getName());
+                        jProgressBar.setIndeterminate(true);
+                    }
                     jProgressBar.repaint();
                 });
             }
         }, 1, 1, TimeUnit.MILLISECONDS);
 
-        add(scale);
         JLabel label = new JLabel("\u00A9 Enaium 2022");
         label.setHorizontalAlignment(SwingConstants.RIGHT);
         add(label);

src/main/java/cn/enaium/joe/gui/panel/BottomPanel.java

@@ -100,6 +100,7 @@ public void keyReleased(KeyEvent e) {
         codeAreaPanel.getTextArea().setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
         codeAreaPanel.getTextArea().setEditable(true);
         StringWriter stringWriter = new StringWriter();
+
         ASyncUtil.execute(() -> {
             classNode.accept(new TraceClassVisitor(null, new ASMifier(), new PrintWriter(stringWriter)));
         }, () -> {

src/main/java/cn/enaium/joe/gui/panel/file/tabbed/tab/classes/ASMifierTablePanel.java

@@ -16,8 +16,10 @@
 
 package cn.enaium.joe.gui.panel.file.tabbed.tab.classes;
 
+import cn.enaium.joe.JavaOctetEditor;
 import cn.enaium.joe.service.DecompileService;
 import cn.enaium.joe.gui.panel.CodeAreaPanel;
+import cn.enaium.joe.task.DecompileTask;
 import cn.enaium.joe.util.ASyncUtil;
 import org.objectweb.asm.tree.ClassNode;
 
@@ -32,8 +34,8 @@ public DecompileTabPanel(ClassNode classNode) {
         setLayout(new BorderLayout());
         CodeAreaPanel codeAreaPanel = new CodeAreaPanel();
         codeAreaPanel.getTextArea().setSyntaxEditingStyle("text/java");
-        ASyncUtil.execute(() -> {
-            codeAreaPanel.getTextArea().setText(DecompileService.getService().decompile(classNode));
+        JavaOctetEditor.getInstance().task.submit(new DecompileTask(classNode)).thenAccept(it -> {
+            codeAreaPanel.getTextArea().setText(it);
         });
         codeAreaPanel.getTextArea().setCaretPosition(0);
         add(codeAreaPanel);

src/main/java/cn/enaium/joe/gui/panel/file/tabbed/tab/classes/DecompileTabPanel.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 Enaium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.enaium.joe.task;
+
+import cn.enaium.joe.annotation.Repeatable;
+import cn.enaium.joe.service.DecompileService;
+import org.objectweb.asm.tree.ClassNode;
+import org.tinylog.Logger;
+
+/**
+ * @author Enaium
+ * @since 0.10.0
+ */
+@Repeatable
+public class DecompileTask extends AbstractTask<String> {
+
+    private final ClassNode classNode;
+
+    public DecompileTask(ClassNode classNode) {
+        super("Decompile");
+        this.classNode = classNode;
+    }
+
+    @Override
+    public String get() {
+        Logger.info("DECOMPILE:{}", classNode.name);
+        return DecompileService.getService().decompile(classNode);
+    }
+}