Merge pull request #395 from ThexXTURBOXx/master

Update some stuff

Author: Konloch

pom.xml

@@ -36,16 +36,14 @@
         <gson.version>2.9.0</gson.version>
         <guava.version>31.0.1-jre</guava.version>
         <imgscalr-lib.version>4.2</imgscalr-lib.version>
-        <jadx.version>1.3.2</jadx.version>
+        <jadx.version>1.3.3</jadx.version>
         <janino.version>3.1.6</janino.version>
         <jd-gui.version>1.6.6bcv</jd-gui.version>
         <jgraphx.version>3.4.1.3</jgraphx.version>
         <js.version>21.2.0</js.version>
         <objenesis.version>3.2</objenesis.version>
         <paged-data.version>0.2.0</paged-data.version>
-        <procyon.version>0.5.36</procyon.version>
-        <!-- TODO: Remove snapshot version when 0.6 stable is released -->
-        <procyon-snapshot.version>bea9e8c</procyon-snapshot.version>
+        <procyon.version>0.6.0</procyon.version>
         <rsyntaxtextarea.version>3.1.6</rsyntaxtextarea.version>
         <semantic-version.version>2.1.1</semantic-version.version>
         <slf4j.version>1.7.36</slf4j.version>
@@ -239,7 +237,6 @@
             <artifactId>paged_data</artifactId>
             <version>${paged-data.version}</version>
         </dependency>
-        <!-- TODO: Add back when 0.6 stable is released
         <dependency>
             <groupId>org.bitbucket.mstrobel</groupId>
             <artifactId>procyon-core</artifactId>
@@ -260,27 +257,6 @@
             <artifactId>procyon-compilertools</artifactId>
             <version>${procyon.version}</version>
         </dependency>
-        -->
-        <dependency>
-            <groupId>com.github.mstrobel.procyon</groupId>
-            <artifactId>procyon-compilertools</artifactId>
-            <version>${procyon-snapshot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.mstrobel.procyon</groupId>
-            <artifactId>procyon-core</artifactId>
-            <version>${procyon-snapshot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.mstrobel.procyon</groupId>
-            <artifactId>procyon-expressions</artifactId>
-            <version>${procyon-snapshot.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.mstrobel.procyon</groupId>
-            <artifactId>procyon-reflection</artifactId>
-            <version>${procyon-snapshot.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.fifesoft</groupId>
             <artifactId>rsyntaxtextarea</artifactId>

src/main/java/me/konloch/kontainer/io/DiskReader.java

@@ -64,7 +64,7 @@ public synchronized static String loadAsString(String fileName) throws Exception
         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());
             }
         }
 

src/main/java/the/bytecode/club/bytecodeviewer/gui/components/RunOptions.java

@@ -79,7 +79,7 @@ public RunOptions()
         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);
 

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(