adding reporters

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/ApprovalFailureReporter.java

@@ -0,0 +1,5 @@
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
+
+public interface ApprovalFailureReporter {
+    public void report(String received, String approved) throws Exception;
+}

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/ClipboardReporter.java

@@ -1,10 +1,10 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.awt.GraphicsEnvironment;
 import java.io.File;
 
-import org.teachingextensions.approvals.lite.util.SystemUtils;
-import org.teachingextensions.approvals.lite.util.WindowUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.SystemUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.WindowUtils;
 
 /**
  * A reporter which creates the command to accept the received

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/DelayedClipboardReporter.java

@@ -1,9 +1,9 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.awt.GraphicsEnvironment;
 
-import org.teachingextensions.approvals.lite.util.StringUtils;
-import org.teachingextensions.approvals.lite.util.WindowUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.SystemUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.WindowUtils;
 
 /**
  * A reporter which creates the command to accept the received

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/DiffReporter.java

@@ -1,7 +1,7 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
-import org.teachingextensions.approvals.lite.reporters.macosx.MacDiffReporter;
-import org.teachingextensions.approvals.lite.reporters.windows.WindowsDiffReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx.MacDiffReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows.WindowsDiffReporter;
 
 public class DiffReporter extends FirstWorkingReporter {
     public static final DiffReporter INSTANCE = new DiffReporter();

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/EnvironmentAwareReporter.java

@@ -1,6 +1,6 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
-import org.teachingextensions.approvals.lite.ApprovalFailureReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.ApprovalFailureReporter;
 
 public interface EnvironmentAwareReporter extends ApprovalFailureReporter {
     boolean isWorkingInThisEnvironment(String forFile);

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/FileLauncherReporter.java

@@ -1,9 +1,8 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
-
-import org.teachingextensions.approvals.lite.ApprovalFailureReporter;
-import org.teachingextensions.approvals.lite.util.TestUtils;
-import org.teachingextensions.approvals.lite.util.io.FileUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.ApprovalFailureReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.TestUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.io.FileUtils;
 
 public class FileLauncherReporter implements ApprovalFailureReporter {
     @Override

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/FirstWorkingReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 public class FirstWorkingReporter implements EnvironmentAwareReporter {
     private final EnvironmentAwareReporter[] reporters;

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/GenericDiffReporter.java

@@ -1,12 +1,12 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.teachingextensions.approvals.lite.util.ThreadUtils;
-import org.teachingextensions.approvals.lite.util.io.FileUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.ThreadUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.io.FileUtils;
 
 public class GenericDiffReporter implements EnvironmentAwareReporter {
     public static final String STANDARD_ARGUMENTS = "%s %s";

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/ImageReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import org.teachingextensions.approvals.lite.reporters.macosx.KaleidoscopeDiffReporter;
 import org.teachingextensions.approvals.lite.reporters.windows.BeyondCompareReporter;

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/ImageWebReporter.java

@@ -1,8 +1,8 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.awt.GraphicsEnvironment;
 
-import org.teachingextensions.approvals.lite.util.TestUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.general.TestUtils;
 
 public class ImageWebReporter implements EnvironmentAwareReporter {
     public static final ImageWebReporter INSTANCE = new ImageWebReporter();

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/JunitReporter.java

@@ -1,10 +1,10 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.io.File;
 
 import junit.framework.TestCase;
 
-import org.teachingextensions.approvals.lite.util.io.FileUtils;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.io.FileUtils;
 
 public class JunitReporter implements EnvironmentAwareReporter {
     public static final JunitReporter INSTANCE = new JunitReporter();

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/MultiReporter.java

@@ -1,9 +1,9 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.teachingextensions.approvals.lite.ApprovalFailureReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.ApprovalFailureReporter;
 
 public class MultiReporter implements ApprovalFailureReporter {
     private final Collection<ApprovalFailureReporter> reporters;

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/MultipleExceptions.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.util.ArrayList;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/QuietReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 public class QuietReporter implements EnvironmentAwareReporter {
     public static final QuietReporter INSTANCE = new QuietReporter();

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/UseReporter.java

@@ -1,9 +1,9 @@
-package org.teachingextensions.approvals.lite.reporters;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import org.teachingextensions.approvals.lite.ApprovalFailureReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.ApprovalFailureReporter;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface UseReporter {

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/BeyondCompareImageReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import java.text.MessageFormat;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/BeyondCompareReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import java.text.MessageFormat;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/DiffMergeReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import java.text.MessageFormat;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/KaleidoscopeDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import java.text.MessageFormat;
 import java.util.List;

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/MacDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import org.teachingextensions.approvals.lite.reporters.FirstWorkingReporter;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/P4MergeReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import java.text.MessageFormat;
 import java.util.List;

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/macosx/TkDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.macosx;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.macosx;
 
 import java.text.MessageFormat;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/windows/BeyondCompareReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.windows;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows;
 
 import java.text.MessageFormat;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/windows/TortoiseDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.windows;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows;
 
 import org.teachingextensions.approvals.lite.reporters.FirstWorkingReporter;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/windows/TortoiseImageDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.windows;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows;
 
 import org.teachingextensions.approvals.lite.reporters.GenericDiffReporter;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/windows/TortoiseTextDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.windows;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows;
 
 import java.text.MessageFormat;
 

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/windows/WinMergeReporter.java

@@ -1,8 +1,8 @@
-package org.teachingextensions.approvals.lite.reporters.windows;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows;
 
 import java.text.MessageFormat;
 
-import org.teachingextensions.approvals.lite.reporters.GenericDiffReporter;
+import src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.GenericDiffReporter;
 
 public class WinMergeReporter extends GenericDiffReporter {
     public static final WinMergeReporter INSTANCE = new WinMergeReporter();

TKPJava/src/main/java/org/teachingextentions/logo/utils/ApprovalUtils/reporters/windows/WindowsDiffReporter.java

@@ -1,4 +1,4 @@
-package org.teachingextensions.approvals.lite.reporters.windows;
+package src.main.java.org.teachingextentions.logo.utils.ApprovalUtils.reporters.windows;
 
 import org.teachingextensions.approvals.lite.reporters.FirstWorkingReporter;