Merge from upstream

Author: jamesrcounts

src/jars/commons-collections-3.1.jar

@@ -14,7 +14,6 @@
 import org.teachingextensions.approvals.lite.writers.ApprovalTextWriter;
 import org.teachingextensions.approvals.lite.writers.ComponentApprovalWriter;
 import org.teachingextensions.approvals.lite.writers.ImageApprovalWriter;
-
 public class Approvals
 {
   public static void verify(String response) throws Exception

src/jars/log4j-1.2.9.jar

@@ -1,14 +1,15 @@
 package org.teachingextensions.approvals.lite;
 
+import java.io.File;
+import java.io.IOException;
+
 import junit.framework.TestCase;
+
 import org.teachingextensions.approvals.lite.namer.ApprovalNamer;
 import org.teachingextensions.approvals.lite.namer.NamerFactory;
 import org.teachingextensions.approvals.lite.util.ObjectUtils;
 import org.teachingextensions.approvals.lite.util.io.FileUtils;
 
-import java.io.File;
-import java.io.IOException;
-
 public class FileApprover implements ApprovalApprover {
     private File received;
     private File approved;

src/jars/servlet.jar

@@ -1,14 +1,19 @@
 package org.teachingextensions.approvals.lite;
 
-import org.teachingextensions.approvals.lite.reporters.*;
-import org.teachingextensions.approvals.lite.util.ClassUtils;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.teachingextensions.approvals.lite.reporters.DiffReporter;
+import org.teachingextensions.approvals.lite.reporters.FileLauncherReporter;
+import org.teachingextensions.approvals.lite.reporters.ImageReporter;
+import org.teachingextensions.approvals.lite.reporters.MultiReporter;
+import org.teachingextensions.approvals.lite.reporters.QuietReporter;
+import org.teachingextensions.approvals.lite.reporters.UseReporter;
+import org.teachingextensions.approvals.lite.util.ClassUtils;
+
 public class ReporterFactory {
     private static HashMap<String, Class<? extends ApprovalFailureReporter>> reporters = new HashMap<>();
 

src/jars/velocity-1.4-p1.jar

@@ -1,15 +1,16 @@
 package org.teachingextensions.approvals.lite.namer;
 
+import java.io.File;
+import java.lang.reflect.Method;
+
 import junit.framework.TestCase;
+
 import org.junit.Test;
 import org.teachingextensions.approvals.lite.util.ObjectUtils;
 import org.teachingextensions.approvals.lite.util.StackTraceReflectionResult;
 import org.teachingextensions.approvals.lite.util.TestUtils;
 import org.teachingextensions.approvals.lite.util.io.StackElementSelector;
 
-import java.io.File;
-import java.lang.reflect.Method;
-
 public class JUnitStackTraceNamer implements ApprovalNamer {
     private StackTraceReflectionResult info;
 

src/main/java/org/teachingextensions/approvals/lite/Approvals.java

@@ -1,11 +1,11 @@
 package org.teachingextensions.approvals.lite.reporters;
 
+import java.awt.GraphicsEnvironment;
+import java.io.File;
+
 import org.teachingextensions.approvals.lite.util.SystemUtils;
 import org.teachingextensions.approvals.lite.util.WindowUtils;
 
-import java.awt.*;
-import java.io.File;
-
 /**
  * A reporter which creates the command to accept the received
  * file as the approve file and copies it to the clipboard:<br>

src/main/java/org/teachingextensions/approvals/lite/FileApprover.java

@@ -1,10 +1,10 @@
 package org.teachingextensions.approvals.lite.reporters;
 
+import java.awt.GraphicsEnvironment;
+
 import org.teachingextensions.approvals.lite.util.StringUtils;
 import org.teachingextensions.approvals.lite.util.WindowUtils;
 
-import java.awt.*;
-
 /**
  * A reporter which creates the command to accept the received
  * file as the approve file and copies it to the clipboard:<br>