2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-07 00:38:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor some utility classes.

Browse Source
This commit is contained in:
Major-
2014-08-08 06:33:13 +01:00
parent 44b8972fb3
commit b58826aaaf
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/apollo/util/CompressionUtil.java
+8 -10
View File
@@ -14,7 +14,7 @@ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
/** /**
* A utility class for performing compression/uncompression. * A utility class for performing compression/decompression.
* *
* @author Graham * @author Graham
*/ */
@@ -56,10 +56,10 @@ public final class CompressionUtil {
} }
/** /**
* Unbzip2s the compressed array and places the result into the uncompressed array. * Unbzip2s the compressed array and places the result into the decompressed array.
* *
* @param compressed The compressed array. * @param compressed The compressed array.
* @param uncompressed The uncompressed array. * @param uncompressed The decompressed array.
* @throws IOException If an I/O error occurs. * @throws IOException If an I/O error occurs.
*/ */
public static void unbzip2(byte[] compressed, byte[] uncompressed) throws IOException { public static void unbzip2(byte[] compressed, byte[] uncompressed) throws IOException {
@@ -77,10 +77,10 @@ public final class CompressionUtil {
} }
/** /**
* Ungzips the compressed array and places the results into the uncompressed array. * Ungzips the compressed array and places the results into the decompressed array.
* *
* @param compressed The compressed array. * @param compressed The compressed array.
* @param uncompressed The uncompressed array. * @param uncompressed The decompressed array.
* @throws IOException If an I/O error occurs. * @throws IOException If an I/O error occurs.
*/ */
public static void ungzip(byte[] compressed, byte[] uncompressed) throws IOException { public static void ungzip(byte[] compressed, byte[] uncompressed) throws IOException {
@@ -93,15 +93,15 @@ public final class CompressionUtil {
* Ungzips the compressed buffer and places the results into the returning array. * Ungzips the compressed buffer and places the results into the returning array.
* *
* @param compressed The compressed buffer. * @param compressed The compressed buffer.
* @return The uncompressed array. * @return The decompressed array.
* @throws IOException If an I/O error occurs. * @throws IOException If an I/O error occurs.
*/ */
public static byte[] ungzip(ByteBuffer compressed) throws IOException { public static byte[] ungzip(ByteBuffer compressed) throws IOException {
byte[] data = new byte[compressed.remaining()]; byte[] data = new byte[compressed.remaining()];
compressed.get(data); compressed.get(data);
InputStream is = new GZIPInputStream(new ByteArrayInputStream(data));
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) { try (InputStream is = new GZIPInputStream(new ByteArrayInputStream(data));
ByteArrayOutputStream os = new ByteArrayOutputStream()) {
while (true) { while (true) {
byte[] buf = new byte[1024]; byte[] buf = new byte[1024];
int read = is.read(buf, 0, buf.length); int read = is.read(buf, 0, buf.length);
@@ -112,8 +112,6 @@ public final class CompressionUtil {
} }
return os.toByteArray(); return os.toByteArray();
} finally {
is.close();
} }
} }
src/org/apollo/util/TextUtil.java
+3 -3
View File
@@ -100,16 +100,16 @@ public final class TextUtil {
* @return The filtered string. * @return The filtered string.
*/ */
public static String filterInvalidCharacters(String str) { public static String filterInvalidCharacters(String str) {
StringBuilder bldr = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (char c : str.toLowerCase().toCharArray()) { for (char c : str.toLowerCase().toCharArray()) {
for (char validChar : FREQUENCY_ORDERED_CHARS) { for (char validChar : FREQUENCY_ORDERED_CHARS) {
if (c == validChar) { if (c == validChar) {
bldr.append((char) c); builder.append((char) c);
break; break;
} }
} }
} }
return bldr.toString(); return builder.toString();
} }
/** /**