Upstream dev

README.md

@@ -5,6 +5,7 @@ Keep the latest library, remove upstream problems and absorb upstream ideas.
 
 ![GitHub all releases](https://img.shields.io/github/downloads/Ecdcaeb/JavaOctetEditor/total?style=flat-square)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Ecdcaeb/JavaOctetEditor?style=flat-square)
+![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Ecdcaeb/JavaOctetEditor?include_prereleases&style=flat-square)
 ![GitHub](https://img.shields.io/github/license/Ecdcaeb/JavaOctetEditor?style=flat-square)
 
 ![](https://user-images.githubusercontent.com/32991121/190947407-bbc6642e-2c9d-46f3-921c-6558c74272cf.png)

build.gradle

@@ -41,6 +41,7 @@ dependencies {
 
     implementation 'com.formdev:flatlaf:3.5.2'
     implementation 'com.formdev:flatlaf-extras:3.5.2'
+    implementation 'com.github.weisj:jsvg:1.6.1'
     //noinspection GradlePackageUpdate
     implementation 'com.miglayout:miglayout-swing:11.4.2'
     implementation 'com.github.bobbylight:RSyntaxTextArea:3.5.2'
@@ -65,11 +66,11 @@ shadowJar {
     dependencies {
         include(dependency('com.formdev:.*'))
         include(dependency('com.miglayout:.*'))
+        include(dependency('com.github.weisj:.*'))
         include(dependency('com.github.bobbylight:RSyntaxTextArea'))
         include(dependency('org.ow2.asm:.*'))
         include(dependency('org.benf:cfr'))
         include(dependency('com.github.mstrobel.procyon:procyon-decompiler'))
-        include(dependency('org.javassist:javassist'))
         include(dependency('com.google.code.gson:gson'))
         include(dependency('org.tinylog:.*'))
         include(dependency('org.vineflower:vineflower'))

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

@@ -0,0 +1,6 @@
+package cn.enaium.joe;
+
+public enum Instance {
+    INSTANCE;
+    public int classTabIndex = 0;
+}

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

@@ -17,18 +17,18 @@
 package cn.enaium.joe;
 
 import cn.enaium.joe.config.ConfigManager;
+import cn.enaium.joe.config.extend.ApplicationConfig;
 import cn.enaium.joe.event.EventManager;
+import cn.enaium.joe.gui.panel.BorderPanel;
 import cn.enaium.joe.gui.panel.BottomPanel;
 import cn.enaium.joe.gui.panel.file.tree.CenterPanel;
 import cn.enaium.joe.gui.panel.file.tabbed.FileTabbedPanel;
 import cn.enaium.joe.gui.component.FileTree;
 import cn.enaium.joe.gui.panel.menu.*;
 import cn.enaium.joe.jar.Jar;
 import cn.enaium.joe.task.TaskManager;
-import cn.enaium.joe.util.BytecodeTokenMaker;
-import cn.enaium.joe.util.LangUtil;
-import cn.enaium.joe.util.MessageUtil;
-import cn.enaium.joe.util.ReflectUtil;
+import cn.enaium.joe.util.*;
+import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
 import org.fife.ui.rsyntaxtextarea.TokenMakerFactory;
@@ -45,7 +45,7 @@ public class JavaOctetEditor {
 
     public static final String TITLE = "JavaOctetEditor";
 
-    public JFrame window = new JFrame(TITLE);
+    public JFrame window;
 
     private Jar jar;
 
@@ -64,11 +64,22 @@ public class JavaOctetEditor {
 
     public JavaOctetEditor() {
         instance = this;
+
         event = new EventManager();
         config = new ConfigManager();
         config.load();
         task = new TaskManager();
         Runtime.getRuntime().addShutdownHook(new Thread(config::save));
+
+        Integer value = config.getByClass(ApplicationConfig.class).scale.getValue();
+
+        if (value > 0) {
+            System.setProperty("sun.java2d.uiScale", value.toString());
+        }
+
+        FlatDarkLaf.setup();
+        UIManager.put("Tree.paintLines", true);
+
         fileTabbedPanel = new FileTabbedPanel();
         fileTree = new FileTree();
         bottomPanel = new BottomPanel();
@@ -77,10 +88,10 @@ public JavaOctetEditor() {
     public void run() {
 
         ToolTipManager.sharedInstance().setInitialDelay(0);
-
+        FlatDarkLaf.setup();
         AbstractTokenMakerFactory abstractTokenMakerFactory = (AbstractTokenMakerFactory) TokenMakerFactory.getDefaultInstance();
         abstractTokenMakerFactory.putMapping("text/custom", BytecodeTokenMaker.class.getName());
-
+        window = new JFrame(TITLE);
         window.setIconImage(new FlatSVGIcon("icons/logo.svg").getImage());
 
         window.setJMenuBar(new JMenuBar() {{
@@ -98,9 +109,9 @@ public void run() {
             add(new HelpMenu());
         }});
 
-        window.setContentPane(new JPanel(new BorderLayout()) {{
-            add(new CenterPanel(), BorderLayout.CENTER);
-            add(bottomPanel, BorderLayout.SOUTH);
+        window.setContentPane(new BorderPanel() {{
+            setCenter(new CenterPanel());
+            setBottom(bottomPanel);
         }});
 
 
@@ -115,7 +126,7 @@ public void windowClosing(WindowEvent e) {
                 });
             }
         });
-        window.setSize(1000, 600);
+        window.setSize(Util.screenSize(1000, 600));
         window.setLocationRelativeTo(null);
         window.setVisible(true);
     }

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

@@ -16,6 +16,7 @@
 
 package cn.enaium.joe;
 
+import cn.enaium.joe.config.extend.ApplicationConfig;
 import cn.enaium.joe.jar.Jar;
 import cn.enaium.joe.util.*;
 import com.formdev.flatlaf.FlatDarkLaf;
@@ -77,8 +78,6 @@ private static void launch() {
         System.setErr(new TinyLogPrintStream(System.err, STDERR));
 
         Logger.info("DIR:{}", System.getProperty("user.dir"));
-        FlatDarkLaf.setup();
-        UIManager.put("Tree.paintLines", true);
         new JavaOctetEditor().run();
     }
 

src/main/java/cn/enaium/joe/compiler/Compiler.java

@@ -0,0 +1,77 @@
+/*
+ * 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.compiler;
+
+import javax.tools.*;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Enaium
+ * @since 1.4.0
+ */
+public class Compiler {
+    private final Map<String, VirtualJavaFileObject> javaFileObjectMap = new HashMap<>();
+
+    private DiagnosticListener<VirtualJavaFileObject> listener;
+
+    public void addSource(String name, String content) {
+        javaFileObjectMap.put(name, new VirtualJavaFileObject(name, content));
+    }
+
+    public Map<String, byte[]> getClasses() {
+        return javaFileObjectMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, v -> v.getValue().getBytecode()));
+    }
+
+    @SuppressWarnings("unchecked")
+    public boolean compile() {
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        VirtualFileManager fileManager = new VirtualFileManager(compiler.getStandardFileManager(null, null, StandardCharsets.UTF_8));
+        try {
+            JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, ((DiagnosticListener<? super JavaFileObject>) (Object) listener), null, null, javaFileObjectMap.values());
+            Boolean b = task.call();
+            return b != null && b;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public void setListener(DiagnosticListener<VirtualJavaFileObject> listener) {
+        this.listener = listener;
+    }
+
+    private final class VirtualFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+        public VirtualFileManager(JavaFileManager fileManager) {
+            super(fileManager);
+        }
+
+        @Override
+        public JavaFileObject getJavaFileForOutput(JavaFileManager.Location location, String className, JavaFileObject.Kind kind, FileObject sibling) throws IOException {
+            if (JavaFileObject.Kind.CLASS == kind) {
+                VirtualJavaFileObject virtualJavaFileObject = new VirtualJavaFileObject(className, null);
+                javaFileObjectMap.put(className, virtualJavaFileObject);
+                return virtualJavaFileObject;
+            } else {
+                return super.getJavaFileForOutput(location, className, kind, sibling);
+            }
+        }
+    }
+}

src/main/java/cn/enaium/joe/compiler/VirtualJavaFileObject.java

@@ -0,0 +1,52 @@
+/*
+ * 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.compiler;
+
+import javax.tools.SimpleJavaFileObject;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * @author Enaium
+ * @since 1.4.0
+ */
+public class VirtualJavaFileObject extends SimpleJavaFileObject {
+
+    private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+    private final String content;
+
+    protected VirtualJavaFileObject(String className, String content) {
+        super(URI.create("string:///" + className.replace(".", "/") + Kind.SOURCE.extension), Kind.SOURCE);
+        this.content = content;
+    }
+
+    public byte[] getBytecode() {
+        return outputStream.toByteArray();
+    }
+
+    @Override
+    public ByteArrayOutputStream openOutputStream() {
+        return outputStream;
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+        return content;
+    }
+}

src/main/java/cn/enaium/joe/config/ConfigManager.java

@@ -16,14 +16,12 @@
 
 package cn.enaium.joe.config;
 
-import cn.enaium.joe.config.extend.ApplicationConfig;
-import cn.enaium.joe.config.extend.CFRConfig;
-import cn.enaium.joe.config.extend.FernFlowerConfig;
-import cn.enaium.joe.config.extend.ProcyonConfig;
+import cn.enaium.joe.config.extend.*;
 import cn.enaium.joe.config.value.*;
 import cn.enaium.joe.util.MessageUtil;
 import com.google.gson.*;
 
+import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -44,6 +42,7 @@ public ConfigManager() {
         addByInstance(new CFRConfig());
         addByInstance(new FernFlowerConfig());
         addByInstance(new ProcyonConfig());
+        addByInstance(new KeymapConfig());
     }
 
     @SuppressWarnings("unchecked")
@@ -93,8 +92,9 @@ public Map<String, Value<?>> getConfigMap(Class<? extends Config> config) {
         return map;
     }
 
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
     private Gson gson() {
-        return new GsonBuilder().setPrettyPrinting().create();
+        return GSON;
     }
 
     public void load() {
@@ -106,14 +106,13 @@ public void load() {
                 File file = new File(System.getProperty("."), config.getName() + ".json");
                 if (file.exists()) {
                     JsonObject jsonObject = gson().fromJson(Files.readString(file.toPath()), JsonObject.class);
-
                     for (Field configField : klass.getDeclaredFields()) {
                         configField.setAccessible(true);
                         if (!jsonObject.has(configField.getName())) {
                             continue;
                         }
 
-                        if (!jsonObject.has(configField.getName())) {
+                        if (!jsonObject.get(configField.getName()).isJsonObject()) {
                             continue;
                         }
 
@@ -126,26 +125,7 @@ public void load() {
                         Object valueObject = configField.get(config);
                         if (valueObject instanceof Value<?>) {
                             Value<?> value = (Value<?>) valueObject;
-                            if (value instanceof EnableValue) {
-                                ((EnableValue) value).setValue(valueJsonElement.getAsBoolean());
-                            } else if (value instanceof IntegerValue) {
-                                ((IntegerValue) value).setValue(valueJsonElement.getAsInt());
-                            } else if (value instanceof ModeValue) {
-                                ModeValue modeValue = (ModeValue) value;
-                                if (modeValue.getMode().contains(valueJsonElement.getAsString())) {
-                                    modeValue.setValue(valueJsonElement.getAsString());
-                                } else {
-                                    modeValue.setValue(modeValue.getMode().get(0));
-                                }
-                            } else if (value instanceof StringSetValue) {
-                                Set<String> strings = new HashSet<>();
-                                for (JsonElement jsonElement : valueJsonElement.getAsJsonArray()) {
-                                    strings.add(jsonElement.getAsString());
-                                }
-                                ((StringSetValue) value).setValue(strings);
-                            } else if (value instanceof StringValue) {
-                                ((StringValue) value).setValue(valueJsonElement.getAsString());
-                            }
+                            value.decode(valueJsonElement);
                         }
                     }
                 }

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

@@ -19,6 +19,7 @@
 import cn.enaium.joe.annotation.NoUI;
 import cn.enaium.joe.config.Config;
 import cn.enaium.joe.config.value.EnableValue;
+import cn.enaium.joe.config.value.IntegerValue;
 import cn.enaium.joe.config.value.ModeValue;
 import cn.enaium.joe.config.value.StringSetValue;
 
@@ -37,6 +38,7 @@ public class ApplicationConfig extends Config {
     public EnableValue compactMiddlePackage = new EnableValue("Compact Middle Package", true, "Only Hierarchical Mode");
     @NoUI
     public final StringSetValue loadRecent = new StringSetValue("Load Recent", new HashSet<>(), "");
+    public IntegerValue scale = new IntegerValue("Scale", 0, "UI scale,it doesn't scale if value 0");
 
     public ApplicationConfig() {
         super("Application");