Move ExceptionWithContext to Util module

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;

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'
 }

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;
 

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;

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.*;
 

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;

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;

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;

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.util.ExceptionWithContext;
-import org.jf.dexlib.Util.Hex;
 
 public class InstructionIterator {
     public static void IterateInstructions(DexFile dexFile, byte[] insns, ProcessInstructionDelegate delegate) {

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;

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;

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> {

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> {

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;

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;

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.

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;
 
 /**

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;