From 6f20c436148fd8c6450080134ba258d62e060d18 Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Fri, 25 Feb 2022 15:52:21 +0100 Subject: [PATCH 1/3] Update Procyon to 0.6 stable --- pom.xml | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 39f9b76e..640bcf65 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,7 @@ 21.2.0 3.2 0.2.0 - 0.5.36 - - bea9e8c + 0.6.0 3.1.6 2.1.1 1.7.36 @@ -239,7 +237,6 @@ paged_data ${paged-data.version} - - - com.github.mstrobel.procyon - procyon-compilertools - ${procyon-snapshot.version} - - - com.github.mstrobel.procyon - procyon-core - ${procyon-snapshot.version} - - - com.github.mstrobel.procyon - procyon-expressions - ${procyon-snapshot.version} - - - com.github.mstrobel.procyon - procyon-reflection - ${procyon-snapshot.version} - com.fifesoft rsyntaxtextarea From 8e80a0b439db18cabe4be904f172eb51d3a9778b Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Fri, 25 Feb 2022 15:52:30 +0100 Subject: [PATCH 2/3] Update Jadx --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 640bcf65..a8fe0fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 2.9.0 31.0.1-jre 4.2 - 1.3.2 + 1.3.3 3.1.6 1.6.6bcv 3.4.1.3 From 4ccfb6021f8522a3eed0d256face0352c70b9a49 Mon Sep 17 00:00:00 2001 From: Nico Mexis Date: Fri, 25 Feb 2022 15:52:53 +0100 Subject: [PATCH 3/3] General code quality changes --- src/main/java/me/konloch/kontainer/io/DiskReader.java | 2 +- .../club/bytecodeviewer/gui/components/RunOptions.java | 2 +- .../plugin/strategies/JavaPluginLaunchStrategy.java | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/konloch/kontainer/io/DiskReader.java b/src/main/java/me/konloch/kontainer/io/DiskReader.java index 03df2662..7d676f1f 100644 --- a/src/main/java/me/konloch/kontainer/io/DiskReader.java +++ b/src/main/java/me/konloch/kontainer/io/DiskReader.java @@ -64,7 +64,7 @@ public class DiskReader { try (FileReader fr = new FileReader(fileName); BufferedReader reader = new BufferedReader(fr)) { for (String add = reader.readLine(); add != null; add = reader.readLine()) { - s.append(EncodeUtils.unicodeToString(add)).append(System.getProperty("line.separator")); + s.append(EncodeUtils.unicodeToString(add)).append(System.lineSeparator()); } } diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RunOptions.java b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RunOptions.java index 0579d01d..6e2266a8 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RunOptions.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RunOptions.java @@ -79,7 +79,7 @@ public class RunOptions extends JFrame getContentPane().add(mainMethodFQN); mainMethodFQN.setColumns(10); - JLabel lblNewLabel = new JLabel("Debug Classes (Seperate with , ):"); + JLabel lblNewLabel = new JLabel("Debug Classes (Separated with , ):"); lblNewLabel.setBounds(10, 89, 228, 14); getContentPane().add(lblNewLabel); diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavaPluginLaunchStrategy.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavaPluginLaunchStrategy.java index a3db6b8a..b2da658c 100644 --- a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavaPluginLaunchStrategy.java +++ b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/strategies/JavaPluginLaunchStrategy.java @@ -1,7 +1,6 @@ package the.bytecode.club.bytecodeviewer.plugin.strategies; import java.io.File; -import me.konloch.kontainer.io.DiskReader; import org.codehaus.janino.SimpleCompiler; import the.bytecode.club.bytecodeviewer.api.Plugin; import the.bytecode.club.bytecodeviewer.plugin.PluginLaunchStrategy; @@ -35,13 +34,10 @@ public class JavaPluginLaunchStrategy implements PluginLaunchStrategy @Override public Plugin run(File file) throws Throwable { - SimpleCompiler compiler = new SimpleCompiler(); - - //compile the Java source - compiler.cook(DiskReader.loadAsString(file.getAbsolutePath())); + SimpleCompiler compiler = new SimpleCompiler(file.getCanonicalPath()); //debug - System.out.println(file.getName().substring(0, file.getName().length() - (".java".length()))); + //System.out.println(file.getName().substring(0, file.getName().length() - (".java".length()))); //get the class object from the compiler classloader Class clazz = Class.forName(