Tidy up util classes

Change-Id: I6d0665e57f6e0e2ff2fb6a18742acb99010e79bf
Depends-On: I0bfd2dc61096dd9670b269463c27d9b00fd9a917
Depends-On: Ia8de3c1a5fdc1eb9cfaa8b29a32bb3efb6d8ce6f
Reviewed-on: http://gerrit.dmdirc.com/2240
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/util/DoubleMap.java → src/com/dmdirc/util/collections/DoubleMap.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;

src/com/dmdirc/util/EquatableWeakReference.java → src/com/dmdirc/util/collections/EquatableWeakReference.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;

src/com/dmdirc/util/ListObserver.java → src/com/dmdirc/util/collections/ListObserver.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 /**
  * Interface for objects interested in being updated about changes to an

src/com/dmdirc/util/ListenerList.java → src/com/dmdirc/util/collections/ListenerList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;

src/com/dmdirc/util/MapList.java → src/com/dmdirc/util/collections/MapList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/com/dmdirc/util/ObservableList.java → src/com/dmdirc/util/collections/ObservableList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.List;
 

src/com/dmdirc/util/ObservableListDecorator.java → src/com/dmdirc/util/collections/ObservableListDecorator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.Collection;
 import java.util.Iterator;

src/com/dmdirc/util/QueuedLinkedHashSet.java → src/com/dmdirc/util/collections/QueuedLinkedHashSet.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.Iterator;
 import java.util.LinkedHashSet;

src/com/dmdirc/util/RollingList.java → src/com/dmdirc/util/collections/RollingList.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.ArrayList;
 import java.util.List;

src/com/dmdirc/util/WeakList.java → src/com/dmdirc/util/collections/WeakList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

src/com/dmdirc/util/WeakMapList.java → src/com/dmdirc/util/collections/WeakMapList.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
 import java.util.List;
 

src/com/dmdirc/util/ConfigFile.java → src/com/dmdirc/util/io/ConfigFile.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
+import com.dmdirc.util.collections.MapList;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

src/com/dmdirc/util/DownloadListener.java → src/com/dmdirc/util/io/DownloadListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 /**
  * Defines the method that objects interested in receiving download progress

src/com/dmdirc/util/Downloader.java → src/com/dmdirc/util/io/Downloader.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -91,7 +91,7 @@ public final class Downloader {
                 }
             } while (line != null);
         } finally {
-            StreamUtil.close(in);
+            StreamUtils.close(in);
         }
 
         return res;
@@ -175,8 +175,8 @@ public final class Downloader {
                 }
             } while (count > 0);
         } finally {
-            StreamUtil.close(input);
-            StreamUtil.close(output);
+            StreamUtils.close(input);
+            StreamUtils.close(output);
         }
     }
 
@@ -211,7 +211,7 @@ public final class Downloader {
                 out.writeBytes(postData);
                 out.flush();
             } finally {
-                StreamUtil.close(out);
+                StreamUtils.close(out);
             }
         }
 

src/com/dmdirc/util/InvalidConfigFileException.java → src/com/dmdirc/util/io/InvalidConfigFileException.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 /**
  * Thrown to indicate that a config file is invalid.

src/com/dmdirc/util/StreamReader.java → src/com/dmdirc/util/io/StreamReader.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -106,7 +106,7 @@ public class StreamReader extends Thread {
         } catch (IOException ex) {
             // OH WELL
         } finally {
-            StreamUtil.close(stream);
+            StreamUtils.close(stream);
         }
     }
 }

src/com/dmdirc/util/StreamUtil.java → src/com/dmdirc/util/io/StreamUtils.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -30,10 +30,10 @@ import java.io.IOException;
  *
  * @since 0.6.3m2
  */
-public final class StreamUtil {
+public final class StreamUtils {
 
     /** Shouldn't be called. */
-    private StreamUtil() {
+    private StreamUtils() {
         super();
     }
 

src/com/dmdirc/util/TextFile.java → src/com/dmdirc/util/io/TextFile.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -141,9 +141,9 @@ public class TextFile {
                 lines.add(line);
             }
         } finally {
-            StreamUtil.close(reader);
-            StreamUtil.close(inputReader);
-            StreamUtil.close(inputStream);
+            StreamUtils.close(reader);
+            StreamUtils.close(inputReader);
+            StreamUtils.close(inputStream);
         }
     }
 
@@ -178,7 +178,7 @@ public class TextFile {
                 writer.newLine();
             }
         } finally {
-            StreamUtil.close(writer);
+            StreamUtils.close(writer);
         }
     }
 

test/com/dmdirc/util/DoubleMapTest.java → test/com/dmdirc/util/collections/DoubleMapTest.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.collections.DoubleMap;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/EquatableWeakReferenceTest.java → test/com/dmdirc/util/collections/EquatableWeakReferenceTest.java

@@ -19,8 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.collections.EquatableWeakReference;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import org.junit.Test;

test/com/dmdirc/util/InvalidConfigFileExceptionTest.java → test/com/dmdirc/util/collections/InvalidConfigFileExceptionTest.java

@@ -19,8 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.io.InvalidConfigFileException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/MapListTest.java → test/com/dmdirc/util/collections/MapListTest.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.collections.MapList;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;

test/com/dmdirc/util/ObservableListDecoratorTest.java → test/com/dmdirc/util/collections/ObservableListDecoratorTest.java

@@ -20,8 +20,11 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.collections.ObservableListDecorator;
+import com.dmdirc.util.collections.ObservableList;
+import com.dmdirc.util.collections.ListObserver;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;

test/com/dmdirc/util/RollingListTest.java → test/com/dmdirc/util/collections/RollingListTest.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.collections.RollingList;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/WeakListTest.java → test/com/dmdirc/util/collections/WeakListTest.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.collections;
 
+import com.dmdirc.util.collections.WeakList;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/util/ConfigFileTest.java → test/com/dmdirc/util/io/ConfigFileTest.java

@@ -21,7 +21,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 import java.io.File;
 import java.io.IOException;

test/com/dmdirc/util/TextFileTest.java → test/com/dmdirc/util/io/TextFileTest.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.util;
+package com.dmdirc.util.io;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,8 +37,7 @@ public class TextFileTest {
     @Test
     public void testGetLines() throws IOException {
         final TextFile file =
-                new TextFile(getClass().getClassLoader().
-                getResource("com/dmdirc/util/test1.txt").openStream());
+                new TextFile(getClass().getResourceAsStream("test1.txt"));
         final List<String> lines = file.getLines();
 
         assertEquals(7, lines.size());
@@ -48,8 +47,7 @@ public class TextFileTest {
     @Test
     public void testGetLines2() throws IOException {
         final TextFile file =
-                new TextFile(getClass().getClassLoader().
-                getResource("com/dmdirc/util/test1.txt").openStream());
+                new TextFile(getClass().getResourceAsStream("test1.txt"));
         final List<String> lines = file.getLines();
 
         assertEquals(7, lines.size());
@@ -76,8 +74,7 @@ public class TextFileTest {
     @Test(expected=UnsupportedOperationException.class)
     public void testIllegalWrite() throws IOException {
         final TextFile file =
-                new TextFile(getClass().getClassLoader().
-                getResource("com/dmdirc/util/test1.txt").openStream());
+                new TextFile(getClass().getResourceAsStream("test1.txt"));
         file.writeLines(Arrays.asList(new String[]{
             "hello", "this is a test", "meep"
         }));
@@ -86,8 +83,7 @@ public class TextFileTest {
     @Test(expected=UnsupportedOperationException.class)
     public void testIllegalDelete() throws IOException {
         final TextFile file =
-                new TextFile(getClass().getClassLoader().
-                getResource("com/dmdirc/util/test1.txt").openStream());
+                new TextFile(getClass().getResourceAsStream("test1.txt"));
         file.delete();
     }