Make use of the Law of Demeter

I mean, most of the time, we do make use of it... But sometimes, we don't. This fixes this "issue" in some places :)

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

@@ -5,6 +5,7 @@ import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
 
@@ -17,7 +18,7 @@ import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
 public class DiskReader {
 
     public static Random random = new Random();
-    public static HashMap<String, ArrayList<String>> map = new HashMap<>();
+    public static Map<String, ArrayList<String>> map = new HashMap<>();
 
     /**
      * Used to load from file, allows caching
@@ -101,4 +102,4 @@ public class DiskReader {
             return array.get(lineNumber);
     }
 
-}
+}

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

@@ -1,6 +1,10 @@
 package me.konloch.kontainer.io;
 
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.PrintWriter;
 import java.util.Arrays;
 
 /**
@@ -201,4 +205,4 @@ public class DiskWriter {
         }
     }
 
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java

@@ -1,17 +1,18 @@
 package the.bytecode.club.bytecodeviewer;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import javax.swing.*;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.swing.SwingUtilities;
+import me.konloch.kontainer.io.DiskReader;
 import org.apache.commons.io.FileUtils;
 import org.objectweb.asm.tree.ClassNode;
-
-import me.konloch.kontainer.io.DiskReader;
-
 import the.bytecode.club.bytecodeviewer.api.BCV;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
 import the.bytecode.club.bytecodeviewer.bootloader.Boot;
@@ -19,20 +20,29 @@ import the.bytecode.club.bytecodeviewer.bootloader.BootState;
 import the.bytecode.club.bytecodeviewer.bootloader.InstallFatJar;
 import the.bytecode.club.bytecodeviewer.bootloader.UpdateCheck;
 import the.bytecode.club.bytecodeviewer.gui.MainViewerGUI;
-import the.bytecode.club.bytecodeviewer.gui.components.*;
+import the.bytecode.club.bytecodeviewer.gui.components.ExtendedJOptionPane;
+import the.bytecode.club.bytecodeviewer.gui.components.MultipleChoiceDialog;
 import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceListIconRenderer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.TabbedPane;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
-import the.bytecode.club.bytecodeviewer.plugin.PluginWriter;
 import the.bytecode.club.bytecodeviewer.obfuscators.mapping.Refactorer;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
+import the.bytecode.club.bytecodeviewer.plugin.PluginWriter;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.importing.ImportResource;
-import the.bytecode.club.bytecodeviewer.util.*;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
+import the.bytecode.club.bytecodeviewer.util.BootCheck;
+import the.bytecode.club.bytecodeviewer.util.ClassFileUtils;
+import the.bytecode.club.bytecodeviewer.util.LazyNameUtil;
+import the.bytecode.club.bytecodeviewer.util.MiscUtils;
+import the.bytecode.club.bytecodeviewer.util.PingBack;
+import the.bytecode.club.bytecodeviewer.util.SecurityMan;
 
 import static javax.swing.JOptionPane.QUESTION_MESSAGE;
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.DEV_MODE;
+import static the.bytecode.club.bytecodeviewer.Constants.FAT_JAR;
+import static the.bytecode.club.bytecodeviewer.Constants.VERSION;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -132,7 +142,7 @@ public class BytecodeViewer
     public static MainViewerGUI viewer;
     
     //All of the opened resources (Files/Classes/Etc)
-    public static LinkedHashMap<String,ResourceContainer> resourceContainers = new LinkedHashMap<>();
+    public static Map<String,ResourceContainer> resourceContainers = new LinkedHashMap<>();
     
     //All of the created processes (Decompilers/etc)
     public static List<Process> createdProcesses = new ArrayList<>();

src/main/java/the/bytecode/club/bytecodeviewer/CommandLineInput.java

@@ -13,7 +13,9 @@ import the.bytecode.club.bytecodeviewer.translation.Language;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.VERSION;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/Configuration.java

@@ -1,13 +1,12 @@
 package the.bytecode.club.bytecodeviewer;
 
+import java.io.File;
+import java.io.IOException;
 import the.bytecode.club.bytecodeviewer.bootloader.BootState;
 import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme;
 import the.bytecode.club.bytecodeviewer.gui.theme.RSTATheme;
 import the.bytecode.club.bytecodeviewer.translation.Language;
 
-import java.io.File;
-import java.io.IOException;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *
@@ -139,4 +138,4 @@ public class Configuration
 		return new File(".");
 	}
 	
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/Constants.java

@@ -1,10 +1,9 @@
 package the.bytecode.club.bytecodeviewer;
 
-import org.objectweb.asm.Opcodes;
-import the.bytecode.club.bytecodeviewer.resources.ResourceType;
-
 import java.io.File;
 import java.io.PrintStream;
+import org.objectweb.asm.Opcodes;
+import the.bytecode.club.bytecodeviewer.resources.ResourceType;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/GlobalHotKeys.java

@@ -1,14 +1,13 @@
 package the.bytecode.club.bytecodeviewer;
 
+import java.awt.event.KeyEvent;
+import java.io.File;
+import javax.swing.JFileChooser;
 import the.bytecode.club.bytecodeviewer.gui.components.FileChooser;
 import the.bytecode.club.bytecodeviewer.gui.components.RunOptions;
 import the.bytecode.club.bytecodeviewer.util.DialogUtils;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 
-import javax.swing.*;
-import java.awt.event.KeyEvent;
-import java.io.File;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/Settings.java

@@ -1,18 +1,20 @@
 package the.bytecode.club.bytecodeviewer;
 
 import com.google.gson.reflect.TypeToken;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import javax.swing.JMenuItem;
 import me.konloch.kontainer.io.DiskReader;
 import me.konloch.kontainer.io.DiskWriter;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import javax.swing.*;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 import static the.bytecode.club.bytecodeviewer.BytecodeViewer.gson;
 import static the.bytecode.club.bytecodeviewer.Configuration.maxRecentFiles;
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.filesName;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.getBCVDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.pluginsName;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/SettingsSerializer.java

@@ -1,7 +1,7 @@
 package the.bytecode.club.bytecodeviewer;
 
+import java.io.File;
 import javax.swing.JFrame;
-
 import me.konloch.kontainer.io.DiskReader;
 import me.konloch.kontainer.io.DiskWriter;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
@@ -9,9 +9,8 @@ import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme;
 import the.bytecode.club.bytecodeviewer.gui.theme.RSTATheme;
 import the.bytecode.club.bytecodeviewer.translation.Language;
 
-import java.io.File;
+import static the.bytecode.club.bytecodeviewer.Constants.VERSION;
-
+import static the.bytecode.club.bytecodeviewer.Constants.settingsName;
-import static the.bytecode.club.bytecodeviewer.Constants.*;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/api/BCV.java

@@ -8,19 +8,20 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import javax.swing.JFrame;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.compilers.Compiler;
 import the.bytecode.club.bytecodeviewer.compilers.InternalCompiler;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.EZInjection;
 import the.bytecode.club.bytecodeviewer.util.DialogUtils;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import javax.swing.*;
+import static the.bytecode.club.bytecodeviewer.Constants.DEV_MODE;
-
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/api/ClassNodeLoader.java

@@ -8,6 +8,7 @@ import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
 
@@ -35,7 +36,7 @@ import org.objectweb.asm.tree.ClassNode;
 
 public final class ClassNodeLoader extends ClassLoader
 {
-    private final HashMap<String, ClassNode> classes = new HashMap<>();
+    private final Map<String, ClassNode> classes = new HashMap<>();
 
     /**
      * Adds the provided class node to the class loader

src/main/java/the/bytecode/club/bytecodeviewer/api/ExceptionUI.java

@@ -1,22 +1,20 @@
 package the.bytecode.club.bytecodeviewer.api;
 
-import java.awt.*;
+import java.awt.CardLayout;
+import java.awt.Dimension;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.gui.components.JFrameConsole;
-import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ComponentViewer;
 import the.bytecode.club.bytecodeviewer.plugin.PluginManager;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.FAT_JAR;
+import static the.bytecode.club.bytecodeviewer.Constants.VERSION;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -144,4 +142,4 @@ public class ExceptionUI extends JFrameConsole
     }
     
     private static final long serialVersionUID = -5230501978224926296L;
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/api/Plugin.java

@@ -1,15 +1,10 @@
 package the.bytecode.club.bytecodeviewer.api;
 
 import java.util.ArrayList;
-import java.util.List;
-
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.plugin.strategies.JavascriptPluginLaunchStrategy;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 
-import javax.script.ScriptEngine;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/Boot.java

@@ -11,18 +11,22 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import me.konloch.kontainer.io.HTTPRequest;
 import org.apache.commons.io.FileUtils;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.Configuration;
+import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.bootloader.loader.AbstractLoaderFactory;
 import the.bytecode.club.bytecodeviewer.bootloader.loader.ClassPathLoader;
 import the.bytecode.club.bytecodeviewer.bootloader.loader.ILoader;
 import the.bytecode.club.bytecodeviewer.bootloader.resource.external.EmptyExternalResource;
 import the.bytecode.club.bytecodeviewer.bootloader.resource.external.ExternalResource;
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.Configuration;
-import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 import the.bytecode.club.bytecodeviewer.util.ZipUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.getBCVDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauVersion;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauWorkingDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/InitialBootScreen.java

@@ -11,10 +11,9 @@ import java.io.IOException;
 import javax.swing.JFrame;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
-
 import the.bytecode.club.bytecodeviewer.Configuration;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.gui.components.HTMLPane;
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
 import static the.bytecode.club.bytecodeviewer.Configuration.language;
 
@@ -104,4 +103,4 @@ public class InitialBootScreen extends JFrame
     }
     
     private static final long serialVersionUID = -1098467609722393444L;
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/InstallFatJar.java

@@ -1,7 +1,5 @@
 package the.bytecode.club.bytecodeviewer.bootloader;
 
-import the.bytecode.club.bytecodeviewer.bootloader.Boot;
-
 import static the.bytecode.club.bytecodeviewer.Constants.AUTOMATIC_LIBRARY_UPDATING;
 
 /***************************************************************************
@@ -56,4 +54,4 @@ public class InstallFatJar implements Runnable
 			e.printStackTrace();
 		}
 	}
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/UpdateCheck.java

@@ -1,6 +1,15 @@
 package the.bytecode.club.bytecodeviewer.bootloader;
 
 import de.skuzzle.semantic.Version;
+import java.awt.Desktop;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URL;
+import javax.swing.JFileChooser;
 import me.konloch.kontainer.io.HTTPRequest;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
@@ -9,13 +18,8 @@ import the.bytecode.club.bytecodeviewer.gui.components.FileChooser;
 import the.bytecode.club.bytecodeviewer.gui.components.MultipleChoiceDialog;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
+import static the.bytecode.club.bytecodeviewer.Constants.VERSION;
-import java.awt.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
-import java.io.*;
-import java.net.URI;
-import java.net.URL;
-
-import static the.bytecode.club.bytecodeviewer.Constants.*;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/loader/LibraryClassLoader.java

@@ -9,9 +9,9 @@ import java.util.Set;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
+import the.bytecode.club.bytecodeviewer.bootloader.classtree.ClassTree;
 import the.bytecode.club.bytecodeviewer.bootloader.resource.external.ExternalResource;
 import the.bytecode.club.bytecodeviewer.bootloader.resource.jar.contents.JarContents;
-import the.bytecode.club.bytecodeviewer.bootloader.classtree.ClassTree;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -168,4 +168,4 @@ public class LibraryClassLoader extends ClassLoader implements ILoader<JarConten
             }
         }
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/bootloader/resource/external/ExternalLibrary.java

@@ -11,9 +11,9 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
-import the.bytecode.club.bytecodeviewer.bootloader.resource.jar.contents.JarContents;
 import the.bytecode.club.bytecodeviewer.bootloader.resource.jar.JarInfo;
 import the.bytecode.club.bytecodeviewer.bootloader.resource.jar.JarResource;
+import the.bytecode.club.bytecodeviewer.bootloader.resource.jar.contents.JarContents;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -106,4 +106,4 @@ public class ExternalLibrary extends ExternalResource<JarContents<ClassNode>> {
 
         return contents;
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/JavaCompiler.java

@@ -14,7 +14,9 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/KrakatauAssembler.java

@@ -5,7 +5,6 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Objects;
-
 import me.konloch.kontainer.io.DiskWriter;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -18,7 +17,9 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauWorkingDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/compilers/impl/SmaliAssembler.java

@@ -11,7 +11,8 @@ import the.bytecode.club.bytecodeviewer.util.Enjarify;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 import the.bytecode.club.bytecodeviewer.util.ZipUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -61,8 +62,8 @@ public class SmaliAssembler extends InternalCompiler
         }
 
         try {
-            com.googlecode.d2j.smali.SmaliCmd.main(tempSmaliFolder.getAbsolutePath(),
+            com.googlecode.d2j.smali.SmaliCmd.main(new String[]{tempSmaliFolder.getAbsolutePath(),
-                    "-o", tempDex.getAbsolutePath());
+                    "-o", tempDex.getAbsolutePath()});
         } catch (Exception e) {
             e.printStackTrace();
             //BytecodeViewer.handleException(e);
@@ -73,9 +74,9 @@ public class SmaliAssembler extends InternalCompiler
             Dex2Jar.dex2Jar(tempDex, tempJar);
         else if (BytecodeViewer.viewer.apkConversionGroup.isSelected(BytecodeViewer.viewer.apkConversionEnjarify.getModel()))
             Enjarify.apk2Jar(tempDex, tempJar);
-    
+
         System.out.println("Temporary dex: " + tempDex.getAbsolutePath());
-        
+
         try {
             System.out.println("Unzipping to " + tempJarFolder.getAbsolutePath());
             ZipUtils.unzipFilesToPath(tempJar.getAbsolutePath(), tempJarFolder.getAbsolutePath());
@@ -95,7 +96,7 @@ public class SmaliAssembler extends InternalCompiler
                         found = true;
                     }
                 }
-                
+
                 System.out.println("Saved as: " + outputClass.getAbsolutePath());
 
                 return FileUtils.readFileToByteArray(outputClass);

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/Decompiler.java

@@ -1,6 +1,16 @@
 package the.bytecode.club.bytecodeviewer.decompilers;
 
-import the.bytecode.club.bytecodeviewer.decompilers.impl.*;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.ASMTextifierDisassembler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.BytecodeDisassembler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.CFRDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.FernFlowerDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.JADXDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.JDGUIDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.JavapDisassembler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.KrakatauDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.KrakatauDisassembler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.ProcyonDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.impl.SmaliDisassembler;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -62,4 +72,4 @@ public enum Decompiler
     {
         return decompiler;
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/bytecode/ClassNodeDecompiler.java

@@ -10,7 +10,7 @@ import org.objectweb.asm.tree.InnerClassNode;
 import org.objectweb.asm.tree.MethodNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -173,4 +173,4 @@ public class ClassNodeDecompiler
         }
         return sb.toString();
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/bytecode/InstructionPrinter.java

@@ -10,7 +10,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import org.apache.commons.text.StringEscapeUtils;
 import org.objectweb.asm.Type;

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/bytecode/MethodNodeDecompiler.java

@@ -12,7 +12,7 @@ import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -246,4 +246,4 @@ public class MethodNodeDecompiler {
         }
         return sb.toString();
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/BytecodeDisassembler.java

@@ -1,12 +1,11 @@
 package the.bytecode.club.bytecodeviewer.decompilers.impl;
 
+import java.util.ArrayList;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.bytecode.ClassNodeDecompiler;
 import the.bytecode.club.bytecodeviewer.decompilers.bytecode.PrefixedStringBuilder;
 
-import java.util.ArrayList;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/CFRDecompiler.java

@@ -21,8 +21,11 @@ import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
-import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.CFR;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java

@@ -13,8 +13,12 @@ import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.LAUNCH_DECOMPILERS_IN_NEW_PROCESS;
-import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.FERNFLOWER;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JADXDecompiler.java

@@ -16,8 +16,11 @@ import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
-import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.JADX;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JDGUIDecompiler.java

@@ -6,23 +6,24 @@ import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
-import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
-import the.bytecode.club.bytecodeviewer.decompilers.jdgui.DirectoryLoader;
-import the.bytecode.club.bytecodeviewer.decompilers.jdgui.CommonPreferences;
-import the.bytecode.club.bytecodeviewer.decompilers.jdgui.PlainTextPrinter;
-import the.bytecode.club.bytecodeviewer.decompilers.jdgui.JDGUIClassFileUtil;
 import me.konloch.kontainer.io.DiskReader;
 import org.jd.core.v1.ClassFileToJavaSourceDecompiler;
 import org.objectweb.asm.tree.ClassNode;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Constants;
+import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
+import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
+import the.bytecode.club.bytecodeviewer.decompilers.jdgui.CommonPreferences;
+import the.bytecode.club.bytecodeviewer.decompilers.jdgui.DirectoryLoader;
+import the.bytecode.club.bytecodeviewer.decompilers.jdgui.JDGUIClassFileUtil;
+import the.bytecode.club.bytecodeviewer.decompilers.jdgui.PlainTextPrinter;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
-import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.JDGUI;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -123,4 +124,4 @@ public class JDGUIDecompiler extends InternalDecompiler
     @Override
     public void decompileToZip(String sourceJar, String zipName) {
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/JavapDisassembler.java

@@ -1,5 +1,9 @@
 package the.bytecode.club.bytecodeviewer.decompilers.impl;
 
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
 import me.konloch.kontainer.io.DiskWriter;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
@@ -10,11 +14,6 @@ import the.bytecode.club.bytecodeviewer.gui.components.JFrameConsolePrintStream;
 import the.bytecode.club.bytecodeviewer.resources.ExternalResources;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-
 import static the.bytecode.club.bytecodeviewer.Constants.fs;
 import static the.bytecode.club.bytecodeviewer.api.ExceptionUI.SEND_STACKTRACE_TO;
 

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDecompiler.java

@@ -21,7 +21,10 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 import the.bytecode.club.bytecodeviewer.util.ZipUtils;
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauWorkingDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/KrakatauDisassembler.java

@@ -20,7 +20,9 @@ import the.bytecode.club.bytecodeviewer.util.JarUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 import the.bytecode.club.bytecodeviewer.util.ZipUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauWorkingDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ProcyonDecompiler.java

@@ -38,8 +38,11 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
-import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.PROCYON;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/SmaliDisassembler.java

@@ -10,15 +10,18 @@ import me.konloch.kontainer.io.DiskReader;
 import org.apache.commons.io.FileUtils;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.Constants;
 import the.bytecode.club.bytecodeviewer.api.ExceptionUI;
 import the.bytecode.club.bytecodeviewer.decompilers.InternalDecompiler;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.Dex2Jar;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
-import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.*;
+import static the.bytecode.club.bytecodeviewer.Constants.nl;
+import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.DISASSEMBLER;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.ERROR;
+import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.SMALI;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -70,8 +73,8 @@ public class SmaliDisassembler extends InternalDecompiler
         Dex2Jar.saveAsDex(tempClass, tempDex, true);
 
         try {
-            com.googlecode.d2j.smali.BaksmaliCmd.main(tempDex.getAbsolutePath(),
+            com.googlecode.d2j.smali.BaksmaliCmd.main(new String[]{tempDex.getAbsolutePath(),
-                    "-o", tempDexOut.getAbsolutePath());
+                    "-o", tempDexOut.getAbsolutePath()});
         } catch (Exception e) {
             StringWriter sw = new StringWriter();
             e.printStackTrace(new PrintWriter(sw));

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/jdgui/PlainTextPrinter.java

@@ -3,7 +3,6 @@ package the.bytecode.club.bytecodeviewer.decompilers.jdgui;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintStream;
-
 import org.jd.core.v1.api.printer.Printer;
 
 public class PlainTextPrinter implements Printer, Closeable {

src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java

@@ -1,15 +1,38 @@
 package the.bytecode.club.bytecodeviewer.gui;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.KeyboardFocusManager;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.swing.*;
+import javax.swing.BoxLayout;
-
+import javax.swing.ButtonGroup;
-import the.bytecode.club.bytecodeviewer.*;
+import javax.swing.JCheckBoxMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.components.*;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JSeparator;
+import javax.swing.JSpinner;
+import javax.swing.JSplitPane;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.Configuration;
+import the.bytecode.club.bytecodeviewer.Constants;
+import the.bytecode.club.bytecodeviewer.SettingsSerializer;
+import the.bytecode.club.bytecodeviewer.gui.components.AboutWindow;
+import the.bytecode.club.bytecodeviewer.gui.components.FileChooser;
+import the.bytecode.club.bytecodeviewer.gui.components.MultipleChoiceDialog;
+import the.bytecode.club.bytecodeviewer.gui.components.RunOptions;
+import the.bytecode.club.bytecodeviewer.gui.components.SettingsDialog;
+import the.bytecode.club.bytecodeviewer.gui.components.VisibleComponent;
+import the.bytecode.club.bytecodeviewer.gui.components.WaitBusyIcon;
 import the.bytecode.club.bytecodeviewer.gui.plugins.MaliciousCodeScannerOptions;
 import the.bytecode.club.bytecodeviewer.gui.plugins.ReplaceStringsOptions;
 import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceListPane;
@@ -25,23 +48,38 @@ import the.bytecode.club.bytecodeviewer.obfuscators.rename.RenameFields;
 import the.bytecode.club.bytecodeviewer.obfuscators.rename.RenameMethods;
 import the.bytecode.club.bytecodeviewer.plugin.PluginManager;
 import the.bytecode.club.bytecodeviewer.plugin.PluginTemplate;
-import the.bytecode.club.bytecodeviewer.plugin.preinstalled.*;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.AllatoriStringDecrypter;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ChangeClassFileVersions;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.CodeSequenceDiagram;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ShowAllStrings;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ShowMainMethods;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.StackFramesRemover;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ViewAPKAndroidPermissions;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ViewManifest;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ZKMStringDecrypter;
+import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ZStringArrayDecrypter;
 import the.bytecode.club.bytecodeviewer.resources.ExternalResources;
-import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
-import the.bytecode.club.bytecodeviewer.resources.exporting.Export;
+import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
-import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBoxMenuItem;
-import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJRadioButtonMenuItem;
-import the.bytecode.club.bytecodeviewer.util.*;
 import the.bytecode.club.bytecodeviewer.resources.ResourceDecompiling;
+import the.bytecode.club.bytecodeviewer.resources.exporting.Export;
 import the.bytecode.club.bytecodeviewer.translation.Language;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBoxMenuItem;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJMenu;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJMenuItem;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJRadioButtonMenuItem;
+import the.bytecode.club.bytecodeviewer.util.DialogUtils;
+import the.bytecode.club.bytecodeviewer.util.KeyEventDispatch;
+import the.bytecode.club.bytecodeviewer.util.LazyNameUtil;
+import the.bytecode.club.bytecodeviewer.util.MiscUtils;
+import the.bytecode.club.bytecodeviewer.util.WindowClosingAdapter;
+import the.bytecode.club.bytecodeviewer.util.WindowStateChangeAdapter;
 
 import static the.bytecode.club.bytecodeviewer.Configuration.useNewSettingsDialog;
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.VERSION;
+import static the.bytecode.club.bytecodeviewer.Constants.fs;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,15 +1,14 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import java.awt.*;
+import java.awt.CardLayout;
 import java.io.IOException;
 import javax.swing.JFrame;
 import javax.swing.JScrollPane;
-
 import the.bytecode.club.bytecodeviewer.bootloader.InitialBootScreen;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import static the.bytecode.club.bytecodeviewer.Configuration.*;
+import static the.bytecode.club.bytecodeviewer.Configuration.language;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,9 +1,9 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import javax.swing.*;
+import java.awt.Component;
-import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import javax.swing.AbstractButton;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,14 +1,20 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JSeparator;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.WorkspaceRefreshEvent;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBoxMenuItem;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJRadioButtonMenuItem;
-import the.bytecode.club.bytecodeviewer.gui.resourceviewer.WorkspaceRefreshEvent;
 
-import javax.swing.*;
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.BYTECODE;
-
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.BYTECODE_NON_EDITABLE;
-import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.*;
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.JAVA;
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.JAVA_AND_BYTECODE;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -116,4 +122,4 @@ public class DecompilerViewComponent
 		BYTECODE_NON_EDITABLE,
 		JAVA_AND_BYTECODE
 	}
-}
+}

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

@@ -1,11 +1,26 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.HeadlessException;
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JRootPane;
+import javax.swing.JScrollPane;
+import javax.swing.UIManager;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
-import javax.swing.*;
+import static javax.swing.JOptionPane.CLOSED_OPTION;
-import java.awt.*;
+import static javax.swing.JOptionPane.DEFAULT_OPTION;
-
+import static javax.swing.JOptionPane.ERROR_MESSAGE;
-import static javax.swing.JOptionPane.*;
+import static javax.swing.JOptionPane.INFORMATION_MESSAGE;
+import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
+import static javax.swing.JOptionPane.PLAIN_MESSAGE;
+import static javax.swing.JOptionPane.QUESTION_MESSAGE;
+import static javax.swing.JOptionPane.UNINITIALIZED_VALUE;
+import static javax.swing.JOptionPane.WARNING_MESSAGE;
+import static javax.swing.JOptionPane.getRootFrame;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -228,4 +243,4 @@ public class ExtendedJOptionPane
 	{
 		void onCreate(JDialog dialog);
 	}
-}
+}

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

@@ -1,12 +1,11 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import the.bytecode.club.bytecodeviewer.util.MiscUtils;
-
-import javax.swing.*;
-import javax.swing.filechooser.FileFilter;
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+import the.bytecode.club.bytecodeviewer.util.MiscUtils;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,15 +1,19 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Scanner;
-import the.bytecode.club.bytecodeviewer.bootloader.InitialBootScreen;
+import javax.swing.JEditorPane;
-import the.bytecode.club.bytecodeviewer.Configuration;
-
-import javax.swing.*;
 import javax.swing.text.html.HTMLEditorKit;
-import java.io.IOException;
+import the.bytecode.club.bytecodeviewer.Configuration;
+import the.bytecode.club.bytecodeviewer.bootloader.InitialBootScreen;
 
-import static the.bytecode.club.bytecodeviewer.Constants.*;
+import static the.bytecode.club.bytecodeviewer.Constants.BCVDir;
+import static the.bytecode.club.bytecodeviewer.Constants.FAT_JAR;
+import static the.bytecode.club.bytecodeviewer.Constants.enjarifyVersion;
+import static the.bytecode.club.bytecodeviewer.Constants.enjarifyWorkingDirectory;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauVersion;
+import static the.bytecode.club.bytecodeviewer.Constants.krakatauWorkingDirectory;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -83,4 +87,4 @@ public class HTMLPane extends JEditorPane
 			return s.hasNext() ? s.next() : "";
 		}
 	}
-}
+}

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

@@ -1,7 +1,8 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import javax.swing.*;
+import java.awt.Image;
-import java.awt.*;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,12 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.io.File;
+import javax.swing.JFrame;
 import me.konloch.kontainer.io.DiskWriter;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
-import javax.swing.*;
-import java.awt.*;
-import java.io.File;
-
 import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
 
 /***************************************************************************

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

@@ -1,9 +1,8 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import the.bytecode.club.bytecodeviewer.Constants;
-
-import javax.swing.*;
 import java.io.PrintStream;
+import javax.swing.SwingUtilities;
+import the.bytecode.club.bytecodeviewer.Constants;
 
 import static the.bytecode.club.bytecodeviewer.Constants.nl;
 

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

@@ -1,10 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import javax.swing.JFrame;
+import javax.swing.JTabbedPane;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
-import javax.swing.*;
-import java.awt.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

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

@@ -1,7 +1,10 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import javax.swing.*;
+import java.awt.Dimension;
-import java.awt.*;
+import java.awt.Graphics;
+import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.UIManager;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -2,9 +2,9 @@ package the.bytecode.club.bytecodeviewer.gui.components;
 
 import java.io.Closeable;
 import java.io.IOException;
-import javax.swing.*;
 import java.io.OutputStream;
 import java.io.PrintStream;
+import javax.swing.JTextArea;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,7 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import javax.swing.*;
+import java.awt.Dimension;
-import java.awt.*;
+import javax.swing.JLabel;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,11 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import java.awt.Component;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
 import the.bytecode.club.bytecodeviewer.gui.util.BytecodeViewPanelUpdater;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
-import javax.swing.*;
-import java.awt.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

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

@@ -1,9 +1,9 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
-import javax.swing.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

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

@@ -6,11 +6,10 @@ import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
-
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.api.ASMResourceUtil;
 import the.bytecode.club.bytecodeviewer.plugin.PluginManager;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.EZInjection;
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,19 +1,25 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import java.awt.BorderLayout;
-import the.bytecode.club.bytecodeviewer.GlobalHotKeys;
+import java.awt.Font;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
-import the.bytecode.club.bytecodeviewer.gui.components.listeners.PressKeyListener;
-import the.bytecode.club.bytecodeviewer.gui.components.listeners.ReleaseKeyListener;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
-import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
-import the.bytecode.club.bytecodeviewer.util.JTextAreaUtils;
-
-import javax.swing.*;
-import java.awt.*;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseWheelListener;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.GlobalHotKeys;
+import the.bytecode.club.bytecodeviewer.gui.components.listeners.PressKeyListener;
+import the.bytecode.club.bytecodeviewer.gui.components.listeners.ReleaseKeyListener;
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
+import the.bytecode.club.bytecodeviewer.util.JTextAreaUtils;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,25 +1,31 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseWheelListener;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.text.BadLocationException;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rtextarea.RTextScrollPane;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.GlobalHotKeys;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.gui.components.listeners.PressKeyListener;
 import the.bytecode.club.bytecodeviewer.gui.components.listeners.ReleaseKeyListener;
 import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme;
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
 import the.bytecode.club.bytecodeviewer.util.JTextAreaUtils;
 
-import javax.swing.*;
-import javax.swing.text.BadLocationException;
-import java.awt.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseWheelListener;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

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

@@ -1,9 +1,15 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
-import javax.swing.*;
+import java.awt.Component;
-import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
+import javax.swing.BoxLayout;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 
 import static the.bytecode.club.bytecodeviewer.Configuration.useNewSettingsDialog;
 
@@ -95,4 +101,4 @@ public class SettingsDialog extends JScrollPane
 		
 		return menu.getText();
 	}
-}
+}

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

@@ -1,14 +1,13 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
 import com.github.weisj.darklaf.icons.ThemedSVGIcon;
+import javax.swing.BorderFactory;
+import javax.swing.JInternalFrame;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.Workspace;
 import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
-import javax.swing.BorderFactory;
-import javax.swing.JInternalFrame;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *
@@ -65,4 +64,4 @@ public abstract class VisibleComponent extends JInternalFrame
     }
     
     private static final long serialVersionUID = -6453413772343643526L;
-}
+}

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

@@ -1,9 +1,8 @@
 package the.bytecode.club.bytecodeviewer.gui.components;
 
+import javax.swing.Icon;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
-import javax.swing.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/components/listeners/MouseClickedListener.java

@@ -1,6 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.components.listeners;
 
-import java.awt.event.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/BuildContextMenuItem.java

@@ -1,11 +1,10 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu;
 
+import javax.swing.JPopupMenu;
+import javax.swing.tree.TreePath;
 import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceTree;
 import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;
 
-import javax.swing.*;
-import javax.swing.tree.TreePath;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/ContextMenu.java

@@ -1,16 +1,18 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu;
 
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import java.util.ArrayList;
-import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceTree;
+import javax.swing.JPopupMenu;
-import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.*;
-import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
-
-import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.event.ActionEvent;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.Collapse;
-import java.util.ArrayList;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.Expand;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.New;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.Open;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.QuickEdit;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.QuickOpen;
+import the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist.Remove;
+import the.bytecode.club.bytecodeviewer.gui.resourcelist.ResourceTree;
+import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Collapse.java

@@ -1,13 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Expand.java

@@ -1,13 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/New.java

@@ -1,5 +1,11 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import java.util.Enumeration;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
 import org.apache.commons.io.FilenameUtils;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
@@ -9,12 +15,6 @@ import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import java.util.Enumeration;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *
@@ -171,4 +171,4 @@ public class New extends ContextMenuItem
 		FILE,
 		DIRECTORY,
 	}
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Open.java

@@ -1,13 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/QuickEdit.java

@@ -1,13 +1,13 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/QuickOpen.java

@@ -1,13 +1,13 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/resourcelist/Remove.java

@@ -1,13 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.resourcelist;
 
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/Open.java

@@ -1,13 +1,12 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox;
 
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/QuickEdit.java

@@ -1,13 +1,13 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox;
 
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/contextmenu/searchbox/QuickOpen.java

@@ -1,13 +1,13 @@
 package the.bytecode.club.bytecodeviewer.gui.contextmenu.searchbox;
 
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuItem;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenuType;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

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

@@ -1,18 +1,26 @@
 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;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Rectangle;
-import java.awt.event.*;
+import java.awt.RenderingHints;
-import javax.swing.*;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import javax.swing.SwingUtilities;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 
 /**

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

@@ -1,7 +1,5 @@
 package the.bytecode.club.bytecodeviewer.gui.hexviewer;
 
-import the.bytecode.club.bytecodeviewer.Configuration;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
@@ -11,6 +9,7 @@ import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import javax.swing.JComponent;
+import the.bytecode.club.bytecodeviewer.Configuration;
 
 /**
  * @author laullon

src/main/java/the/bytecode/club/bytecodeviewer/gui/plugins/MaliciousCodeScannerOptions.java

@@ -1,15 +1,16 @@
 package the.bytecode.club.bytecodeviewer.gui.plugins;
 
+import java.awt.Dimension;
+import java.util.ArrayList;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.malwarescanner.MalwareScanModule;
 import the.bytecode.club.bytecodeviewer.malwarescanner.util.MaliciousCodeOptions;
 import the.bytecode.club.bytecodeviewer.plugin.PluginManager;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.MaliciousCodeScanner;
-
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
-import javax.swing.*;
-import java.awt.*;
-import java.util.ArrayList;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -80,4 +81,4 @@ public class MaliciousCodeScannerOptions extends JFrame
     }
 
     private static final long serialVersionUID = -2662514582647810868L;
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/gui/plugins/ReplaceStringsOptions.java

@@ -6,11 +6,10 @@ import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
-
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.plugin.PluginManager;
 import the.bytecode.club.bytecodeviewer.plugin.preinstalled.ReplaceStrings;
+import the.bytecode.club.bytecodeviewer.resources.IconResources;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,16 +1,17 @@
 package the.bytecode.club.bytecodeviewer.gui.resourcelist;
 
+import java.awt.Component;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.ImageIcon;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.TreeNode;
 import org.apache.commons.io.FilenameUtils;
 import the.bytecode.club.bytecodeviewer.resources.IconResources;
 import the.bytecode.club.bytecodeviewer.resources.ResourceType;
 
-import javax.swing.*;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreeNode;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-
 /**
  * @author http://stackoverflow.com/questions/14968005
  * @author Konloch
@@ -19,7 +20,7 @@ import java.util.HashMap;
 public class ResourceListIconRenderer extends DefaultTreeCellRenderer
 {
 	//TODO the icon cache needs to be cleared on treenode removal
-	public static HashMap<ResourceTreeNode, ImageIcon> iconCache = new HashMap<>();
+	public static Map<ResourceTreeNode, ImageIcon> iconCache = new HashMap<>();
 	
 	//called every time there is a pane update
 	@Override

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

@@ -12,22 +12,27 @@ import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.Enumeration;
 import java.util.Map.Entry;
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.JTree;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-
 import me.konloch.kontainer.io.DiskWriter;
 import org.apache.commons.io.FilenameUtils;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenu;
+import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.importing.Import;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJTextField;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent;
-import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.util.FileDrop;
 import the.bytecode.club.bytecodeviewer.util.LazyNameUtil;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
@@ -501,4 +506,4 @@ public class ResourceListPane extends TranslatedVisibleComponent implements File
         });
     }
     
-}
+}

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

@@ -1,12 +1,14 @@
 package the.bytecode.club.bytecodeviewer.gui.resourcelist;
 
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
 import the.bytecode.club.bytecodeviewer.gui.util.StringMetricsUtil;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
-import javax.swing.*;
-import javax.swing.tree.DefaultMutableTreeNode;
-import java.awt.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

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

@@ -1,8 +1,8 @@
 package the.bytecode.club.bytecodeviewer.gui.resourcelist;
 
+import java.util.Comparator;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
-import java.util.Comparator;
 import javax.swing.tree.TreeNode;
 
 /***************************************************************************

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

@@ -1,12 +1,11 @@
 package the.bytecode.club.bytecodeviewer.gui.resourcelist;
 
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.util.Enumeration;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/PerformSearch.java

@@ -1,17 +1,14 @@
 package the.bytecode.club.bytecodeviewer.gui.resourcesearch;
 
-import org.objectweb.asm.tree.ClassNode;
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-import the.bytecode.club.bytecodeviewer.searching.BackgroundSearchThread;
-import the.bytecode.club.bytecodeviewer.searching.RegexInsnFinder;
-import the.bytecode.club.bytecodeviewer.searching.impl.LDCSearch;
-import the.bytecode.club.bytecodeviewer.searching.impl.RegexSearch;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
-import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
-
-import javax.swing.tree.TreePath;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
+import javax.swing.tree.TreePath;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
+import the.bytecode.club.bytecodeviewer.searching.BackgroundSearchThread;
+import the.bytecode.club.bytecodeviewer.searching.RegexInsnFinder;
+import the.bytecode.club.bytecodeviewer.searching.impl.RegexSearch;
+import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourcesearch/SearchBoxPane.java

@@ -6,10 +6,16 @@ import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Objects;
-import javax.swing.*;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 import the.bytecode.club.bytecodeviewer.gui.contextmenu.ContextMenu;
@@ -17,7 +23,11 @@ import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer
 import the.bytecode.club.bytecodeviewer.searching.BackgroundSearchThread;
 import the.bytecode.club.bytecodeviewer.searching.LDCSearchTreeNodeResult;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
-import the.bytecode.club.bytecodeviewer.translation.components.*;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedDefaultMutableTreeNode;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJCheckBox;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJLabel;
+import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
@@ -242,4 +252,4 @@ public class SearchBoxPane extends TranslatedVisibleComponent
     }
     
     private static final long serialVersionUID = -1098524689236993932L;
-}
+}

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

@@ -1,5 +1,9 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
+import java.awt.BorderLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.compilers.Compiler;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
@@ -10,9 +14,6 @@ import the.bytecode.club.bytecodeviewer.gui.util.BytecodeViewPanelUpdater;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.JarUtils;
 
-import javax.swing.*;
-import java.awt.*;
-
 import static the.bytecode.club.bytecodeviewer.Constants.nl;
 
 /***************************************************************************

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

@@ -1,5 +1,14 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import javax.swing.AbstractButton;
+import javax.swing.ButtonGroup;
+import javax.swing.JMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JSeparator;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.SettingsSerializer;
 import the.bytecode.club.bytecodeviewer.bootloader.BootState;
@@ -9,14 +18,10 @@ import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJMenu;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJRadioButtonMenuItem;
 
-import javax.swing.*;
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.BYTECODE;
-
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.BYTECODE_NON_EDITABLE;
-import java.util.ArrayList;
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.JAVA;
-import java.util.Arrays;
+import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.JAVA_AND_BYTECODE;
-import java.util.Enumeration;
-import java.util.List;
-
-import static the.bytecode.club.bytecodeviewer.gui.components.DecompilerViewComponent.DecompilerComponentType.*;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,10 +1,15 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
-import javax.swing.*;
+import java.awt.BasicStroke;
-import javax.swing.plaf.basic.BasicButtonUI;
+import java.awt.Color;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.plaf.basic.BasicButtonUI;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,14 +1,10 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import java.awt.Component;
-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.Resource;
-
-import java.awt.*;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -8,8 +8,14 @@ import java.awt.event.InputEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import javax.swing.*;
+import javax.swing.BorderFactory;
-
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JTabbedPane;
+import javax.swing.SwingUtilities;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.gui.components.ButtonHoverAnimation;
 import the.bytecode.club.bytecodeviewer.gui.components.MaxWidthJLabel;
@@ -252,4 +258,4 @@ public class TabbedPane extends JPanel
     
     private static final long serialVersionUID = -4774885688297538774L;
     
-}
+}

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

@@ -1,21 +1,27 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.util.HashSet;
-import javax.swing.*;
+import javax.swing.JButton;
-
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JTabbedPane;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
 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.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedVisibleComponent;
-import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 
 import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
 
@@ -253,4 +259,4 @@ public class Workspace extends TranslatedVisibleComponent
     }
     
     private static final long serialVersionUID = 6542337997679487946L;
-}
+}

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

@@ -1,12 +1,9 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
-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 javax.swing.*;
 import java.awt.event.ActionEvent;
+import javax.swing.JButton;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

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

@@ -1,9 +1,8 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer;
 
-import the.bytecode.club.bytecodeviewer.BytecodeViewer;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ClassViewer.java

@@ -1,9 +1,5 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer;
 
-import the.bytecode.club.bytecodeviewer.api.ASMUtil;
-import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
-import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
-
 import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.Point;
@@ -18,14 +14,15 @@ import javax.swing.JSplitPane;
 import javax.swing.JViewport;
 import javax.swing.SwingUtilities;
 import javax.swing.text.BadLocationException;
-
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.SettingsSerializer;
+import the.bytecode.club.bytecodeviewer.api.ASMUtil;
+import the.bytecode.club.bytecodeviewer.decompilers.Decompiler;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
 import the.bytecode.club.bytecodeviewer.resources.Resource;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
-import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.util.MethodParser;
 
 import static the.bytecode.club.bytecodeviewer.util.MethodParser.Method;

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ComponentViewer.java

@@ -1,11 +1,11 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer;
 
+import java.awt.BorderLayout;
+import java.awt.Component;
+import javax.swing.JButton;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.resources.Resource;
 
-import javax.swing.*;
-import java.awt.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/FileViewer.java

@@ -7,7 +7,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-
 import org.apache.commons.io.FilenameUtils;
 import org.imgscalr.Scalr;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/ResourceViewer.java

@@ -1,7 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer;
 
-import javax.swing.*;
+import javax.swing.JButton;
-
+import javax.swing.JPanel;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.TabbedPane;
 import the.bytecode.club.bytecodeviewer.resources.Resource;
@@ -74,4 +74,4 @@ public abstract class ResourceViewer extends JPanel
     }
 
     private static final long serialVersionUID = -2965538493489119191L;
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/viewer/synchronizedscroll/MethodData.java

@@ -1,8 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.synchronizedscroll;
 
-import org.objectweb.asm.Type;
-
 import java.util.Arrays;
+import org.objectweb.asm.Type;
 
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *

src/main/java/the/bytecode/club/bytecodeviewer/gui/theme/LAFTheme.java

@@ -1,16 +1,24 @@
 package the.bytecode.club.bytecodeviewer.gui.theme;
 
 import com.github.weisj.darklaf.LafManager;
-import com.github.weisj.darklaf.theme.*;
+import com.github.weisj.darklaf.theme.DarculaTheme;
+import com.github.weisj.darklaf.theme.HighContrastDarkTheme;
+import com.github.weisj.darklaf.theme.HighContrastLightTheme;
+import com.github.weisj.darklaf.theme.IntelliJTheme;
+import com.github.weisj.darklaf.theme.OneDarkTheme;
+import com.github.weisj.darklaf.theme.SolarizedDarkTheme;
+import com.github.weisj.darklaf.theme.SolarizedLightTheme;
+import java.awt.Dialog;
+import javax.swing.JInternalFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
 import the.bytecode.club.bytecodeviewer.gui.components.SettingsDialog;
 import the.bytecode.club.bytecodeviewer.gui.components.VisibleComponent;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 
-import javax.swing.*;
-import java.awt.*;
-
 /***************************************************************************
  * Bytecode Viewer (BCV) - Java & Android Reverse Engineering Suite        *
  * Copyright (C) 2014 Kalen 'Konloch' Kinloch - http://bytecodeviewer.com  *

src/main/java/the/bytecode/club/bytecodeviewer/gui/util/BytecodeViewPanelUpdater.java

@@ -1,18 +1,19 @@
 package the.bytecode.club.bytecodeviewer.gui.util;
 
 import java.awt.BorderLayout;
-import java.awt.Font;
-import java.awt.event.InputEvent;
 import java.util.Objects;
 import java.util.regex.Matcher;
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JViewport;
+import javax.swing.SwingUtilities;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rtextarea.RTextScrollPane;
 import org.objectweb.asm.ClassWriter;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
 import the.bytecode.club.bytecodeviewer.Configuration;
@@ -373,4 +374,4 @@ public class BytecodeViewPanelUpdater implements Runnable
         String editable = isPanelEditable ? " - " + EDITABLE : "";
         bytecodeViewPanel.textArea.getTitleHeader().setText(decompiler.getDecompilerName() + editable);
     }
-}
+}

src/main/java/the/bytecode/club/bytecodeviewer/gui/util/DelayTabbedPaneThread.java

@@ -1,9 +1,8 @@
 package the.bytecode.club.bytecodeviewer.gui.util;
 
-import the.bytecode.club.bytecodeviewer.gui.resourceviewer.TabbedPane;
-
 import java.awt.Color;
 import javax.swing.SwingUtilities;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.TabbedPane;
 
 /**
  * @author Konloch

src/main/java/the/bytecode/club/bytecodeviewer/gui/util/StringMetricsUtil.java

@@ -1,6 +1,7 @@
 package the.bytecode.club.bytecodeviewer.gui.util;
 
-import java.awt.*;
+import java.awt.Font;
+import java.awt.Graphics2D;
 import java.awt.font.FontRenderContext;
 import java.awt.geom.Rectangle2D;