Updates

pom.xml

@@ -17,10 +17,6 @@
             <id>local-maven-repo</id>
             <url>file:///${project.basedir}/libs</url>
         </repository>
-        <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository> <!-- TODO Remove when DarkLaf is properly updated -->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -86,7 +82,7 @@
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>commons-compiler</artifactId>
-            <version>3.1.4</version>
+            <version>3.1.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -131,7 +127,7 @@
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
-            <version>3.1.4</version>
+            <version>3.1.6</version>
         </dependency>
         <dependency>
             <groupId>com.jd</groupId>
@@ -225,8 +221,8 @@
         </dependency>
         <dependency>
             <groupId>com.github.weisj</groupId>
-            <artifactId>darklaf-bcv</artifactId>
-            <version>2.6.2bcv</version>
+            <artifactId>darklaf-core</artifactId>
+            <version>2.7.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.weisj</groupId>

src/main/java/the/bytecode/club/bytecodeviewer/gui/hexviewer/JHexEditor.java

@@ -1,5 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.hexviewer;
 
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
 import java.awt.BorderLayout;
@@ -160,8 +162,11 @@ protected void border(Graphics g, int x, int y, int s) {
                 fn.getHeight() + 1);
     }
 
-    protected void printString(Graphics g, String s, int x, int y) {
+    protected void printString(Graphics graphics, String s, int x, int y) {
+        Graphics2D g = (Graphics2D) graphics;
         FontMetrics fn = getFontMetrics(font);
+        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g.drawString(s, ((fn.stringWidth(" ") + 1) * x) + border,
                 ((fn.getHeight() * (y + 1)) - fn.getMaxDescent()) + border);
     }

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcelist/ResourceTree.java

@@ -43,17 +43,20 @@ public ResourceTree(final DefaultMutableTreeNode treeRoot)
 	StringMetricsUtil m = null;
 
 	@Override
-    public void paint(final Graphics g)
+    public void paint(final Graphics graphics)
 	{
         try
         {
+            Graphics2D g = (Graphics2D) graphics;
             super.paint(g);
             if (m == null)
             {
-                m = new StringMetricsUtil((Graphics2D) g);
+                m = new StringMetricsUtil(g);
             }
             if (treeRoot.getChildCount() < 1)
             {
+                g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                        RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
                 g.setColor(new Color(0, 0, 0, 100));
                 g.fillRect(0, 0, getWidth(), getHeight());
                 g.setColor(Color.white);
@@ -63,7 +66,7 @@ public void paint(final Graphics g)
                         getHeight() / 2);
             }
         }
-        catch (InternalError | NullPointerException ignored)
+        catch (InternalError | NullPointerException | ClassCastException ignored)
         {
         }
     }

src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceContainerImporter.java

@@ -73,16 +73,18 @@ public ResourceContainerImporter importAsZip() throws IOException
 		try
 		{
 			//attempt to import using Java ZipInputStream
-			importZipInputStream(false);
+			return importZipInputStream(false);
 		}
-		catch (IOException e)
+		catch (Throwable t)
 		{
-			e.printStackTrace();
-
-			//fallback to apache commons ZipFile
-			importApacheZipFile(false);
+			try {
+				//fallback to apache commons ZipFile
+				return importApacheZipFile(false);
+			} catch (Throwable t1) {
+				t1.addSuppressed(t);
+				throw t1;
+			}
 		}
-		return this;
 	}
 
 	/**
@@ -93,10 +95,10 @@ public ResourceContainerImporter addUnknownFile(String name, InputStream stream,
 	{
 		//TODO remove this .class check and just look for cafebabe
 		if (name.endsWith(".class"))
-			addClassResource(name, stream);
-		else if(!classesOnly)
-			addResource(name, stream);
-		
+			return addClassResource(name, stream);
+		else if (!classesOnly)
+			return addResource(name, stream);
+
 		return this;
 	}
 

src/main/java/the/bytecode/club/bytecodeviewer/util/FileDrop.java

@@ -444,10 +444,10 @@ private static boolean supportsDnD() { // Static Boolean
             boolean support;
             try {
                 final Class arbitraryDndClass = Class
-                        .forName("DnDConstants");
+                        .forName("java.awt.dnd.DnDConstants");
                 support = true;
             } // end try
-            catch (final Exception e) {
+            catch (final Throwable t) {
                 support = false;
             } // end catch
             supportsDnD = support;