Merge pull request #9 from Enaium/develop

Develop

Author: Enaium

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'cn.enaium'
-version '0.8.0'
+version '0.9.0'
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 

src/main/java/cn/enaium/joe/JavaOctetEditor.java

@@ -49,21 +49,25 @@ public class JavaOctetEditor {
 
     public Jar jar;
 
-    public FileTabbedPanel fileTabbedPanel = new FileTabbedPanel();
+    public FileTabbedPanel fileTabbedPanel;
 
-    public FileTreePanel fileTreePanel = new FileTreePanel();
+    public FileTreePanel fileTreePanel;
 
-    public BottomPanel bottomPanel = new BottomPanel();
+    public BottomPanel bottomPanel;
 
-    public ConfigManager configManager = new ConfigManager();
+    public ConfigManager configManager;
 
     public JavaOctetEditor() {
         instance = this;
+        configManager = new ConfigManager();
+        configManager.load();
+        Runtime.getRuntime().addShutdownHook(new Thread(configManager::save));
+        fileTabbedPanel = new FileTabbedPanel();
+        fileTreePanel = new FileTreePanel();
+        bottomPanel = new BottomPanel();
     }
 
     public void run() {
-        configManager.load();
-        Runtime.getRuntime().addShutdownHook(new Thread(configManager::save));
 
         ToolTipManager.sharedInstance().setInitialDelay(0);
 
@@ -91,7 +95,7 @@ public void run() {
         window.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(WindowEvent e) {
-                MessageUtil.confirm(LangUtil.i18n("dialog.wantCloseWindow"), "WARNING", () -> {
+                MessageUtil.confirm(LangUtil.i18n("dialog.wantCloseWindow"), LangUtil.i18n("warning"), () -> {
                     window.dispose();
                     System.exit(0);
                 }, () -> {

src/main/java/cn/enaium/joe/annotation/NoUI.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.FIELD)
+public @interface NoUI {
+}

src/main/java/cn/enaium/joe/config/extend/ApplicationConfig.java

@@ -16,10 +16,14 @@
 
 package cn.enaium.joe.config.extend;
 
+import cn.enaium.joe.annotation.NoUI;
 import cn.enaium.joe.config.Config;
 import cn.enaium.joe.config.value.ModeValue;
+import cn.enaium.joe.config.value.StringSetValue;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 
 /**
  * @author Enaium
@@ -28,6 +32,8 @@
 public class ApplicationConfig extends Config {
     public final ModeValue decompilerMode = new ModeValue("Decompiler", "CFR", "Java Decompiler", Arrays.asList("CFR", "Procyon", "JD-Core"));
     public final ModeValue language = new ModeValue("Language", "System", "UI language", Arrays.asList("System", "zh_CN", "en_US"));
+    @NoUI
+    public final StringSetValue loadRecent = new StringSetValue("Load Recent", new HashSet<>(), "");
 
     public ApplicationConfig() {
         super("Application");

src/main/java/cn/enaium/joe/config/value/StringSetValue.java

@@ -0,0 +1,30 @@
+/*
+ * 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.config.value;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Enaium
+ * @since 0.9.0
+ */
+public class StringSetValue extends Value<Set<String>>{
+    public StringSetValue(String name, Set<String> value, String description) {
+        super(name, value, description);
+    }
+}

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

@@ -17,6 +17,7 @@
 package cn.enaium.joe.dialog;
 
 import cn.enaium.joe.JavaOctetEditor;
+import cn.enaium.joe.annotation.NoUI;
 import cn.enaium.joe.config.Config;
 import cn.enaium.joe.config.value.*;
 import cn.enaium.joe.util.LangUtil;
@@ -44,6 +45,12 @@ public ConfigDialog(Config config) {
         try {
             for (Field declaredField : config.getClass().getDeclaredFields()) {
                 declaredField.setAccessible(true);
+
+
+                if (declaredField.isAnnotationPresent(NoUI.class)) {
+                    continue;
+                }
+
                 Object o = declaredField.get(config);
 
                 if (o instanceof Value) {

src/main/java/cn/enaium/joe/gui/component/InstructionComboBox.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.gui.component;
+
+import javax.swing.*;
+
+/**
+ * @author Enaium
+ * @since 0.9.0
+ */
+public class InstructionComboBox extends JComboBox<String> {
+    public InstructionComboBox() {
+        super(new String[]{"Opcode", "Int", "Var", "Type", "Field", "Method", "InvokeDynamic", "Jump", "Label", "LDC", "Incr", "TableSwitch", "LookupSwitch", "MultiANewArray", "Frame", "Line"});
+    }
+}
+
+

src/main/java/cn/enaium/joe/gui/component/LabelNodeComboBox.java

@@ -31,7 +31,7 @@ public class LabelNodeComboBox extends JComboBox<LabelNodeWrapper> {
     public LabelNodeComboBox(AbstractInsnNode instruction, LabelNode select) {
         super(new DefaultComboBoxModel<>());
         LabelNodeWrapper selected = null;
-        for (AbstractInsnNode abstractInsnNode : OpcodeUtil.getInstructionList(instruction)) {
+        for (AbstractInsnNode abstractInsnNode : OpcodeUtil.getInstructionList(select)) {
             if (abstractInsnNode instanceof LabelNode) {
                 LabelNodeWrapper anObject = new LabelNodeWrapper(((LabelNode) abstractInsnNode));
                 if (abstractInsnNode.equals(select)) {

src/main/java/cn/enaium/joe/gui/panel/confirm/BootstrapMethodArgumentEditPanel.java

@@ -16,6 +16,7 @@
 
 package cn.enaium.joe.gui.panel.confirm;
 
+import cn.enaium.joe.util.LangUtil;
 import cn.enaium.joe.util.MessageUtil;
 import cn.enaium.joe.wrapper.Wrapper;
 import org.objectweb.asm.Handle;
@@ -40,7 +41,7 @@ public BootstrapMethodArgumentEditPanel(Wrapper<Object[]> wrapper) {
         }
         add(new JScrollPane(objectJList), BorderLayout.CENTER);
         add(new JPanel() {{
-            add(new JButton("Add") {{
+            add(new JButton(LangUtil.i18n("button.add")) {{
                 addActionListener(e -> {
                     MessageUtil.confirm(new ConfirmPanel() {{
                         setLayout(new BorderLayout());
@@ -49,9 +50,9 @@ public BootstrapMethodArgumentEditPanel(Wrapper<Object[]> wrapper) {
                         add(left, BorderLayout.WEST);
                         add(right, BorderLayout.CENTER);
                         JComboBox<String> jComboBox = new JComboBox<>(new String[]{"String", "float", "double", "int", "long", "Class"});
-                        left.add(new JLabel("Type:"));
+                        left.add(new JLabel(LangUtil.i18n("instruction.type")));
                         right.add(jComboBox);
-                        left.add(new JLabel("Var:"));
+                        left.add(new JLabel(LangUtil.i18n("instruction.var")));
                         JTextField ldc = new JTextField();
                         right.add(ldc);
                         setConfirm(() -> {
@@ -79,7 +80,7 @@ public BootstrapMethodArgumentEditPanel(Wrapper<Object[]> wrapper) {
                                 objectDefaultListModel.addElement(value);
                             }
                         });
-                    }}, "Add");
+                    }}, LangUtil.i18n("button.add"));
                 });
             }});
             add(new JButton("Add Handle") {{
@@ -93,7 +94,7 @@ public BootstrapMethodArgumentEditPanel(Wrapper<Object[]> wrapper) {
                     });
                 });
             }});
-            add(new JButton("Remove") {{
+            add(new JButton(LangUtil.i18n("button.remove")) {{
                 addActionListener(e -> {
                     if (objectJList.getSelectedIndex() != -1) {
                         objectDefaultListModel.remove(objectJList.getSelectedIndex());

src/main/java/cn/enaium/joe/gui/panel/confirm/FrameListEditPanel.java

@@ -16,6 +16,7 @@
 
 package cn.enaium.joe.gui.panel.confirm;
 
+import cn.enaium.joe.util.LangUtil;
 import cn.enaium.joe.util.MessageUtil;
 import cn.enaium.joe.util.OpcodeUtil;
 import cn.enaium.joe.util.StringUtil;
@@ -106,7 +107,7 @@ public ObjectList(List<Object> list) {
                         });
                     });
                 }});
-                add(new JButton("Remove") {{
+                add(new JButton(LangUtil.i18n("button.remove")) {{
                     addActionListener(e -> {
                         if (jList.getSelectedIndex() != -1) {
                             stringDefaultListModel.remove(jList.getSelectedIndex());