Make WhoisNumericFormatter a bit more sane.

Implement SystemLifecycleComponent instead of making the
ActionManager create one and forget about it...

src/com/dmdirc/ClientModule.java

@@ -38,6 +38,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConnectionFactory;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginModule;
@@ -45,6 +46,7 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.UiMessagesModule;
+import com.dmdirc.ui.messages.WhoisNumericFormatter;
 import com.dmdirc.ui.messages.sink.MessagesModule;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdaterModule;
@@ -188,4 +190,10 @@ public class ClientModule {
         return objectGraph;
     }
 
+    @Provides(type = Provides.Type.SET)
+    public SystemLifecycleComponent getWhoisNumericFormatter(
+            final WhoisNumericFormatter formatter) {
+        return formatter;
+    }
+
 }

src/com/dmdirc/actions/ActionManager.java

@@ -24,7 +24,6 @@ package com.dmdirc.actions;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
-import com.dmdirc.ui.messages.WhoisNumericFormatter;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.ConfigBinding;
@@ -144,8 +143,6 @@ public class ActionManager implements ActionController {
         registerComparisons(colourComparisons.getComparisons());
         registerComponents(CoreActionComponent.values());
 
-        new WhoisNumericFormatter(identityManager.getAddonSettings(), eventBus).register();
-
         eventBus.subscribe(this);
     }
 

src/com/dmdirc/ui/messages/WhoisNumericFormatter.java

@@ -22,26 +22,29 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.ClientModule;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Listener;
-import net.engio.mbassy.listener.References;
 
 /**
  * Listens for whois-like numeric events and automatically formats them.
  *
  * @since 0.6.3
  */
-@Listener(references = References.Strong)
-public class WhoisNumericFormatter {
+@Singleton
+public class WhoisNumericFormatter implements SystemLifecycleComponent {
 
     /** The name of the target of any current whois requests. */
     private final Map<Connection, String> targets = new HashMap<>();
@@ -57,19 +60,14 @@ public class WhoisNumericFormatter {
      * @param identity The identity to write formatters to
      * @param eventBus The event bus to subscribe to events on
      */
-    public WhoisNumericFormatter(final ConfigProvider identity,
+    @Inject
+    public WhoisNumericFormatter(
+            @ClientModule.AddonConfig final ConfigProvider identity,
             final DMDircMBassador eventBus) {
         this.identity = identity;
         this.eventBus = eventBus;
     }
 
-    /**
-     * Registers this this whois numeric formatter with the global actions manager.
-     */
-    public void register() {
-        eventBus.subscribe(this);
-    }
-
     /**
      * Handles a server disconnected event. This clears any entry for that server in the
      * {@link #targets} map.
@@ -107,17 +105,17 @@ public class WhoisNumericFormatter {
                         && arguments[3].equals(targets.get(server))) {
                     // This numeric should be automatically formatted.
 
-                    if (!event.getDisplayFormat().isEmpty()) {
-                        // There's a custom format. We'll see if we need to
-                        // add a formatter or notification settings for it
-                        // anyway.
-                        ensureExists(event.getDisplayFormat(), arguments.length);
-                    } else {
+                    if (event.getDisplayFormat().isEmpty()) {
                         // No custom formatter, switch it to an auto whois
                         // format and target.
                         final String target = "numeric_autowhois_" + (arguments.length - 4);
                         ensureExists(target, arguments.length);
                         event.setDisplayFormat(target);
+                    } else {
+                        // There's a custom format. We'll see if we need to
+                        // add a formatter or notification settings for it
+                        // anyway.
+                        ensureExists(event.getDisplayFormat(), arguments.length);
                     }
                 }
                 break;
@@ -147,4 +145,13 @@ public class WhoisNumericFormatter {
         }
     }
 
+    @Override
+    public void startUp() {
+        eventBus.subscribe(this);
+    }
+
+    @Override
+    public void shutDown() {
+        eventBus.unsubscribe(this);
+    }
 }