From 28831eda06a4ac171492bb74b74cc64c9d5dd9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Mon, 9 May 2011 11:25:33 +0200
Subject: [PATCH] Moved ResValuesXmlSerializable to brut.androlib.res.xml
 package.

---
 .../src/main/java/brut/androlib/res/AndrolibResources.java      | 2 +-
 .../src/main/java/brut/androlib/res/data/ResPackage.java        | 2 +-
 .../main/java/brut/androlib/res/data/value/ResArrayValue.java   | 1 +
 .../src/main/java/brut/androlib/res/data/value/ResAttr.java     | 1 +
 .../src/main/java/brut/androlib/res/data/value/ResBagValue.java | 1 +
 .../src/main/java/brut/androlib/res/data/value/ResIdValue.java  | 1 +
 .../main/java/brut/androlib/res/data/value/ResPluralsValue.java | 1 +
 .../main/java/brut/androlib/res/data/value/ResScalarValue.java  | 1 +
 .../main/java/brut/androlib/res/data/value/ResStyleValue.java   | 1 +
 .../res/{data/value => xml}/ResValuesXmlSerializable.java       | 2 +-
 apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java | 2 +-
 11 files changed, 11 insertions(+), 4 deletions(-)
 rename apktool-lib/src/main/java/brut/androlib/res/{data/value => xml}/ResValuesXmlSerializable.java (96%)

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 84c442cd..86bda2c7 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
@@ -19,7 +19,7 @@ package brut.androlib.res;
 import brut.androlib.AndrolibException;
 import brut.androlib.err.CantFindFrameworkResException;
 import brut.androlib.res.data.*;
-import brut.androlib.res.data.value.ResValuesXmlSerializable;
+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;
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 1ba70f0b..958094b9 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
@@ -21,7 +21,7 @@ import brut.androlib.AndrolibException;
 import brut.androlib.res.data.value.ResFileValue;
 import brut.androlib.res.data.value.ResValue;
 import brut.androlib.res.data.value.ResValueFactory;
-import brut.androlib.res.data.value.ResValuesXmlSerializable;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.util.Duo;
 import java.util.*;
 
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 01eea5c9..b1bbe13b 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,6 +16,7 @@
 
 package brut.androlib.res.data.value;
 
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
 import brut.util.Duo;
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 23fc293b..449fe478 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,6 +16,7 @@
 
 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;
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 1aab532f..d377f34b 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,6 +16,7 @@
 
 package brut.androlib.res.data.value;
 
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
 import brut.util.Duo;
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 ca6196e2..ae91518a 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,6 +16,7 @@
 
 package brut.androlib.res.data.value;
 
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
 import java.io.IOException;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
index b127f74c..049c3d91 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResPluralsValue.java
@@ -16,6 +16,7 @@
 
 package brut.androlib.res.data.value;
 
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
 import brut.util.Duo;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
index 32d7b104..7d5092c9 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
@@ -16,6 +16,7 @@
 
 package brut.androlib.res.data.value;
 
+import brut.androlib.res.xml.ResValuesXmlSerializable;
 import brut.androlib.res.xml.ResXmlEncodable;
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
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 a8902ae4..864b7b8c 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,6 +16,7 @@
 
 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;
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValuesXmlSerializable.java b/apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java
similarity index 96%
rename from apktool-lib/src/main/java/brut/androlib/res/data/value/ResValuesXmlSerializable.java
rename to apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java
index 099f86de..00d6a0ca 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValuesXmlSerializable.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/xml/ResValuesXmlSerializable.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package brut.androlib.res.data.value;
+package brut.androlib.res.xml;
 
 import brut.androlib.AndrolibException;
 import brut.androlib.res.data.ResResource;
diff --git a/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java b/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
index be973365..18ed55f0 100644
--- a/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
+++ b/apktool-lib/src/test/java/brut/androlib/BuildAndDecodeTest.java
@@ -54,7 +54,7 @@ public class BuildAndDecodeTest {
 
     @AfterClass
     public static void afterClass() throws BrutException {
-        OS.rmdir(sTmpDir);
+        //OS.rmdir(sTmpDir);
     }
 
     @Test