Pass in AliasWrapper to the AMD.

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

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

@@ -29,6 +29,7 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
 import com.dmdirc.addons.ui_swing.commands.Input;
@@ -170,6 +171,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** Perform wrapper. */
     @Getter
     private final PerformWrapper performWrapper;
+    /** Alias wrapper. */
+    @Getter
+    private final AliasWrapper aliasWrapper;
     /** Controller to use to close the application. */
     private final LifecycleController lifecycleController;
     /** Extractor to use for core plugins. */
@@ -195,6 +199,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @param lifecycleController Controller to use to close the application.
      * @param corePluginExtractor Extractor to use for core plugins.
      * @param performWrapper Perform wrapper to use for performs.
+     * @param aliasWrapper Alias wrapper to use for aliases.
      * @param themeManager Theme manager to use.
      * @param urlBuilder URL builder to use to resolve icons etc.
      */
@@ -210,6 +215,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final LifecycleController lifecycleController,
             final CorePluginExtractor corePluginExtractor,
             final PerformWrapper performWrapper,
+            final AliasWrapper aliasWrapper,
             final ThemeManager themeManager,
             final URLBuilder urlBuilder) {
         super(commandController);
@@ -223,6 +229,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.lifecycleController = lifecycleController;
         this.corePluginExtractor = corePluginExtractor;
         this.performWrapper = performWrapper;
+        this.aliasWrapper = aliasWrapper;
         this.themeManager = themeManager;
 
         globalConfig = identityManager.getGlobalConfiguration();

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -67,6 +67,8 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
     private static final long serialVersionUID = 3;
     /** Factory to use when creating aliases. */
     private final ActionFactory actionFactory;
+    /** Alias wrapper to retrieve aliases from. */
+    private final AliasWrapper aliasWrapper;
     /** Table scrollpane. */
     private JScrollPane scrollPane;
     /** Error table. */
@@ -94,6 +96,7 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
     public AliasManagerDialog(final SwingController controller) {
         super(controller, ModalityType.MODELESS);
 
+        this.aliasWrapper = controller.getAliasWrapper();
         this.actionFactory = controller.getActionFactory();
 
         setTitle("Alias manager");
@@ -176,7 +179,7 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
     private List<Alias> getTableData() {
         final List<Alias> aliases = new ArrayList<>();
 
-        for (Action loopAction : AliasWrapper.getAliasWrapper()) {
+        for (Action loopAction : aliasWrapper) {
             final List<ActionCondition> arguments = loopAction.getConditions();
 
             ActionCondition argument;
@@ -345,8 +348,7 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
 
     /** Saves the aliases. */
     private void save() {
-        final List<Action> actions =
-                AliasWrapper.getAliasWrapper().getActions();
+        final List<Action> actions = aliasWrapper.getActions();
         final List<Alias> aliases = tableModel.getAliases();
 
         final List<Alias> newAliases = new ArrayList<>();
@@ -415,8 +417,7 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
      * @return Corresponding action or null if none found
      */
     private Action getAction(final Alias alias) {
-        final List<Action> actions =
-                AliasWrapper.getAliasWrapper().getActions();
+        final List<Action> actions = aliasWrapper.getActions();
         Action action = null;
 
         for (Action loopAction : actions) {