From 00778842e61277360dca69f04b44fe53f5ef94e9 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 10 Jun 2016 17:42:53 -0400
Subject: [PATCH] Rename fs.util package to  util

---
 cache/src/main/java/net/runelite/cache/fs/DataFile.java   | 8 ++++----
 cache/src/main/java/net/runelite/cache/fs/Index.java      | 2 +-
 .../main/java/net/runelite/cache/{fs => }/util/BZip2.java | 2 +-
 .../net/runelite/cache/{fs => }/util/CRC32HGenerator.java | 2 +-
 .../main/java/net/runelite/cache/{fs => }/util/Djb2.java  | 2 +-
 .../main/java/net/runelite/cache/{fs => }/util/GZip.java  | 2 +-
 .../java/net/runelite/cache/{fs => }/util/Whirlpool.java  | 2 +-
 .../main/java/net/runelite/cache/{fs => }/util/Xtea.java  | 2 +-
 .../net/runelite/cache/{fs => }/util/WhirlpoolTest.java   | 3 ++-
 .../java/net/runelite/cache/{fs => }/util/XteaTest.java   | 3 ++-
 10 files changed, 15 insertions(+), 13 deletions(-)
 rename cache/src/main/java/net/runelite/cache/{fs => }/util/BZip2.java (99%)
 rename cache/src/main/java/net/runelite/cache/{fs => }/util/CRC32HGenerator.java (98%)
 rename cache/src/main/java/net/runelite/cache/{fs => }/util/Djb2.java (93%)
 rename cache/src/main/java/net/runelite/cache/{fs => }/util/GZip.java (98%)
 rename cache/src/main/java/net/runelite/cache/{fs => }/util/Whirlpool.java (98%)
 rename cache/src/main/java/net/runelite/cache/{fs => }/util/Xtea.java (99%)
 rename cache/src/test/java/net/runelite/cache/{fs => }/util/WhirlpoolTest.java (96%)
 rename cache/src/test/java/net/runelite/cache/{fs => }/util/XteaTest.java (95%)

diff --git a/cache/src/main/java/net/runelite/cache/fs/DataFile.java b/cache/src/main/java/net/runelite/cache/fs/DataFile.java
index 7b355e2822..f057c8d7de 100644
--- a/cache/src/main/java/net/runelite/cache/fs/DataFile.java
+++ b/cache/src/main/java/net/runelite/cache/fs/DataFile.java
@@ -36,12 +36,12 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
-import net.runelite.cache.fs.util.BZip2;
+import net.runelite.cache.util.BZip2;
 import net.runelite.cache.io.InputStream;
 import net.runelite.cache.io.OutputStream;
-import net.runelite.cache.fs.util.CRC32HGenerator;
-import net.runelite.cache.fs.util.GZip;
-import net.runelite.cache.fs.util.Whirlpool;
+import net.runelite.cache.util.CRC32HGenerator;
+import net.runelite.cache.util.GZip;
+import net.runelite.cache.util.Whirlpool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/cache/src/main/java/net/runelite/cache/fs/Index.java b/cache/src/main/java/net/runelite/cache/fs/Index.java
index cf6fa0f431..c5b7e98df7 100644
--- a/cache/src/main/java/net/runelite/cache/fs/Index.java
+++ b/cache/src/main/java/net/runelite/cache/fs/Index.java
@@ -37,7 +37,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import net.runelite.cache.fs.util.Djb2;
+import net.runelite.cache.util.Djb2;
 import net.runelite.cache.io.InputStream;
 import net.runelite.cache.io.OutputStream;
 import org.slf4j.Logger;
diff --git a/cache/src/main/java/net/runelite/cache/fs/util/BZip2.java b/cache/src/main/java/net/runelite/cache/util/BZip2.java
similarity index 99%
rename from cache/src/main/java/net/runelite/cache/fs/util/BZip2.java
rename to cache/src/main/java/net/runelite/cache/util/BZip2.java
index 318e71eaa3..1f9ed5cc26 100644
--- a/cache/src/main/java/net/runelite/cache/fs/util/BZip2.java
+++ b/cache/src/main/java/net/runelite/cache/util/BZip2.java
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/cache/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java b/cache/src/main/java/net/runelite/cache/util/CRC32HGenerator.java
similarity index 98%
rename from cache/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java
rename to cache/src/main/java/net/runelite/cache/util/CRC32HGenerator.java
index 130ff67055..d1cd9da582 100644
--- a/cache/src/main/java/net/runelite/cache/fs/util/CRC32HGenerator.java
+++ b/cache/src/main/java/net/runelite/cache/util/CRC32HGenerator.java
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
 import java.util.zip.CRC32;
 
diff --git a/cache/src/main/java/net/runelite/cache/fs/util/Djb2.java b/cache/src/main/java/net/runelite/cache/util/Djb2.java
similarity index 93%
rename from cache/src/main/java/net/runelite/cache/fs/util/Djb2.java
rename to cache/src/main/java/net/runelite/cache/util/Djb2.java
index 4cd490423a..e6ccc13e05 100644
--- a/cache/src/main/java/net/runelite/cache/fs/util/Djb2.java
+++ b/cache/src/main/java/net/runelite/cache/util/Djb2.java
@@ -1,4 +1,4 @@
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
 /**
  * An implementation of the {@code djb2} hash function.
diff --git a/cache/src/main/java/net/runelite/cache/fs/util/GZip.java b/cache/src/main/java/net/runelite/cache/util/GZip.java
similarity index 98%
rename from cache/src/main/java/net/runelite/cache/fs/util/GZip.java
rename to cache/src/main/java/net/runelite/cache/util/GZip.java
index 834fcb6fcb..3dddd34e6e 100644
--- a/cache/src/main/java/net/runelite/cache/fs/util/GZip.java
+++ b/cache/src/main/java/net/runelite/cache/util/GZip.java
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/cache/src/main/java/net/runelite/cache/fs/util/Whirlpool.java b/cache/src/main/java/net/runelite/cache/util/Whirlpool.java
similarity index 98%
rename from cache/src/main/java/net/runelite/cache/fs/util/Whirlpool.java
rename to cache/src/main/java/net/runelite/cache/util/Whirlpool.java
index ebfba7233a..ff7e92d132 100644
--- a/cache/src/main/java/net/runelite/cache/fs/util/Whirlpool.java
+++ b/cache/src/main/java/net/runelite/cache/util/Whirlpool.java
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/cache/src/main/java/net/runelite/cache/fs/util/Xtea.java b/cache/src/main/java/net/runelite/cache/util/Xtea.java
similarity index 99%
rename from cache/src/main/java/net/runelite/cache/fs/util/Xtea.java
rename to cache/src/main/java/net/runelite/cache/util/Xtea.java
index 93712bce96..9a150fafbe 100644
--- a/cache/src/main/java/net/runelite/cache/fs/util/Xtea.java
+++ b/cache/src/main/java/net/runelite/cache/util/Xtea.java
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
 import java.nio.ByteBuffer;
 import java.security.InvalidKeyException;
diff --git a/cache/src/test/java/net/runelite/cache/fs/util/WhirlpoolTest.java b/cache/src/test/java/net/runelite/cache/util/WhirlpoolTest.java
similarity index 96%
rename from cache/src/test/java/net/runelite/cache/fs/util/WhirlpoolTest.java
rename to cache/src/test/java/net/runelite/cache/util/WhirlpoolTest.java
index 96d8fd369f..8c83703efd 100644
--- a/cache/src/test/java/net/runelite/cache/fs/util/WhirlpoolTest.java
+++ b/cache/src/test/java/net/runelite/cache/util/WhirlpoolTest.java
@@ -27,8 +27,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
+import net.runelite.cache.util.Whirlpool;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/cache/src/test/java/net/runelite/cache/fs/util/XteaTest.java b/cache/src/test/java/net/runelite/cache/util/XteaTest.java
similarity index 95%
rename from cache/src/test/java/net/runelite/cache/fs/util/XteaTest.java
rename to cache/src/test/java/net/runelite/cache/util/XteaTest.java
index e569bc1c95..8c6c0a5e33 100644
--- a/cache/src/test/java/net/runelite/cache/fs/util/XteaTest.java
+++ b/cache/src/test/java/net/runelite/cache/util/XteaTest.java
@@ -27,8 +27,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.cache.fs.util;
+package net.runelite.cache.util;
 
+import net.runelite.cache.util.Xtea;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Random;