From bf95959ae43ddd003936a01dfaecc612a438d4b5 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Mon, 15 Oct 2012 20:23:01 -0700
Subject: [PATCH] Move ExceptionWithContext to Util module

---
 .../main/java/org/jf/baksmali/Adaptors/MethodDefinition.java   | 2 +-
 dexlib/build.gradle                                            | 1 +
 .../src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java   | 2 +-
 dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java          | 1 +
 .../java/org/jf/dexlib/Code/Analysis/AnalyzedInstruction.java  | 2 +-
 .../src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java   | 2 +-
 .../main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java  | 2 +-
 .../java/org/jf/dexlib/Code/Analysis/ValidationException.java  | 2 +-
 .../src/main/java/org/jf/dexlib/Code/InstructionIterator.java  | 3 +--
 dexlib/src/main/java/org/jf/dexlib/CodeItem.java               | 1 +
 dexlib/src/main/java/org/jf/dexlib/DexFile.java                | 1 +
 dexlib/src/main/java/org/jf/dexlib/IndexedSection.java         | 2 +-
 dexlib/src/main/java/org/jf/dexlib/Item.java                   | 2 +-
 dexlib/src/main/java/org/jf/dexlib/ReadContext.java            | 2 +-
 .../main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java | 2 ++
 dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java    | 2 ++
 dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java   | 2 ++
 .../src/main/java/org/jf/util}/ExceptionWithContext.java       | 2 +-
 18 files changed, 21 insertions(+), 12 deletions(-)
 rename {dexlib/src/main/java/org/jf/dexlib/Util => util/src/main/java/org/jf/util}/ExceptionWithContext.java (99%)

diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
index 3e3796e4..6fac5985 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java
@@ -43,7 +43,7 @@ import org.jf.dexlib.Code.OffsetInstruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Debug.DebugInstructionIterator;
 import org.jf.dexlib.Util.AccessFlags;
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.SparseIntArray;
 
 import java.io.IOException;
diff --git a/dexlib/build.gradle b/dexlib/build.gradle
index e708d652..6c4fdcbb 100644
--- a/dexlib/build.gradle
+++ b/dexlib/build.gradle
@@ -30,6 +30,7 @@
  */
 
 dependencies {
+    compile project(':util')
     compile 'com.google.code.findbugs:jsr305:1.3.9'
     compile 'com.google.collections:google-collections:1.0'
 }
\ No newline at end of file
diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
index 3882b25d..56d60ead 100644
--- a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
@@ -30,7 +30,7 @@ package org.jf.dexlib;
 
 import com.google.common.base.Preconditions;
 import org.jf.dexlib.Util.AnnotatedOutput;
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.ReadOnlyArrayList;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
index 7afba479..afd3f889 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
@@ -30,6 +30,7 @@ package org.jf.dexlib;
 
 import com.google.common.base.Preconditions;
 import org.jf.dexlib.Util.*;
+import org.jf.util.ExceptionWithContext;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/AnalyzedInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/AnalyzedInstruction.java
index d73abd5a..a285b873 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/AnalyzedInstruction.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/AnalyzedInstruction.java
@@ -32,7 +32,7 @@ import org.jf.dexlib.Code.*;
 import org.jf.dexlib.Item;
 import org.jf.dexlib.ItemType;
 import org.jf.dexlib.MethodIdItem;
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 
 import java.util.*;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
index 2e398f68..9fdefe75 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java
@@ -30,7 +30,7 @@ package org.jf.dexlib.Code.Analysis;
 
 import org.jf.dexlib.*;
 import org.jf.dexlib.Util.AccessFlags;
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.SparseArray;
 
 import javax.annotation.Nonnull;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java
index 3f67d7f5..ddf7e5ff 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java
@@ -32,7 +32,7 @@ import org.jf.dexlib.*;
 import org.jf.dexlib.Code.*;
 import org.jf.dexlib.Code.Format.*;
 import org.jf.dexlib.Util.AccessFlags;
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.SparseArray;
 
 import java.util.BitSet;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ValidationException.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ValidationException.java
index 32c13cb4..dfc2174b 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ValidationException.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ValidationException.java
@@ -28,7 +28,7 @@
 
 package org.jf.dexlib.Code.Analysis;
 
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 
 public class ValidationException extends ExceptionWithContext {
     private int codeAddress;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java b/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java
index 142f5e27..bacb4366 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java
@@ -30,8 +30,7 @@ package org.jf.dexlib.Code;
 
 import org.jf.dexlib.Code.Format.*;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.ExceptionWithContext;
-import org.jf.dexlib.Util.Hex;
+import org.jf.util.ExceptionWithContext;
 
 public class InstructionIterator {
     public static void IterateInstructions(DexFile dexFile, byte[] insns, ProcessInstructionDelegate delegate) {
diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
index e56bfb58..54521be8 100644
--- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
@@ -33,6 +33,7 @@ import org.jf.dexlib.Code.*;
 import org.jf.dexlib.Debug.DebugInstructionIterator;
 import org.jf.dexlib.Debug.DebugOpcode;
 import org.jf.dexlib.Util.*;
+import org.jf.util.ExceptionWithContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/dexlib/src/main/java/org/jf/dexlib/DexFile.java b/dexlib/src/main/java/org/jf/dexlib/DexFile.java
index 80f25f87..24edef2a 100644
--- a/dexlib/src/main/java/org/jf/dexlib/DexFile.java
+++ b/dexlib/src/main/java/org/jf/dexlib/DexFile.java
@@ -29,6 +29,7 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.Util.*;
+import org.jf.util.ExceptionWithContext;
 
 import java.io.*;
 import java.security.DigestException;
diff --git a/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java b/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java
index 3bc80564..959fc786 100644
--- a/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java
+++ b/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java
@@ -28,7 +28,7 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.Input;
 
 public class IndexedSection<T extends Item> extends Section<T> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/Item.java b/dexlib/src/main/java/org/jf/dexlib/Item.java
index 98c23389..47f92565 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Item.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Item.java
@@ -31,7 +31,7 @@ package org.jf.dexlib;
 import com.google.common.base.Preconditions;
 import org.jf.dexlib.Util.AlignmentUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.Input;
 
 public abstract class Item<T extends Item> implements Comparable<T> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/ReadContext.java b/dexlib/src/main/java/org/jf/dexlib/ReadContext.java
index a25f3a27..0ee7587f 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ReadContext.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ReadContext.java
@@ -28,7 +28,7 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.util.ExceptionWithContext;
 import org.jf.dexlib.Util.SparseArray;
 
 import java.util.List;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java
index ae33cb0e..3313b091 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java
@@ -24,6 +24,8 @@
 
 package org.jf.dexlib.Util;
 
+import org.jf.util.ExceptionWithContext;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java
index e74a62ec..3829596c 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java
@@ -24,6 +24,8 @@
 
 package org.jf.dexlib.Util;
 
+import org.jf.util.ExceptionWithContext;
+
 /**
  * Implementation of {@link Input} which reads the data from a
  * <code>byte[]</code> instance.
diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java
index f2a1f709..bf7975b7 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java
@@ -24,6 +24,8 @@
 
 package org.jf.dexlib.Util;
 
+import org.jf.util.ExceptionWithContext;
+
 import java.util.ArrayList;
 
 /**
diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java b/util/src/main/java/org/jf/util/ExceptionWithContext.java
similarity index 99%
rename from dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java
rename to util/src/main/java/org/jf/util/ExceptionWithContext.java
index bc10edf1..10a4fc9c 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java
+++ b/util/src/main/java/org/jf/util/ExceptionWithContext.java
@@ -22,7 +22,7 @@
  * under the original license
  */
 
-package org.jf.dexlib.Util;
+package org.jf.util;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;