Switch to AutoClose instead of StreamUtils.

Change-Id: I6af125efcbd20942f62774570aa670b40ee12538
Reviewed-on: http://gerrit.dmdirc.com/3793
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/identd/IdentClient.java

@@ -91,11 +91,8 @@ public class IdentClient implements Runnable {
     @Override
     public void run() {
         final Thread thisThread = Thread.currentThread();
-        PrintWriter out = null;
-        BufferedReader in = null;
-        try {
-            out = new PrintWriter(socket.getOutputStream(), true);
-            in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+        try (PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
+                BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
             final String inputLine;
             if ((inputLine = in.readLine()) != null) {
                 out.println(getIdentResponse(inputLine, config));
@@ -106,8 +103,6 @@ public class IdentClient implements Runnable {
                         "ClientSocket Error: " + e.getMessage(), ""));
             }
         } finally {
-            StreamUtils.close(in);
-            StreamUtils.close(out);
             StreamUtils.close(socket);
             server.delClient(this);
         }

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
@@ -41,11 +40,10 @@ import com.dmdirc.events.ClientFocusLostEvent;
 import com.dmdirc.events.ClientMinimisedEvent;
 import com.dmdirc.events.ClientUnminimisedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
+import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.interfaces.LifecycleController;
-import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.ListenerList;
@@ -73,8 +71,8 @@ import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 /**
  * The main application frame.
  */
-public class MainFrame extends JFrame implements WindowListener,
-        ConfigChangeListener, NotificationListener, ActiveFrameManager {
+public class MainFrame extends JFrame implements WindowListener, ConfigChangeListener,
+        ActiveFrameManager {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 9;
@@ -545,10 +543,6 @@ public class MainFrame extends JFrame implements WindowListener,
                 framePanel.setVisible(false);
                 framePanel.removeAll();
 
-                if (MainFrame.this.activeFrame != null) {
-                    MainFrame.this.activeFrame.getContainer()
-                            .removeNotificationListener(MainFrame.this);
-                }
                 MainFrame.this.activeFrame = activeFrame;
 
                 if (activeFrame == null) {
@@ -557,8 +551,6 @@ public class MainFrame extends JFrame implements WindowListener,
                 } else {
                     framePanel.add(activeFrame.getDisplayFrame(), "grow");
                     setTitle(activeFrame.getContainer().getTitle());
-                    activeFrame.getContainer().addNotificationListener(
-                            MainFrame.this);
                 }
 
                 framePanel.setVisible(true);
@@ -628,19 +620,13 @@ public class MainFrame extends JFrame implements WindowListener,
         }
     }
 
-    @Override
-    public void notificationSet(final FrameContainer window,
-            final Colour colour) {
-        if (activeFrame != null && activeFrame.getContainer().equals(window)) {
-            window.clearNotification();
+    @Handler
+    public void notificationSet(final NotificationSetEvent event) {
+        if (activeFrame != null && activeFrame.getContainer().equals(event.getWindow())) {
+            event.getWindow().clearNotification();
         }
     }
 
-    @Override
-    public void notificationCleared(final FrameContainer window) {
-        //Ignore
-    }
-
     @Override
     public void dispose() {
         if (!quitting) {