Make handling of lifecyclecomponents more generic.

Change-Id: If5f4b2c140a40b768f0acb616b6c7ec15165dc1e
Reviewed-on: http://gerrit.dmdirc.com/3526
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/Main.java

@@ -27,12 +27,12 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ColourActionComparison;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.aliases.AliasLifecycleManager;
 import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
 import com.dmdirc.interfaces.CommandController.CommandDetails;
+import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;
@@ -84,7 +84,8 @@ public class Main {
     private final GlobalWindowManager globalWindowManager;
     /** The colour-based action comparisons. */
     private final ColourActionComparison colourActionComparison;
-    private final AliasLifecycleManager aliasLifecycleManager;
+    /** The set of known lifecycle components. */
+    private final Set<SystemLifecycleComponent> lifecycleComponents;
     /** The event bus to dispatch events on. */
     private final EventBus eventBus;
     /** The commands to load into the command manager. */
@@ -102,7 +103,7 @@ public class Main {
      * @param corePluginExtractor    Extractor to use for core plugins.
      * @param globalWindowManager    Global window manager to use.
      * @param colourActionComparison The colour-based action comparisons.
-     * @param aliasLifecycleManager  The alias lifecycle manager.
+     * @param lifecycleComponents    The set of known lifecycle components.
      * @param eventBus               The event bus to dispatch events on.
      * @param commands               The commands to be loaded into the command manager.
      */
@@ -117,7 +118,7 @@ public class Main {
             final CorePluginExtractor corePluginExtractor,
             final GlobalWindowManager globalWindowManager,
             final ColourActionComparison colourActionComparison,
-            final AliasLifecycleManager aliasLifecycleManager,
+            final Set<SystemLifecycleComponent> lifecycleComponents,
             final EventBus eventBus,
             final Set<CommandDetails> commands) {
         this.identityManager = identityManager;
@@ -129,7 +130,7 @@ public class Main {
         this.commandManager = commandManager;
         this.globalWindowManager = globalWindowManager;
         this.colourActionComparison = colourActionComparison;
-        this.aliasLifecycleManager = aliasLifecycleManager;
+        this.lifecycleComponents = lifecycleComponents;
         this.eventBus = eventBus;
         this.commands = commands;
     }
@@ -176,13 +177,19 @@ public class Main {
         commandLineParser.processArguments(serverManager);
 
         globalWindowManager.init();
-        aliasLifecycleManager.startUp();
+
+        for (SystemLifecycleComponent component : lifecycleComponents) {
+            component.startUp();
+        }
 
         Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
 
             @Override
             public void run() {
-                aliasLifecycleManager.shutDown();
+                for (SystemLifecycleComponent component : lifecycleComponents) {
+                    component.shutDown();
+                }
+
                 eventBus.post(new ClientClosedEvent());
                 serverManager.disconnectAll("Unexpected shutdown");
                 identityManager.saveAll();

src/com/dmdirc/commandparser/aliases/AliasesModule.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.commandparser.aliases;
 
+import com.dmdirc.interfaces.SystemLifecycleComponent;
+
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -39,4 +41,9 @@ public class AliasesModule {
         return store;
     }
 
+    @Provides(type = Provides.Type.SET)
+    public SystemLifecycleComponent getLifeycleComponent(final AliasLifecycleManager manager) {
+        return manager;
+    }
+
 }