Cleanup warnings

Author: jamesrcounts

src/main/java/org/teachingextensions/approvals/lite/reporters/MultipleExceptions.java

@@ -3,29 +3,33 @@
 import java.util.ArrayList;
 
 public class MultipleExceptions extends RuntimeException {
-    public MultipleExceptions(ArrayList<Throwable> exceptions) {
-        super(getText(exceptions), exceptions.get(0));
-    }
+  private static final long serialVersionUID = 1464454338264847972L;
+
+  public MultipleExceptions(ArrayList<Throwable> exceptions) {
+    super(getText(exceptions), exceptions.get(0));
+  }
 
-    public static void rethrowExceptions(ArrayList<Throwable> exceptions) throws Exception {
-        if (exceptions.size() != 0) {
-            if (exceptions.size() == 0) {
-                Throwable t = exceptions.get(0);
-                if (t instanceof Exception) {
-                    throw ((Exception) t);
-                }
-                throw (Error) t;
-            } else {
-                throw new MultipleExceptions(exceptions);
-            }
+  public static void rethrowExceptions(ArrayList<Throwable> exceptions)
+      throws Exception {
+    if (exceptions.size() != 0) {
+      if (exceptions.size() == 0) {
+        Throwable t = exceptions.get(0);
+        if (t instanceof Exception) {
+          throw ((Exception) t);
         }
+        throw (Error) t;
+      } else {
+        throw new MultipleExceptions(exceptions);
+      }
     }
+  }
 
-    private static String getText(ArrayList<Throwable> exceptions) {
-        StringBuilder b = new StringBuilder("Multiple Exceptions Thrown:");
-        for (int i = 0; i < exceptions.size(); i++) {
-            b.append(String.format("\n #%s): %s", i + 1, exceptions.get(i).getMessage()));
-        }
-        return b.toString();
+  private static String getText(ArrayList<Throwable> exceptions) {
+    StringBuilder b = new StringBuilder("Multiple Exceptions Thrown:");
+    for (int i = 0; i < exceptions.size(); i++) {
+      b.append(String.format("\n #%s): %s", i + 1, exceptions.get(i)
+          .getMessage()));
     }
+    return b.toString();
+  }
 }

src/main/java/org/teachingextensions/approvals/lite/util/FormattedException.java

@@ -1,10 +1,11 @@
 package org.teachingextensions.approvals.lite.util;
 
-
 public class FormattedException extends RuntimeException {
 
-    public FormattedException(String string, Object... params) {
-        super(String.format(string, params));
-        MySystem.variable(this.getMessage());
-    }
+  private static final long serialVersionUID = -4388436150197314047L;
+
+  public FormattedException(String string, Object... params) {
+    super(String.format(string, params));
+    MySystem.variable(this.getMessage());
+  }
 }

src/main/java/org/teachingextensions/approvals/lite/util/ObjectUtils.java

@@ -1,14 +1,8 @@
 package org.teachingextensions.approvals.lite.util;
 
-import java.awt.Image;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
+import javax.swing.*;
+import java.awt.*;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.ImageIcon;
 
 /**
  * A static class of convenience functions for Manipulating objects
@@ -28,8 +22,8 @@ public static boolean isEqual(Object s1, Object s2) {
     return s1 == s2 || (s1 != null) && s1.equals(s2);
   }
 
-  public static boolean isThisInstanceOfThat(Class<?> thiz, Class<?> that) {
-    return that.isAssignableFrom(thiz);
+  public static boolean isThisInstanceOfThat(Class<?> type, Class<?> that) {
+    return that.isAssignableFrom(type);
   }
 
   public static Error throwAsError(Throwable t) throws Error {
@@ -42,82 +36,6 @@ public static Error throwAsError(Throwable t) throws Error {
     }
   }
 
-  /**
-   * @param from
-   *          the source array
-   * @param methodName
-   *          the filter method
-   * @return a filtered array
-   */
-  public static Object[] extractArray(Object[] from, String methodName) {
-    try {
-      if (from == null || from.length == 0) {
-        return new Object[0];
-      }
-      Method method = getGreatestCommonDenominator(from, methodName);
-      Object[] array;
-      if (Object.class.isAssignableFrom(method.getReturnType())) {
-        array = (Object[]) Array.newInstance(method.getReturnType(),
-            from.length);
-      } else {
-        array = (Object[]) Array.newInstance(
-            ClassUtils.getWrapperClass(method.getReturnType()), from.length);
-      }
-      for (int i = 0; i < from.length; i++) {
-        array[i] = method.invoke(from[i], (Object[]) null);
-      }
-      return array;
-    } catch (Exception e) {
-      MySystem.warning(e);
-      throw ObjectUtils.throwAsError(e);
-    }
-  }
-
-  public static Method getGreatestCommonDenominator(Object[] from,
-      String methodName) throws SecurityException, NoSuchMethodException {
-    List<Class<?>> classes = new ArrayList<>();
-    ArrayUtils.addArray(classes, getAllCastableClasses(from[0]));
-    for (Object o : from) {
-      for (int i = classes.size() - 1; i >= 0; i--) {
-        Class clazz = classes.get(i);
-        if (!isThisInstanceOfThat(o.getClass(), clazz)
-            || !ClassUtils.hasMethod(clazz, methodName)) {
-          classes.remove(i);
-        }
-      }
-    }
-    return classes.size() == 0 ? null : ArrayUtils.getLast(classes).getMethod(
-        methodName, (Class[]) null);
-  }
-
-  private static Class[] getAllCastableClasses(Object object) {
-    Class<?> clazz = object.getClass();
-    ArrayList<Object> list = new ArrayList<>();
-    while (clazz != null) {
-      list.add(clazz);
-      ArrayUtils.addArray(list, clazz.getInterfaces());
-      clazz = clazz.getSuperclass();
-    }
-    Class[] found = list.toArray(new Class[list.size()]);
-    ArrayUtils.toReverseArray(found);
-    return found;
-  }
-
-  public static void assertInstance(Class classes[], Object object) {
-    if (object == null) {
-      throw new NullPointerException("Expected Object of Type "
-          + Arrays.asList(extractArray(classes, "getName")) + " but was null");
-    }
-    for (Class aClass : classes) {
-      if (ClassUtils.getWrapperClass(aClass).isInstance(object)) {
-        return;
-      }
-    }
-    throw new IllegalArgumentException("Expected Object of Type "
-        + Arrays.asList(extractArray(classes, "getName")) + " but got "
-        + object.getClass().getName());
-  }
-
   public static String getClassName(Object o) {
     return o == null ? "null" : o.getClass().getName();
   }
@@ -132,4 +50,4 @@ public static Image loadImage(Class<?> type, String name) {
     }
     return new ImageIcon(resource).getImage();
   }
-}
+}

src/main/java/org/teachingextensions/approvals/lite/util/ParserCommons.java

@@ -3,25 +3,25 @@
 import java.util.List;
 
 public class ParserCommons {
-    public static ParserCommons INSTANCE = new ParserCommons();
+  public static ParserCommons INSTANCE = new ParserCommons();
 
-    public static Class getClass(String clazz) throws ClassNotFoundException {
-        return Class.forName(clazz);
-    }
+  public static Class<?> getClass(String clazz) throws ClassNotFoundException {
+    return Class.forName(clazz);
+  }
 
-    public static Object getNull() {
-        return null;
-    }
+  public static Object getNull() {
+    return null;
+  }
 
-    public static int getArrayLength(Object[] array) {
-        return array == null ? 0 : array.length;
-    }
+  public static int getArrayLength(Object[] array) {
+    return array == null ? 0 : array.length;
+  }
 
-    public static Object get(Object[] array, int index) {
-        return getArrayLength(array) > index ? array[index] : null;
-    }
+  public static Object get(Object[] array, int index) {
+    return getArrayLength(array) > index ? array[index] : null;
+  }
 
-    public static Object get(List list, int index) {
-        return list == null ? null : list.get(index);
-    }
+  public static Object get(List<?> list, int index) {
+    return list == null ? null : list.get(index);
+  }
 }