Move all classes of DexComparator project into comparator package

- Replace also occured by occurred into all toolchains

Change-Id: I47e8fba64573509ea8372cfc5ddfae5639036c7a

26 files changed, 62 insertions, 49 deletions

diff --git a/dexcomparator/src/com/android/jack/DexAnnotationsComparator.java b/dexcomparator/src/com/android/jack/comparator/DexAnnotationsComparator.java
index 225bc08..8b1e87a 100644
--- a/dexcomparator/src/com/android/jack/DexAnnotationsComparator.java
+++ b/dexcomparator/src/com/android/jack/comparator/DexAnnotationsComparator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack;
+package com.android.jack.comparator;
 
 import com.android.jack.dx.rop.code.AccessFlags;
 
diff --git a/dexcomparator/src/com/android/jack/DexComparator.java b/dexcomparator/src/com/android/jack/comparator/DexComparator.java
index 5712f00..3dca7fe 100644
--- a/dexcomparator/src/com/android/jack/DexComparator.java
+++ b/dexcomparator/src/com/android/jack/comparator/DexComparator.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.android.jack;
+package com.android.jack.comparator;
 
-import com.android.jack.comparator.DebugInfo;
 import com.android.jack.comparator.DebugInfo.LocalVar;
 import com.android.jack.dx.dex.file.DebugInfoDecoder;
 import com.android.jack.dx.io.ClassData;
diff --git a/dexcomparator/src/com/android/jack/DexComparatorOptions.java b/dexcomparator/src/com/android/jack/comparator/DexComparatorOptions.java
index 30fc38a..bffd938 100644
--- a/dexcomparator/src/com/android/jack/DexComparatorOptions.java
+++ b/dexcomparator/src/com/android/jack/comparator/DexComparatorOptions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack;
+package com.android.jack.comparator;
 
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
diff --git a/dexcomparator/src/com/android/jack/DifferenceFoundException.java b/dexcomparator/src/com/android/jack/comparator/DifferenceFoundException.java
index 31736e8..944426c 100644
--- a/dexcomparator/src/com/android/jack/DifferenceFoundException.java
+++ b/dexcomparator/src/com/android/jack/comparator/DifferenceFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack;
+package com.android.jack.comparator;
 
 /**
  * Thrown while comparing two dex files when a difference is found.
diff --git a/dexcomparator/src/com/android/jack/util/BytesStreamSucker.java b/dexcomparator/src/com/android/jack/comparator/util/BytesStreamSucker.java
index e68a367..14d3f9c 100644
--- a/dexcomparator/src/com/android/jack/util/BytesStreamSucker.java
+++ b/dexcomparator/src/com/android/jack/comparator/util/BytesStreamSucker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.util;
+package com.android.jack.comparator.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/dexcomparator/src/com/android/jack/util/CharactersStreamSucker.java b/dexcomparator/src/com/android/jack/comparator/util/CharactersStreamSucker.java
index 16e63cf..c6602e5 100644
--- a/dexcomparator/src/com/android/jack/util/CharactersStreamSucker.java
+++ b/dexcomparator/src/com/android/jack/comparator/util/CharactersStreamSucker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.util;
+package com.android.jack.comparator.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/dexcomparator/src/com/android/jack/util/ExecuteFile.java b/dexcomparator/src/com/android/jack/comparator/util/ExecuteFile.java
index 869158d..c5b5ec3 100644
--- a/dexcomparator/src/com/android/jack/util/ExecuteFile.java
+++ b/dexcomparator/src/com/android/jack/comparator/util/ExecuteFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.jack.util;
+package com.android.jack.comparator.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java b/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java
index 9060077..83ab0ed 100644
--- a/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java
+++ b/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java
@@ -16,8 +16,8 @@
 
 package com.android.jack.dexcomparator.test;
 
-import com.android.jack.DexAnnotationsComparator;
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DexAnnotationsComparator;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java b/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java
index 62a39be..7c8c40f 100644
--- a/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java
+++ b/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java
@@ -16,8 +16,8 @@
 
 package com.android.jack.dexcomparator.test;
 
-import com.android.jack.DexComparator;
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DexComparator;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java b/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java
index adee09f..0c50f36 100644
--- a/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java
+++ b/dexcomparator/testing/com/android/jack/dexcomparator/test/TestTools.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.dexcomparator.test;
 
-import com.android.jack.util.ExecuteFile;
+import com.android.jack.comparator.util.ExecuteFile;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/jack-tests/src/com/android/jack/test/comparator/Comparator.java b/jack-tests/src/com/android/jack/test/comparator/Comparator.java
index 794a465..5df80f5 100644
--- a/jack-tests/src/com/android/jack/test/comparator/Comparator.java
+++ b/jack-tests/src/com/android/jack/test/comparator/Comparator.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 
 /**
  * Common interface for comparator.
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorComposite.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorComposite.java
index 438e78e..a3a0a46 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorComposite.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorComposite.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java
index ddfa3fd..bef67e9 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java
@@ -16,8 +16,8 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DexComparator;
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DexComparator;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java
index a72c319..adbcae8 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java
@@ -16,8 +16,8 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DexAnnotationsComparator;
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DexAnnotationsComparator;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java
index 9c44470..a9eff8d 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 import com.android.jack.test.util.ExecFileException;
 import com.android.jack.test.util.ExecuteFile;
 
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java
index 09e78af..c21fd0e 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 import com.android.jack.shrob.ListingComparator;
 
 import java.io.File;
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java
index 47dbe9d..1cfe72b 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.test.comparator;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 import com.android.jack.shrob.SeedsComparator;
 
 import java.io.File;
diff --git a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
index 13fc5bf..225e5aa 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java
@@ -489,7 +489,7 @@ public abstract class AbstractTestTools {
         throw new RuntimeException("Unzip exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running unzip", e);
+      throw new RuntimeException("An error occurred while running unzip", e);
     }
   }
 
@@ -506,7 +506,7 @@ public abstract class AbstractTestTools {
         throw new RuntimeException("Zip exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running zip", e);
+      throw new RuntimeException("An error occurred while running zip", e);
     }
   }
 
@@ -525,7 +525,7 @@ public abstract class AbstractTestTools {
         throw new RuntimeException("Jar exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running jar command", e);
+      throw new RuntimeException("An error occurred while running jar command", e);
     }
   }
 
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
index c68edda..b7ef689 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -20,7 +20,8 @@ import com.google.common.base.Joiner;
 
 import com.android.jack.Options;
 import com.android.jack.Options.VerbosityLevel;
-import com.android.jack.util.ExecuteFile;
+import com.android.jack.test.util.ExecFileException;
+import com.android.jack.test.util.ExecuteFile;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -91,10 +92,13 @@ public class JackCliToolchain extends JackBasedToolchain {
     exec.setOut(errRedirectStream);
     exec.setVerbose(isVerbose);
 
-    if (!exec.run()) {
-      throw new RuntimeException("Jack compiler exited with an error");
+    try {
+      if (exec.run() != 0) {
+        throw new RuntimeException("Jack compiler exited with an error");
+      }
+    } catch (ExecFileException e) {
+      throw new RuntimeException("An error occurred while running Jack", e);
     }
-
   }
 
   @Override
@@ -119,10 +123,13 @@ public class JackCliToolchain extends JackBasedToolchain {
     exec.setOut(errRedirectStream);
     exec.setVerbose(isVerbose);
 
-    if (!exec.run()) {
-      throw new RuntimeException("Jack compiler exited with an error");
+    try {
+      if (exec.run() != 0) {
+        throw new RuntimeException("Jack compiler exited with an error");
+      }
+    } catch (ExecFileException e) {
+      throw new RuntimeException("An error occurred while running Jack", e);
     }
-
   }
 
   private void srcToCommon(@Nonnull List<String> args, @Nonnull File... sources) {
@@ -198,8 +205,12 @@ public class JackCliToolchain extends JackBasedToolchain {
     exec.setOut(errRedirectStream);
     exec.setVerbose(isVerbose);
 
-    if (!exec.run()) {
-      throw new RuntimeException("Jack compiler exited with an error");
+    try {
+      if (exec.run() != 0) {
+        throw new RuntimeException("Jack compiler exited with an error");
+      }
+    } catch (ExecFileException e) {
+      throw new RuntimeException("An error occurred while running Jack", e);
     }
   }
 
@@ -221,10 +232,13 @@ public class JackCliToolchain extends JackBasedToolchain {
     exec.setOut(errRedirectStream);
     exec.setVerbose(isVerbose);
 
-    if (!exec.run()) {
-      throw new RuntimeException("Jack compiler exited with an error");
+    try {
+      if (exec.run() != 0) {
+        throw new RuntimeException("Jack compiler exited with an error");
+      }
+    } catch (ExecFileException e) {
+      throw new RuntimeException("An error occurred while running Jack", e);
     }
-
   }
 
   protected void libToCommon(@Nonnull List<String> args, @Nonnull String classpath,
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java
index 6660d02..e7086c2 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JillBasedToolchain.java
@@ -62,7 +62,7 @@ public abstract class JillBasedToolchain extends JackCliToolchain {
         throw new RuntimeException("Jill exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running Jill", e);
+      throw new RuntimeException("An error occurred while running Jill", e);
     }
   }
 
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
index 489ef52..be9667b 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
@@ -338,7 +338,7 @@ public class LegacyJillToolchain extends JillBasedToolchain {
         throw new RuntimeException("Reference compiler exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running reference compiler", e);
+      throw new RuntimeException("An error occurred while running reference compiler", e);
     }
   }
 
@@ -358,7 +358,7 @@ public class LegacyJillToolchain extends JillBasedToolchain {
         throw new RuntimeException("JarJar exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running Jarjar", e);
+      throw new RuntimeException("An error occurred while running Jarjar", e);
     }
   }
 
@@ -393,7 +393,7 @@ public class LegacyJillToolchain extends JillBasedToolchain {
         throw new RuntimeException("Proguard exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running Proguard", e);
+      throw new RuntimeException("An error occurred while running Proguard", e);
     }
   }
 
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
index 7a94bd8..2cc0538 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
@@ -172,7 +172,7 @@ public class LegacyToolchain extends AndroidToolchain {
         throw new RuntimeException("JarJar exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running Jarjar", e);
+      throw new RuntimeException("An error occurred while running Jarjar", e);
     }
   }
 
@@ -209,7 +209,7 @@ public class LegacyToolchain extends AndroidToolchain {
         throw new RuntimeException("Proguard exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running Proguard", e);
+      throw new RuntimeException("An error occurred while running Proguard", e);
     }
   }
 
@@ -317,7 +317,7 @@ public class LegacyToolchain extends AndroidToolchain {
         throw new RuntimeException("Reference compiler exited with an error");
       }
     } catch (ExecFileException e) {
-      throw new RuntimeException("An error occured while running reference compiler", e);
+      throw new RuntimeException("An error occurred while running reference compiler", e);
     }
   }
 
diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java
index 7448569..50c4936 100644
--- a/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java
+++ b/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java
@@ -16,13 +16,13 @@
 
 package com.android.jack.compile.androidtree.core;
 
-import com.android.jack.DexAnnotationsComparator;
-import com.android.jack.DexComparator;
 import com.android.jack.Options;
 import com.android.jack.TestTools;
 import com.android.jack.backend.dex.DexFileWriter;
 import com.android.jack.category.RedundantTests;
 import com.android.jack.category.SlowTests;
+import com.android.jack.comparator.DexAnnotationsComparator;
+import com.android.jack.comparator.DexComparator;
 import com.android.jack.config.id.JavaVersionPropertyId.JavaVersion;
 import com.android.jack.test.comparator.ComparatorDex;
 import com.android.jack.test.helper.CheckDexStructureTestHelper;
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
index 764448e..5b65a07 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
@@ -18,9 +18,9 @@ package com.android.jack.multidex;
 
 import com.google.common.io.Files;
 
-import com.android.jack.DifferenceFoundException;
 import com.android.jack.backend.dex.DexFileWriter;
 import com.android.jack.backend.dex.MultiDexLegacy;
+import com.android.jack.comparator.DifferenceFoundException;
 import com.android.jack.dx.io.ClassDef;
 import com.android.jack.dx.io.DexBuffer;
 import com.android.jack.library.FileType;
diff --git a/jack/tests/com/android/jack/shrob/ListingComparator.java b/jack/tests/com/android/jack/shrob/ListingComparator.java
index 917ca25..72e52c7 100644
--- a/jack/tests/com/android/jack/shrob/ListingComparator.java
+++ b/jack/tests/com/android/jack/shrob/ListingComparator.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.shrob;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/jack/tests/com/android/jack/shrob/SeedsComparator.java b/jack/tests/com/android/jack/shrob/SeedsComparator.java
index 7251604..b4b17ac 100644
--- a/jack/tests/com/android/jack/shrob/SeedsComparator.java
+++ b/jack/tests/com/android/jack/shrob/SeedsComparator.java
@@ -16,7 +16,7 @@
 
 package com.android.jack.shrob;
 
-import com.android.jack.DifferenceFoundException;
+import com.android.jack.comparator.DifferenceFoundException;
 
 import java.io.BufferedReader;
 import java.io.File;