Merge branch 'master' of https://github.com/DMDirc/Util into dev2

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

@@ -265,22 +265,6 @@ public class ConfigFile extends TextFile {
         return flatdomains.containsKey(domain);
     }
 
-    /**
-     * Adds a new flat domain to this config file.
-     *
-     * @param name The name of the domain to be added
-     * @param data The content of the domain
-     */
-    public void addDomain(final String name, final Collection<String> data) {
-        domains.add(name);
-
-        if (flatdomains.containsKey(name)) {
-            flatdomains.get(name).addAll(data);
-        } else {
-            flatdomains.put(name, new ArrayList<>(data));
-        }
-    }
-
     /**
      * Adds a new key domain to this config file.
      *

src/com/dmdirc/util/io/StreamIgnorer.java

@@ -27,6 +27,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import javax.annotation.WillClose;
+
 /**
  * Stream reader to read, but ignore a stream.
  */
@@ -38,9 +40,9 @@ class StreamIgnorer extends Thread {
     /**
      * Create a new Stream Ignorer that discards output.
      *
-     * @param stream The stream to ignore
+     * @param stream The stream to ignore, closed once {@link #run} is called.
      */
-    StreamIgnorer(final InputStream stream) {
+    StreamIgnorer(@WillClose final InputStream stream) {
         super("StreamIgnorer");
 
         this.stream = stream;

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

@@ -26,6 +26,8 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 
+import javax.annotation.WillClose;
+
 /**
  * Utilities for dealing with streams.
  *
@@ -37,7 +39,7 @@ public final class StreamUtils {
     private StreamUtils() {
     }
 
-    public static void readStream(final InputStream inputStream) {
+    public static void readStream(@WillClose final InputStream inputStream) {
         new StreamIgnorer(inputStream).run();
     }