Fixed class files support

ByteZ1337 · Aug 25, 2022 · 39ac277 · 39ac277
1 parent 70f0920
commit 39ac277
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>xyz.xenondevs.luyten</groupId>
     <artifactId>luytenx</artifactId>
-    <version>0.8.0</version>
+    <version>0.8.1</version>
 
     <properties>
         <darklaf.version>2.7.3</darklaf.version>

diff --git a/src/us/deathmarine/luyten/Luyten.java b/src/us/deathmarine/luyten/Luyten.java
@@ -113,7 +113,7 @@ public static File getFileFromCommandLine(String... args) {
     }
 
     public static String getVersion() {
-        return "0.8";
+        return "0.8.1";
     }
 
     /**
@@ -175,8 +175,8 @@ public void mouseClicked(MouseEvent e) {
         scroll.setBorder(new CompoundBorder(BorderFactory.createTitledBorder("Stacktrace"),
             new BevelBorder(BevelBorder.LOWERED)));
         pane.add(scroll);
-        final String issue = "https://github.com/deathmarine/Luyten/issues";
-        final JLabel link = new JLabel("<HTML>Submit to <FONT color=\"#000099\"><U>" + issue + "</U></FONT></HTML>");
+        final String issue = "https://github.com/ByteZ1337/LuytenX/issues";
+        final JLabel link = new JLabel("<HTML>Submit to <FONT color=\"#3498db\"><U>" + issue + "</U></FONT></HTML>");
         link.setCursor(new Cursor(Cursor.HAND_CURSOR));
         link.addMouseListener(new MouseAdapter() {
             @Override
@@ -190,12 +190,12 @@ public void mouseClicked(MouseEvent e) {
 
             @Override
             public void mouseEntered(MouseEvent e) {
-                link.setText("<HTML>Submit to <FONT color=\"#00aa99\"><U>" + issue + "</U></FONT></HTML>");
+                link.setText("<HTML>Submit to <FONT color=\"#3498db\"><U>" + issue + "</U></FONT></HTML>");
             }
 
             @Override
             public void mouseExited(MouseEvent e) {
-                link.setText("<HTML>Submit to <FONT color=\"#000099\"><U>" + issue + "</U></FONT></HTML>");
+                link.setText("<HTML>Submit to <FONT color=\"#3498db\"><U>" + issue + "</U></FONT></HTML>");
             }
         });
         pane.add(link);

diff --git a/src/us/deathmarine/luyten/util/ProcyonUtils.java b/src/us/deathmarine/luyten/util/ProcyonUtils.java
@@ -3,27 +3,37 @@
 import com.strobel.assembler.metadata.TypeDefinition;
 import us.deathmarine.luyten.Model;
 
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 public class ProcyonUtils {
 
     public static byte[] getContent(TypeDefinition type, Model model) {
-        try (JarFile jarFile = new JarFile(model.getOpenedFile())) {
-            JarEntry entry = jarFile.getJarEntry(type.getInternalName() + ".class");
-            if (entry != null) {
-                try (InputStream inputStream = jarFile.getInputStream(entry)) {
-                    byte[] content = new byte[(int) entry.getSize()];
-                    inputStream.read(content);
-                    return content;
+        var file = model.getOpenedFile();
+        if (file.getName().endsWith(".class")) {
+            try (var inputStream = new FileInputStream(file)) {
+                var content = new byte[(int) file.length()];
+                inputStream.read(content);
+                return content;
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            try (var jarFile = new JarFile(file)) {
+                var entry = jarFile.getJarEntry(type.getInternalName() + ".class");
+                if (entry != null) {
+                    try (var inputStream = jarFile.getInputStream(entry)) {
+                        var content = new byte[(int) entry.getSize()];
+                        inputStream.read(content);
+                        return content;
+                    }
+                } else {
+                    return null;
                 }
-            } else {
-                return null;
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
         }
     }