From df73d477aee334544ec179e98e688445038603c9 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sun, 26 Aug 2012 14:24:55 -0500
Subject: [PATCH] cleanup warnings to oraganize things

---
 apktool-lib/src/main/java/brut/androlib/Androlib.java          | 1 -
 apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java | 1 -
 .../src/main/java/brut/androlib/res/AndrolibResources.java     | 2 +-
 .../src/main/java/brut/androlib/res/data/ResPackage.java       | 2 +-
 .../src/main/java/brut/androlib/res/data/ResResSpec.java       | 3 +--
 .../main/java/brut/androlib/res/data/value/ResArrayValue.java  | 2 +-
 .../src/main/java/brut/androlib/res/data/value/ResAttr.java    | 2 +-
 .../main/java/brut/androlib/res/data/value/ResBagValue.java    | 2 +-
 .../src/main/java/brut/androlib/res/data/value/ResIdValue.java | 2 +-
 .../main/java/brut/androlib/res/data/value/ResStyleValue.java  | 2 +-
 .../java/brut/androlib/res/decoder/AXmlResourceParser.java     | 2 --
 .../src/main/java/brut/androlib/res/decoder/StringBlock.java   | 2 --
 .../java/brut/androlib/res/decoder/XmlPullStreamDecoder.java   | 1 -
 apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java | 1 -
 14 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/apktool-lib/src/main/java/brut/androlib/Androlib.java b/apktool-lib/src/main/java/brut/androlib/Androlib.java
index 314c8660..1aea2bf7 100644
--- a/apktool-lib/src/main/java/brut/androlib/Androlib.java
+++ b/apktool-lib/src/main/java/brut/androlib/Androlib.java
@@ -481,7 +481,6 @@ public class Androlib {
         for (int id : ids) {
             files[i++] = mAndRes.getFrameworkApk(id, tag);
         }
-
         return files;
     }
 
diff --git a/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java b/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java
index 2d76f40f..00c13a06 100644
--- a/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java
+++ b/apktool-lib/src/main/java/brut/androlib/ApktoolProperties.java
@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import java.util.logging.Logger;
-
 import org.jf.baksmali.baksmali;
 import org.jf.smali.main;
 
diff --git a/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
index 4534950e..0b0362d7 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
@@ -19,11 +19,11 @@ package brut.androlib.res;
 import brut.androlib.AndrolibException;
 import brut.androlib.err.CantFindFrameworkResException;
 import brut.androlib.res.data.*;
-import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.res.decoder.*;
 import brut.androlib.res.decoder.ARSCDecoder.ARSCData;
 import brut.androlib.res.decoder.ARSCDecoder.FlagsOffset;
 import brut.androlib.res.util.*;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.common.BrutException;
 import brut.directory.*;
 import brut.util.*;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
index ad36792c..025a1519 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
@@ -16,8 +16,8 @@
 
 package brut.androlib.res.data;
 
-import brut.androlib.err.UndefinedResObject;
 import brut.androlib.AndrolibException;
+import brut.androlib.err.UndefinedResObject;
 import brut.androlib.res.data.value.ResFileValue;
 import brut.androlib.res.data.value.ResValueFactory;
 import brut.androlib.res.xml.ResValuesXmlSerializable;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
index cb2b93b3..f39f561e 100755
--- a/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
@@ -18,9 +18,8 @@ package brut.androlib.res.data;
 
 import brut.androlib.AndrolibException;
 import brut.androlib.err.UndefinedResObject;
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.*;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Ryszard Wiśniewski <brut.alll@gmail.com>
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
index 294a9e2a..dd24cecd 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
@@ -16,9 +16,9 @@
 
 package brut.androlib.res.data.value;
 
-import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.util.Duo;
 import java.io.IOException;
 import org.xmlpull.v1.XmlSerializer;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java
index 449fe478..24282d31 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResAttr.java
@@ -16,10 +16,10 @@
 
 package brut.androlib.res.data.value;
 
-import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResPackage;
 import brut.androlib.res.data.ResResource;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.util.Duo;
 import java.io.IOException;
 import org.xmlpull.v1.XmlSerializer;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java
index d377f34b..f8bdeed8 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResBagValue.java
@@ -16,9 +16,9 @@
 
 package brut.androlib.res.data.value;
 
-import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.util.Duo;
 import java.io.IOException;
 import org.xmlpull.v1.XmlSerializer;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java
index ae91518a..cb08ae89 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResIdValue.java
@@ -16,9 +16,9 @@
 
 package brut.androlib.res.data.value;
 
-import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import java.io.IOException;
 import org.xmlpull.v1.XmlSerializer;
 
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
index 864b7b8c..99331f95 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java
@@ -16,10 +16,10 @@
 
 package brut.androlib.res.data.value;
 
-import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResSpec;
 import brut.androlib.res.data.ResResource;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.util.Duo;
 import java.io.IOException;
 import org.xmlpull.v1.XmlSerializer;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
index 60f2c1a5..91197bcf 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
@@ -21,8 +21,6 @@ import brut.androlib.AndrolibException;
 import brut.androlib.res.xml.ResXmlEncoders;
 import brut.util.ExtDataInput;
 import com.mindprod.ledatastream.LEDataInputStream;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java
index f2e5024f..36ecda52 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/decoder/StringBlock.java
@@ -16,13 +16,11 @@
 
 package brut.androlib.res.decoder;
 
-import brut.androlib.res.AndrolibResources;
 import brut.androlib.res.xml.ResXmlEncoders;
 import brut.util.ExtDataInput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.*;
-import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java b/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java
index cca8ad90..073c343e 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/decoder/XmlPullStreamDecoder.java
@@ -20,7 +20,6 @@ import brut.androlib.AndrolibException;
 import brut.androlib.res.util.ExtXmlSerializer;
 import java.io.*;
 import java.util.logging.Logger;
-
 import org.xmlpull.v1.*;
 import org.xmlpull.v1.wrapper.*;
 
diff --git a/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java b/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java
index 86c89366..fafd9448 100644
--- a/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java
+++ b/apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java
@@ -21,7 +21,6 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.jf.dexlib.Code.Analysis.RegisterType;
-import org.jf.dexlib.Code.Opcode;
 
 /**
  * @author Ryszard Wiśniewski <brut.alll@gmail.com>