Even more applications of the Law of Demeter

Author: ThexXTURBOXx

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

@@ -5,6 +5,7 @@
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import the.bytecode.club.bytecodeviewer.util.EncodeUtils;
@@ -18,14 +19,14 @@
 public class DiskReader {
 
     public static Random random = new Random();
-    public static Map<String, ArrayList<String>> map = new HashMap<>();
+    public static Map<String, List<String>> map = new HashMap<>();
 
     /**
      * Used to load from file, allows caching
      */
-    public synchronized static ArrayList<String> loadArrayList(String fileName,
-                                                               boolean cache) {
-        ArrayList<String> array = new ArrayList<>();
+    public synchronized static List<String> loadArrayList(String fileName,
+                                                          boolean cache) {
+        List<String> array = new ArrayList<>();
         if (!map.containsKey(fileName)) {
             try {
                 File file = new File(fileName);
@@ -76,7 +77,7 @@ public synchronized static String loadAsString(String fileName) throws Exception
     public static String loadString(String fileName, int lineNumber,
                                     boolean cache) throws Exception {
 
-        ArrayList<String> array;
+        List<String> array;
         if (!map.containsKey(fileName)) {
             array = new ArrayList<>();
             File file = new File(fileName);

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

@@ -142,7 +142,7 @@ private void setup() throws Exception {
      * @throws Exception
      */
     public String[] read() throws Exception {
-        ArrayList<String> st;
+        List<String> st;
 
         try {
             setup();
@@ -172,7 +172,7 @@ public String[] read() throws Exception {
      * @throws Exception
      */
     public String[] read(int linesToRead) throws Exception {
-        ArrayList<String> st;
+        List<String> st;
 
         try {
             setup();
@@ -273,4 +273,4 @@ private void cleanup() {
         connection = null;
     }
 
-}
+}

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

@@ -432,9 +432,9 @@ public static byte[] getClassFileBytes(Class<?> clazz) throws IOException
      * @return the loaded classes as an array list
      */
     @Deprecated
-    public static ArrayList<ClassNode> getLoadedClasses()
+    public static List<ClassNode> getLoadedClasses()
     {
-        ArrayList<ClassNode> a = new ArrayList<>();
+        List<ClassNode> a = new ArrayList<>();
 
         for (ResourceContainer container : resourceContainers.values())
             for (ClassNode c : container.resourceClasses.values())

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

@@ -189,7 +189,7 @@ public static ClassNode getClassNode(String name) {
      *
      * @return the loaded classes
      */
-    public static ArrayList<ClassNode> getLoadedClasses() {
+    public static List<ClassNode> getLoadedClasses() {
         return the.bytecode.club.bytecodeviewer.BytecodeViewer
                 .getLoadedClasses();
     }

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

@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
@@ -73,7 +74,7 @@ public void clear() {
      * @return All classes in this loader
      */
     public Collection<Class<?>> getAllClasses() {
-        ArrayList<Class<?>> classes = new ArrayList<>();
+        List<Class<?>> classes = new ArrayList<>();
         for (String s : this.classes.keySet()) {
             try {
                 classes.add(loadClass(s));

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

@@ -1,6 +1,7 @@
 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.resources.ResourceContainer;
@@ -94,5 +95,5 @@ public void executeContainer()
      *
      * @param classNodeList all of the loaded classes for easy access.
      */
-    public abstract void execute(ArrayList<ClassNode> classNodeList);
+    public abstract void execute(List<ClassNode> classNodeList);
 }

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

@@ -38,9 +38,9 @@
 public class ClassNodeDecompiler
 {
     public static PrefixedStringBuilder decompile(
-            PrefixedStringBuilder sb, ArrayList<String> decompiledClasses,
+            PrefixedStringBuilder sb, List<String> decompiledClasses,
             ClassNode cn) {
-        ArrayList<String> unableToDecompile = new ArrayList<>();
+        List<String> unableToDecompile = new ArrayList<>();
         decompiledClasses.add(cn.name);
         sb.append(getAccessString(cn.access));
         sb.append(" ");

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

@@ -69,7 +69,7 @@ public class InstructionPrinter {
     protected List<AbstractInsnNode> matchedInsns;
     protected Map<LabelNode, Integer> labels;
     private boolean firstLabel = false;
-    private final ArrayList<String> info = new ArrayList<>();
+    private final List<String> info = new ArrayList<>();
 
     public InstructionPrinter(MethodNode m, TypeAndName[] args) {
         this.args = args;
@@ -99,7 +99,7 @@ public InstructionPrinter(MethodNode m, InstructionPattern pattern,
      *
      * @return The print as an ArrayList
      */
-    public ArrayList<String> createPrint() {
+    public List<String> createPrint() {
         firstLabel = false;
         info.clear();
         for (AbstractInsnNode ain : mNode.instructions) {

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

@@ -110,7 +110,7 @@ public class MainViewerGUI extends JFrame
     public final List<JMenuItem> waitIcons = new ArrayList<>();
 
     //main UI components
-    public final ArrayList<VisibleComponent> uiComponents = new ArrayList<>();
+    public final List<VisibleComponent> uiComponents = new ArrayList<>();
     public final Workspace workPane = new Workspace();
     public final ResourceListPane resourcePane = new ResourceListPane();
     public final SearchBoxPane searchBoxPane = new SearchBoxPane();
@@ -915,7 +915,7 @@ public void reloadResources()
         if (dialog.promptChoice() == 0)
         {
             LazyNameUtil.reset();
-            ArrayList<File> reopen = new ArrayList<>();
+            List<File> reopen = new ArrayList<>();
 
             for (ResourceContainer container : BytecodeViewer.resourceContainers.values())
             {

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

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Set;
 import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 import the.bytecode.club.bytecodeviewer.util.MiscUtils;
@@ -40,7 +41,7 @@ public FileChooser(File file, String title, String description, String... extens
 
 	public FileChooser(boolean skipFileFilter, File file, String title, String description, String... extensions)
 	{
-		HashSet<String> extensionSet = new HashSet<>(Arrays.asList(extensions));
+		Set<String> extensionSet = new HashSet<>(Arrays.asList(extensions));
 
 		try {
 			if(file.isDirectory())