Fix fallout from WindowManager changes

Change-Id: Ia9b45bc4ff7f17af9e1eed758c0a659f6ab47251
Depends-On: I4f8df35efbb7ce266d6e8b1239c646a0a9c92107
Reviewed-on: http://gerrit.dmdirc.com/1988
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -62,7 +62,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
         nickname = nick;
         otherNickname = targetNick;
 
-        WindowManager.addWindow(plugin.getContainer(), this);
+        WindowManager.getWindowManager().addWindow(plugin.getContainer(), this);
     }
 
     /**

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -605,7 +605,7 @@ public final class DCCPlugin extends BasePlugin implements ActionListener {
      */
     protected void createContainer() {
         container = new PlaceholderContainer(this);
-        WindowManager.addWindow(container);
+        WindowManager.getWindowManager().addWindow(container);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -110,7 +110,7 @@ public class TransferContainer extends FrameContainer implements
 
         otherNickname = targetNick;
 
-        WindowManager.addWindow(plugin.getContainer(), this);
+        WindowManager.getWindowManager().addWindow(plugin.getContainer(), this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -49,7 +49,7 @@ public class HistoryWindow extends FrameContainer {
         super("raw", title, title, Window.class, parent.getConfigManager(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
-        WindowManager.addWindow(parent, this);
+        WindowManager.getWindowManager().addWindow(parent, this);
 
         final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
                 "ui", "frameBufferSize");

src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -60,7 +60,7 @@ public class DebugWindow extends FrameContainer {
         this.parser = parser;
         this.server = server;
 
-        WindowManager.addWindow(server, this);
+        WindowManager.getWindowManager().addWindow(server, this);
     }
 
     /**

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

@@ -491,14 +491,14 @@ public class SwingController extends BasePlugin implements UIController {
                     "Main frame not created. Unable to continue.");
         }
 
-        WindowManager.addAndExecuteFrameListener(windowFactory);
+        WindowManager.getWindowManager().addListenerAndSync(windowFactory);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         errorDialog.dispose();
-        WindowManager.removeFrameListener(windowFactory);
+        WindowManager.getWindowManager().removeListener(windowFactory);
         mainFrameCreated.set(false);
         me.dispose();
         windowFactory.dispose();

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -175,7 +175,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 parent.addComponentListener(ButtonBar.this);
                 ButtonBar.this.buttonWidth = position.isHorizontal()
                         ? 150 : (parent.getWidth() / NUM_CELLS);
-                initButtons(WindowManager.getRootWindows());
+                initButtons(WindowManager.getWindowManager().getRootWindows());
                 if (controller.getMainFrame().getActiveFrame() != null) {
                     selectionChanged(controller.getMainFrame()
                             .getActiveFrame());
@@ -289,7 +289,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         buttonPanel.removeAll();
 
         final ArrayList<FrameContainer> windowList = new
-                ArrayList<FrameContainer>(WindowManager.getRootWindows());
+                ArrayList<FrameContainer>(WindowManager.getWindowManager().getRootWindows());
         if (sortRootWindows) {
             Collections.sort(windowList, new FrameContainerComparator());
         }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -308,7 +308,7 @@ public final class TreeFrameManager implements FrameManager,
                 scroller = new TreeTreeScroller(controller, tree);
 
                 for (FrameContainer window
-                        : WindowManager.getRootWindows()) {
+                        : WindowManager.getWindowManager().getRootWindows()) {
                     addWindow(null, window);
                     final Collection<FrameContainer> childWindows = window
                             .getChildren();

src/com/dmdirc/addons/ui_web/WebWindowManager.java

@@ -85,11 +85,7 @@ public class WebWindowManager implements FrameListener {
     public WebWindowManager(final WebInterfaceUI controller) {
         this.controller = controller;
 
-        WindowManager.addFrameListener(this);
-
-        for (FrameContainer container : WindowManager.getRootWindows()) {
-            recursiveAdd(container);
-        }
+        WindowManager.getWindowManager().addListenerAndSync(this);
     }
 
     /**
@@ -103,20 +99,6 @@ public class WebWindowManager implements FrameListener {
         return windows.get(container);
     }
 
-    /**
-     * Recursively adds a window for the specified container and all of its
-     * children.
-     *
-     * @param container The container to create windows for
-     */
-    private void recursiveAdd(final FrameContainer container) {
-        addWindow(container, false);
-
-        for (FrameContainer child : container.getChildren()) {
-            recursiveAdd(child);
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public void addWindow(final FrameContainer window, final boolean focus) {