Remove some silly AliasWrapper deps.

Don't manually iterate servers and look up the global window,
instead just use the WindowManager to find writable root windows.

This also fixes a bug whereby aliases were never removed from
the global window.

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

src/com/dmdirc/ClientModule.java

@@ -348,15 +348,15 @@ public class ClientModule {
      * Gets the alias actions wrapper.
      *
      * @param commandController The controller to register commands with
-     * @param serverManager The manager to use to iterate servers.
+     * @param windowManager The manager to use to iterate windows.
      * @return An alias wrapper to use in the client.
      */
     @Provides
     @Singleton
     public AliasWrapper getAliasWrapper(
             final CommandController commandController,
-            final ServerManager serverManager) {
-        final AliasWrapper wrapper = new AliasWrapper(commandController, serverManager);
+            final WindowManager windowManager) {
+        final AliasWrapper wrapper = new AliasWrapper(commandController, windowManager);
         AliasWrapper.setAliasWrapper(wrapper);
         return wrapper;
     }

src/com/dmdirc/GlobalWindow.java

@@ -51,7 +51,6 @@ import lombok.Getter;
 public class GlobalWindow extends WritableFrameContainer {
 
     /** The global window that's in use, if any. */
-    @Getter
     private static GlobalWindow globalWindow;
 
     /** The tab completer we use. */

src/com/dmdirc/actions/wrappers/AliasWrapper.java

@@ -22,9 +22,8 @@
 
 package com.dmdirc.actions.wrappers;
 
-import com.dmdirc.GlobalWindow;
-import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionGroup;
@@ -32,6 +31,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompletionType;
 
 import java.util.ArrayList;
@@ -52,24 +52,28 @@ public class AliasWrapper extends ActionGroup {
     private final CommandController commandController;
 
     /** Server Manager. */
-    private final ServerManager serverManager;
+    private final WindowManager windowManager;
 
     /**
      * Creates a new instance of AliasWrapper.
      *
      * @param commandController Command controller to get command info from.
+     * @param windowManager The window manager to use to find root windows.
      */
-    public AliasWrapper(final CommandController commandController, final ServerManager serverManager) {
+    public AliasWrapper(
+            final CommandController commandController,
+            final WindowManager windowManager) {
         super("aliases");
 
         this.commandController = commandController;
-        this.serverManager = serverManager;
+        this.windowManager = windowManager;
     }
 
     /**
      * Retrieves a singleton instance of this alias wrapper.
      *
      * @return A singleton instance of AliasWrapper
+     * @deprecated Global state is bad.
      */
     @Deprecated
     public static AliasWrapper getAliasWrapper() {
@@ -80,6 +84,7 @@ public class AliasWrapper extends ActionGroup {
      * Sets the alias wrapper that will be used as a singleton instance.
      *
      * @param wrapper The wrapper to use as a singleton.
+     * @deprecated Global state is bad.
      */
     @Deprecated
     public static void setAliasWrapper(final AliasWrapper wrapper) {
@@ -106,13 +111,11 @@ public class AliasWrapper extends ActionGroup {
                 super.add(action);
                 aliases.add(commandName);
 
-                if (GlobalWindow.getGlobalWindow() != null) {
-                    GlobalWindow.getGlobalWindow().getTabCompleter()
-                            .addEntry(TabCompletionType.COMMAND, commandName);
-                }
-
-                for (Server server : serverManager.getServers()) {
-                    server.getTabCompleter().addEntry(TabCompletionType.COMMAND, commandName);
+                for (FrameContainer root : windowManager.getRootWindows()) {
+                    if (root instanceof WritableFrameContainer) {
+                        ((WritableFrameContainer) root).getTabCompleter()
+                                .addEntry(TabCompletionType.COMMAND, commandName);
+                    }
                 }
             } else {
                 Logger.userError(ErrorLevel.MEDIUM, "Invalid alias action (no name): "
@@ -134,8 +137,11 @@ public class AliasWrapper extends ActionGroup {
 
             aliases.remove(commandName);
 
-            for (Server server : serverManager.getServers()) {
-                server.getTabCompleter().removeEntry(TabCompletionType.COMMAND, commandName);
+            for (FrameContainer root : windowManager.getRootWindows()) {
+                if (root instanceof WritableFrameContainer) {
+                    ((WritableFrameContainer) root).getTabCompleter()
+                            .removeEntry(TabCompletionType.COMMAND, commandName);
+                }
             }
         }
     }

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.actions.wrappers;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
@@ -32,6 +31,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.WindowManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,7 +51,7 @@ public class AliasWrapperTest {
 
     @Mock private Action action;
     @Mock private ActionCondition condition;
-    @Mock private ServerManager serverManager;
+    @Mock private WindowManager windowManager;
     @Mock private CommandController commandController;
     private List<ActionCondition> conditions;
 
@@ -68,7 +68,7 @@ public class AliasWrapperTest {
         when(commandController.getCommandChar()).thenReturn('!');
 
         conditions = new ArrayList<>();
-        aliasWrapper = new AliasWrapper(commandController, serverManager);
+        aliasWrapper = new AliasWrapper(commandController, windowManager);
 
         when(condition.getArg()).thenReturn(1);
         when(condition.getComparison()).thenReturn(CoreActionComparison.STRING_EQUALS);