Fix shading warnings

libs/README.md

@@ -19,5 +19,6 @@ Some dependencies may have been modified or could be released by their author in
 
 #### Modifications
 
- - `JD-GUI`: Removed ASM and RSyntaxTextArea
+ - `JD-GUI`: Removed ASM, RSyntaxTextArea, ANTLR, and TreeLayout
  - `APKTool`: Recompiled with the newest dependency versions, removed prebuilt folder
+ - `D2Jar`: Removed TreeLayout, ANTLR, ST4, and com.android

libs/com/android/D2Jar-obf/1.0bcv2/D2Jar-obf-1.0bcv2.jar.md5

@@ -0,0 +1 @@
+d27e9d2f97fe24dff3a6c5057542c12f

libs/com/android/D2Jar-obf/1.0bcv2/D2Jar-obf-1.0bcv2.jar.sha1

@@ -0,0 +1 @@
+b6852fc7e9a4c533042d71737bbd3aff8fb49b63

libs/com/android/D2Jar-obf/1.0bcv/D2Jar-obf-1.0bcv.pom → libs/com/android/D2Jar-obf/1.0bcv2/D2Jar-obf-1.0bcv2.pom

@@ -4,5 +4,5 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android</groupId>
   <artifactId>D2Jar-obf</artifactId>
-  <version>1.0bcv</version>
+  <version>1.0bcv2</version>
 </project>

libs/com/android/D2Jar-obf/1.0bcv2/D2Jar-obf-1.0bcv2.pom.md5

@@ -0,0 +1 @@
+922e497de477cc9e93bdea091ad99026

libs/com/android/D2Jar-obf/1.0bcv2/D2Jar-obf-1.0bcv2.pom.sha1

@@ -0,0 +1 @@
+faffcd234daa8834f696b94edc6c25861123abbf

libs/com/android/D2Jar-obf/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.android</groupId>
   <artifactId>D2Jar-obf</artifactId>
   <versioning>
-    <release>1.0bcv</release>
+    <release>1.0bcv2</release>
     <versions>
-      <version>1.0bcv</version>
+      <version>1.0bcv2</version>
     </versions>
-    <lastUpdated>20210622185021</lastUpdated>
+    <lastUpdated>20210717191524</lastUpdated>
   </versioning>
 </metadata>

libs/com/android/D2Jar-obf/maven-metadata.xml.md5

@@ -1 +1 @@
-0591d48d90ee4e7bcf92f9995686d3cb
+855ca34f90cc242bab48d544d3ebd71f

libs/com/android/D2Jar-obf/maven-metadata.xml.sha1

@@ -1 +1 @@
-24a479a29c3fe9293a6ccf69d975e0f3a3b09546
+9b7e72d45941e6d0079655b36c888047749f32ad

libs/com/jd/jd-gui/1.6.6bcv2/jd-gui-1.6.6bcv2.jar.md5

@@ -0,0 +1 @@
+27038a07a27a96680c00ce9bc2e7ecf9

libs/com/jd/jd-gui/1.6.6bcv2/jd-gui-1.6.6bcv2.jar.sha1

@@ -0,0 +1 @@
+d2e0687046e7e343b1150f23976c718b8f05d017

libs/com/jd/jd-gui/1.6.6bcv/jd-gui-1.6.6bcv.pom → libs/com/jd/jd-gui/1.6.6bcv2/jd-gui-1.6.6bcv2.pom

@@ -4,5 +4,5 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jd</groupId>
   <artifactId>jd-gui</artifactId>
-  <version>1.6.6bcv</version>
+  <version>1.6.6bcv2</version>
 </project>

libs/com/jd/jd-gui/1.6.6bcv2/jd-gui-1.6.6bcv2.pom.md5

@@ -0,0 +1 @@
+4ae6443d93d0c8c49b5da7264caa2c7c

libs/com/jd/jd-gui/1.6.6bcv2/jd-gui-1.6.6bcv2.pom.sha1

@@ -0,0 +1 @@
+d784a58384ac91e1a2309e7dd2264ba6e47ed86e

libs/com/jd/jd-gui/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.jd</groupId>
   <artifactId>jd-gui</artifactId>
   <versioning>
-    <release>1.6.6bcv</release>
+    <release>1.6.6bcv2</release>
     <versions>
-      <version>1.6.6bcv</version>
+      <version>1.6.6bcv2</version>
     </versions>
-    <lastUpdated>20210622184950</lastUpdated>
+    <lastUpdated>20210717191439</lastUpdated>
   </versioning>
 </metadata>

libs/com/jd/jd-gui/maven-metadata.xml.md5

@@ -1 +1 @@
-69423fd3d1b2f3a0ceef4fd7410c1c37
+2fc2cf1d825a3c331ef9a3a4d22f5a4f

libs/com/jd/jd-gui/maven-metadata.xml.sha1

@@ -1 +1 @@
-06ba4857ceb9120126431234133b607486389758
+f8e41bd3af4e8e7b2151450f3d9d035ea575deaf

pom.xml

@@ -136,7 +136,7 @@
         <dependency>
             <groupId>com.jd</groupId>
             <artifactId>jd-gui</artifactId>
-            <version>1.6.6bcv</version>
+            <version>1.6.6bcv2</version>
         </dependency>
         <dependency>
             <groupId>eu.bibl.banalysis</groupId>
@@ -221,7 +221,17 @@
         <dependency>
             <groupId>com.android</groupId>
             <artifactId>D2Jar-obf</artifactId>
-            <version>1.0bcv</version>
+            <version>1.0bcv2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.abego.treelayout</groupId>
+            <artifactId>org.abego.treelayout.core</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4</artifactId>
+            <version>4.9.2</version>
         </dependency>
         <dependency>
             <groupId>com.github.weisj</groupId>
@@ -237,19 +247,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.1</version> <!-- 3.1.2 breaks build on JDK 9+ -->
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>the.bytecode.club.bytecodeviewer.BytecodeViewer</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -287,9 +284,18 @@
                                 <exclude>META-INF/*.SF</exclude>
                                 <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
+                                <exclude>META-INF/*LICENSE*</exclude>
+                                <exclude>META-INF/*NOTICE*</exclude>
+                                <exclude>META-INF/MANIFEST.MF</exclude>
                             </excludes>
                         </filter>
                     </filters>
+                    <transformers>
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>the.bytecode.club.bytecodeviewer.BytecodeViewer</mainClass>
+                        </transformer>
+                    </transformers>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java

@@ -3,23 +3,13 @@
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.HashSet;
-import javax.imageio.ImageIO;
 import javax.swing.*;
 
-import com.github.weisj.darklaf.icons.ThemedSVGIcon;
-import com.sun.java.swing.plaf.windows.WindowsInternalFrameTitlePane;
-import me.konloch.kontainer.io.DiskWriter;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.FileViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.translation.Translation;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent;