Move aliases DI code into its own module.

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

src/com/dmdirc/ClientModule.java

@@ -32,8 +32,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.aliases.AliasStore;
-import com.dmdirc.commandparser.aliases.YamlAliasStore;
+import com.dmdirc.commandparser.aliases.AliasesModule;
 import com.dmdirc.commandparser.commands.CommandModule;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
@@ -87,7 +86,12 @@ import dagger.Provides;
  */
 @Module(
         injects = {Main.class, CommandLineParser.class},
-        includes = {CommandLineOptionsModule.class, CommandModule.class, UpdaterModule.class},
+        includes = {
+            AliasesModule.class,
+            CommandLineOptionsModule.class,
+            CommandModule.class,
+            UpdaterModule.class
+        },
         library = true)
 public class ClientModule {
 
@@ -129,8 +133,7 @@ public class ClientModule {
         }
 
         if (commandLineParser.getDisableReporting()) {
-            identityManager.getUserSettings()
-                    .setOption("temp", "noerrorreporting", true);
+            identityManager.getUserSettings().setOption("temp", "noerrorreporting", true);
         }
 
         return identityManager;
@@ -306,12 +309,6 @@ public class ClientModule {
         return new EventBus();
     }
 
-    @Provides
-    @Singleton
-    public AliasStore getAliasStore(final YamlAliasStore store) {
-        return store;
-    }
-
     /**
      * Sets the object graph that will be injected. Must be called before any provider method.
      *

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.commandparser.aliases;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger module for aliases.
+ */
+@Module(library = true, complete = false)
+public class AliasesModule {
+
+    @Provides
+    @Singleton
+    public AliasStore getAliasStore(final YamlAliasStore store) {
+        return store;
+    }
+
+}