cleanup ReflectionHelper

Author: Ecdcaeb

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

@@ -16,8 +16,6 @@
 
 package cn.enaium.joe;
 
-import cn.enaium.joe.util.ReflectUtil;
-
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -40,7 +38,7 @@ public static void agentmain(String agentArgs, Instrumentation inst) throws Exce
     private static void agent(String agentArgs, Instrumentation inst) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         URLClassLoader loader = new URLClassLoader(new URL[]{Agent.class.getProtectionDomain().getCodeSource().getLocation()}, ClassLoader.getSystemClassLoader().getParent());
         Class<?> main = loader.loadClass("cn.enaium.joe.Main");
-        Method agent = ReflectUtil.getMethod(main, "agent", Instrumentation.class);
+        Method agent = main.getMethod( "agent", Instrumentation.class);
         agent.invoke(null, inst);
     }
 }

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

@@ -28,6 +28,7 @@
 import cn.enaium.joe.jar.Jar;
 import cn.enaium.joe.task.TaskManager;
 import cn.enaium.joe.util.*;
+import cn.enaium.joe.util.reflection.ReflectionHelper;
 import com.formdev.flatlaf.FlatDarkLaf;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
@@ -41,7 +42,6 @@
  * @author Enaium
  */
 public class JavaOctetEditor {
-    public static final ClassLoader classLoader = JavaOctetEditor.class.getClassLoader();
     private static JavaOctetEditor instance;
 
     public static final String TITLE = "JavaOctetEditor";
@@ -100,7 +100,7 @@ public void run() {
             add(new SearchMenu());
 
             AttachMenu attachMenu = new AttachMenu() {{
-                if (!ReflectUtil.classHas("com.sun.tools.attach.VirtualMachine")) {
+                if (!ReflectionHelper.isClassExist("com.sun.tools.attach.VirtualMachine")) {
                     setEnabled(false);
                 }
             }};
@@ -144,13 +144,4 @@ public void setJar(Jar jar) {
     public static JavaOctetEditor getInstance() {
         return instance;
     }
-
-    public static boolean isClassExist(String canonicalName){
-        try {
-            Class.forName(canonicalName, false, classLoader);
-            return true;
-        } catch (ClassNotFoundException e) {
-            return false;
-        }
-    }
 }

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

@@ -16,18 +16,16 @@
 
 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;
+import cn.enaium.joe.util.reflection.ReflectionHelper;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
 import org.pmw.tinylog.Configurator;
 import org.pmw.tinylog.Logger;
 import org.pmw.tinylog.writers.ConsoleWriter;
 import org.pmw.tinylog.writers.FileWriter;
 
-import javax.swing.*;
 import java.io.IOException;
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.InvocationTargetException;
@@ -47,6 +45,8 @@
  * @author Enaium
  */
 public final class Main {
+    public static final ClassLoader classLoader = Main.class.getClassLoader();
+
     public static void main(String[] args) {
         ImagineBreakerHelper.boot();
         loadTools();
@@ -82,7 +82,7 @@ private static void launch() {
     }
 
     private static void loadTools() {
-        if (!ReflectUtil.classHas("com.sun.tools.attach.VirtualMachine")) {
+        if (!ReflectionHelper.isClassExist("com.sun.tools.attach.VirtualMachine")) {
             Path toolsPath = Paths.get("lib", "tools.jar");
             Path jrePath = Paths.get(System.getProperty("java.home"));
             Path tool = jrePath.getParent().resolve(toolsPath);

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

@@ -17,7 +17,7 @@
 package cn.enaium.joe.dialog;
 
 import cn.enaium.joe.util.LangUtil;
-import cn.enaium.joe.util.ReflectUtil;
+import cn.enaium.joe.util.reflection.ReflectionHelper;
 import net.miginfocom.swing.MigLayout;
 
 import javax.swing.*;
@@ -58,7 +58,7 @@ public AboutDialog() {
             add(new JLabel(LangUtil.i18n("about.java.supportCompiler")));
             add(new JLabel(String.valueOf(ToolProvider.getSystemJavaCompiler() != null)), "wrap");
             add(new JLabel(LangUtil.i18n("about.java.supportAttach")));
-            add(new JLabel(String.valueOf(ReflectUtil.classHas("com.sun.tools.attach.VirtualMachine"))), "wrap");
+            add(new JLabel(String.valueOf(ReflectionHelper.isClassExist("com.sun.tools.attach.VirtualMachine"))), "wrap");
         }});
         setResizable(false);
         pack();

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

@@ -25,7 +25,7 @@
 import cn.enaium.joe.jar.Jar;
 import cn.enaium.joe.util.ASMUtil;
 import cn.enaium.joe.util.JTreeUtil;
-import cn.enaium.joe.util.ReflectUtil;
+import cn.enaium.joe.util.reflection.ReflectionHelper;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
 
@@ -102,7 +102,7 @@ private void recursion(ClassTreeNode classTreeNode, boolean parent) {
                 ClassTreeNode newChild = null;
                 if (classes.containsKey(s + ".class")) {
                     newChild = new ClassTreeNode(classes.get(s + ".class"));
-                } else if (ReflectUtil.classHas(s.replace("/", "."))) {
+                } else if (ReflectionHelper.isClassExist(s.replace("/", "."))) {
                     try {
                         newChild = new ClassTreeNode(ASMUtil.acceptClassNode(new ClassReader(s)));
                     } catch (IOException ignored) {

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

@@ -23,6 +23,7 @@
 import cn.enaium.joe.gui.panel.CodeAreaPanel;
 import cn.enaium.joe.util.*;
 import cn.enaium.joe.util.classes.ASMClassLoader;
+import cn.enaium.joe.util.reflection.ReflectionHelper;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
@@ -69,7 +70,7 @@ public ASMifierTablePanel(ClassNode classNode) {
                             "}";
 
                     byte[] dumps = (byte[])new ASMClassLoader().defineClass(className, Compiler.compileSingle(className, stringBuilder)).getMethod("dump").invoke(null);
-                    ReflectUtil.copyAllMember(classNode, ASMUtil.acceptClassNode(new ClassReader(dumps)));
+                    ReflectionHelper.copyAllMember(classNode, ASMUtil.acceptClassNode(new ClassReader(dumps)));
                     MessageUtil.info(LangUtil.i18n("success"));
                     EditSaveSuccessEvent.trigger(classNode.name);
                 } catch (Throwable e) {

src/main/java/cn/enaium/joe/service/decompiler/ProcyonDecompiler.java

@@ -18,8 +18,9 @@
 
 import cn.enaium.joe.JavaOctetEditor;
 import cn.enaium.joe.config.extend.ProcyonConfig;
-import cn.enaium.joe.util.ReflectUtil;
 import cn.enaium.joe.util.classes.ClassNode;
+import cn.enaium.joe.util.reflection.FieldAccessor;
+import cn.enaium.joe.util.reflection.ReflectionHelper;
 import com.strobel.assembler.InputTypeLoader;
 import com.strobel.assembler.metadata.Buffer;
 import com.strobel.assembler.metadata.ITypeLoader;
@@ -31,7 +32,6 @@
 import org.pmw.tinylog.Logger;
 
 import java.io.StringWriter;
-import java.lang.reflect.Field;
 
 /**
  * @author Enaium
@@ -46,14 +46,14 @@ public static void create() {
         JavaOctetEditor.getInstance().config.getConfigMap(ProcyonConfig.class).forEach(
                 (s, value) -> {
                     try {
-                        Field f = ReflectUtil.getField(aDefault.getClass(), value.getName());
-                        Object defaultValue = ReflectUtil.getFieldValue(aDefault, value.getName());
+                        FieldAccessor<Object, JavaFormattingOptions> f = ReflectionHelper.getFieldAccessor(JavaFormattingOptions.class, value.getName());
+                        Object defaultValue = f.get(aDefault);
                         if (defaultValue instanceof Enum<?>) {
                             f.set(aDefault, Enum.valueOf(((Enum<?>) defaultValue).getDeclaringClass(), (String) value.getValue()));
                         } else {
                             f.set(aDefault, value.getValue());
                         }
-                    } catch (NoSuchFieldException | IllegalAccessException e) {
+                    } catch (Throwable e) {
                         Logger.error(e);
                     }
                 }

src/main/java/cn/enaium/joe/util/ASMUtil.java

@@ -30,6 +30,13 @@
  * @since 1.2.0
  */
 public class ASMUtil {
+
+    public static String resolvePkgName(String className){
+        if (className.indexOf('.') > 0){
+            return className.substring(0, className.lastIndexOf('.') -1);
+        } else return className.substring(0, className.lastIndexOf('/') -1);
+    }
+
     /**
      * converts a string value to a value of that type
      *

src/main/java/cn/enaium/joe/util/ReflectUtil.java

@@ -1,5 +1,7 @@
 package cn.enaium.joe.util.reflection;
 
+import cn.enaium.joe.Main;
+
 import java.io.Serial;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -235,4 +237,31 @@ public static<T> ConstructorAccessor<T> getConstructorAccessor(Class<?> clazz, C
         Constructor<T> constructor = (Constructor<T>) findConstructor(clazz, args);
         return new ConstructorAccessor<>(constructor);
     }
+
+    public static boolean isClassExist(String canonicalName){
+        try {
+            Class.forName(canonicalName, false, Main.classLoader);
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
+    /**
+     * copy all class member from the old class object to the new class object
+     *
+     * @param oldObject old object
+     * @param newObject new object
+     * @param <T>       type of two classes
+     * @throws NoSuchFieldException   e
+     * @throws IllegalAccessException e
+     */
+    @Deprecated
+    public static <T> void copyAllMember(T oldObject, T newObject) throws NoSuchFieldException, IllegalAccessException {
+        for (Field oldField : oldObject.getClass().getDeclaredFields()) {
+            oldField.setAccessible(true);
+            Field declaredField = newObject.getClass().getDeclaredField(oldField.getName());
+            oldField.set(oldObject, declaredField.get(newObject));
+        }
+    }
 }