From b21022d2078934212e079b4e6dd4707e6116bc39 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 17 Oct 2015 14:13:34 -0400
Subject: [PATCH] Merge gzip comp/decomp into one file

---
 .../java/net/runelite/cache/fs/util/GZip.java | 57 +++++++++++++++++++
 .../cache/fs/util/GZipCompressor.java         | 22 -------
 .../cache/fs/util/GZipDecompressor.java       | 27 ---------
 3 files changed, 57 insertions(+), 49 deletions(-)
 create mode 100644 src/main/java/net/runelite/cache/fs/util/GZip.java
 delete mode 100644 src/main/java/net/runelite/cache/fs/util/GZipCompressor.java
 delete mode 100644 src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java

diff --git a/src/main/java/net/runelite/cache/fs/util/GZip.java b/src/main/java/net/runelite/cache/fs/util/GZip.java
new file mode 100644
index 0000000000..7759c63702
--- /dev/null
+++ b/src/main/java/net/runelite/cache/fs/util/GZip.java
@@ -0,0 +1,57 @@
+package net.runelite.cache.fs.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
+import java.util.zip.Inflater;
+import net.runelite.cache.fs.io.Stream;
+
+public class GZip {
+	private static final Inflater inflaterInstance = new Inflater(true);
+
+	public static final byte[] compress(byte[] data)
+	{
+		ByteArrayOutputStream compressedBytes = new ByteArrayOutputStream();
+
+		try
+		{
+			GZIPOutputStream e = new GZIPOutputStream(compressedBytes);
+			e.write(data);
+			e.finish();
+			e.close();
+			return compressedBytes.toByteArray();
+		}
+		catch (IOException var3)
+		{
+			var3.printStackTrace();
+			return null;
+		}
+	}
+
+	public static final void decompress(Stream stream, byte[] data)
+	{
+		Inflater var2 = inflaterInstance;
+		synchronized (inflaterInstance)
+		{
+			if (stream.getBuffer()[stream.getOffset()] == 31 && stream.getBuffer()[stream.getOffset() + 1] == -117)
+			{
+				try
+				{
+					inflaterInstance.setInput(stream.getBuffer(), stream.getOffset() + 10, -stream.getOffset() - 18 + stream.getBuffer().length);
+					inflaterInstance.inflate(data);
+				}
+				catch (Exception var4)
+				{
+					inflaterInstance.reset();
+					data = (byte[]) null;
+				}
+
+				inflaterInstance.reset();
+			}
+			else
+			{
+				data = (byte[]) null;
+			}
+		}
+	}
+}
diff --git a/src/main/java/net/runelite/cache/fs/util/GZipCompressor.java b/src/main/java/net/runelite/cache/fs/util/GZipCompressor.java
deleted file mode 100644
index 256e1480d1..0000000000
--- a/src/main/java/net/runelite/cache/fs/util/GZipCompressor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package net.runelite.cache.fs.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.zip.GZIPOutputStream;
-
-public class GZipCompressor {
-   public static final byte[] compress(byte[] data) {
-      ByteArrayOutputStream compressedBytes = new ByteArrayOutputStream();
-
-      try {
-         GZIPOutputStream e = new GZIPOutputStream(compressedBytes);
-         e.write(data);
-         e.finish();
-         e.close();
-         return compressedBytes.toByteArray();
-      } catch (IOException var3) {
-         var3.printStackTrace();
-         return null;
-      }
-   }
-}
diff --git a/src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java b/src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java
deleted file mode 100644
index 03e8b6e20c..0000000000
--- a/src/main/java/net/runelite/cache/fs/util/GZipDecompressor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package net.runelite.cache.fs.util;
-
-import net.runelite.cache.fs.io.Stream;
-import java.util.zip.Inflater;
-
-public class GZipDecompressor {
-   private static final Inflater inflaterInstance = new Inflater(true);
-
-   public static final void decompress(Stream stream, byte[] data) {
-      Inflater var2 = inflaterInstance;
-      synchronized(inflaterInstance) {
-         if(stream.getBuffer()[stream.getOffset()] == 31 && stream.getBuffer()[stream.getOffset() + 1] == -117) {
-            try {
-               inflaterInstance.setInput(stream.getBuffer(), stream.getOffset() + 10, -stream.getOffset() - 18 + stream.getBuffer().length);
-               inflaterInstance.inflate(data);
-            } catch (Exception var4) {
-               inflaterInstance.reset();
-               data = (byte[])null;
-            }
-
-            inflaterInstance.reset();
-         } else {
-            data = (byte[])null;
-         }
-      }
-   }
-}