Make WindowManager non-static

CLIENT-84

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

src/com/dmdirc/Channel.java

@@ -124,7 +124,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 CommandManager.getCommandNames(CommandType.TYPE_CHAT));
 
-        WindowManager.addWindow(server, this, focus);
+        WindowManager.getWindowManager().addWindow(server, this, focus);
 
         eventHandler = new ChannelEventHandler(this);
 

src/com/dmdirc/CustomWindow.java

@@ -46,7 +46,7 @@ public class CustomWindow extends FrameContainer {
         super("custom", name, title, Window.class, parent.getConfigManager(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
-        WindowManager.addWindow(parent, this);
+        WindowManager.getWindowManager().addWindow(parent, this);
     }
 
     /**
@@ -60,7 +60,7 @@ public class CustomWindow extends FrameContainer {
                 IdentityManager.getGlobalConfig(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
-        WindowManager.addWindow(this);
+        WindowManager.getWindowManager().addWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/FrameContainer.java

@@ -288,7 +288,7 @@ public abstract class FrameContainer {
 
         windowClosing();
 
-        WindowManager.removeWindow(this);
+        WindowManager.getWindowManager().removeWindow(this);
     }
 
     /**

src/com/dmdirc/GlobalWindow.java

@@ -61,7 +61,7 @@ public class GlobalWindow extends WritableFrameContainer {
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 AliasWrapper.getAliasWrapper().getAliases());
 
-        WindowManager.addWindow(this);
+        WindowManager.getWindowManager().addWindow(this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/Query.java

@@ -96,7 +96,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         this.host = newHost;
         this.nickname = server.parseHostmask(host)[0];
 
-        WindowManager.addWindow(server, this, focus);
+        WindowManager.getWindowManager().addWindow(server, this, focus);
 
         ActionManager.getActionManager().triggerEvent(
                 CoreActionType.QUERY_OPENED, null, this);

src/com/dmdirc/Raw.java

@@ -62,7 +62,7 @@ public final class Raw extends WritableFrameContainer
 
         getCommandParser().setOwner(server);
 
-        WindowManager.addWindow(server, this);
+        WindowManager.getWindowManager().addWindow(server, this);
     }
 
     /**

src/com/dmdirc/Server.java

@@ -198,7 +198,7 @@ public class Server extends WritableFrameContainer
         setConnectionDetails(uri, profile);
 
         ServerManager.getServerManager().registerServer(this);
-        WindowManager.addWindow(this);
+        WindowManager.getWindowManager().addWindow(this);
 
         tabCompleter.addEntries(TabCompletionType.COMMAND,
                 AliasWrapper.getAliasWrapper().getAliases());

src/com/dmdirc/WritableFrameContainer.java

@@ -309,7 +309,8 @@ public abstract class WritableFrameContainer extends FrameContainer {
         } else if (target.startsWith("window:")) {
             final String windowName = target.substring(7);
 
-            FrameContainer targetWindow = WindowManager.findCustomWindow(getServer(), windowName);
+            FrameContainer targetWindow = WindowManager.getWindowManager()
+                    .findCustomWindow(getServer(), windowName);
 
             if (targetWindow == null) {
                 targetWindow = new CustomWindow(windowName, windowName, getServer());

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -88,13 +88,13 @@ public final class Echo extends Command implements IntelligentCommand,
             FrameContainer target = origin;
 
             while (frame == null && target != null) {
-                frame = WindowManager.findCustomWindow(target,
+                frame = WindowManager.getWindowManager().findCustomWindow(target,
                         results.getArgumentsAsString(targetFlag));
                 target = target.getParent();
             }
 
             if (frame == null) {
-                frame = WindowManager.findCustomWindow(results.getArgumentsAsString(targetFlag));
+                frame = WindowManager.getWindowManager().findCustomWindow(results.getArgumentsAsString(targetFlag));
             }
 
             if (frame == null) {
@@ -159,7 +159,7 @@ public final class Echo extends Command implements IntelligentCommand,
             }
 
             //Global Windows
-            windowList.addAll(WindowManager.getRootWindows());
+            windowList.addAll(WindowManager.getWindowManager().getRootWindows());
             for (FrameContainer customWindow : windowList) {
                 if (customWindow instanceof CustomWindow) {
                     targets.add(customWindow.getName());

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -75,9 +75,9 @@ public class OpenWindow extends Command implements IntelligentCommand, CommandIn
             final FrameContainer window;
 
             if (parent == null) {
-                window = WindowManager.findCustomWindow(args.getArguments()[start]);
+                window = WindowManager.getWindowManager().findCustomWindow(args.getArguments()[start]);
             } else {
-                window = WindowManager.findCustomWindow(parent, args.getArguments()[start]);
+                window = WindowManager.getWindowManager().findCustomWindow(parent, args.getArguments()[start]);
             }
 
             final String title = args.getArguments().length > start + 1

src/com/dmdirc/ui/WindowManager.java

@@ -28,8 +28,8 @@ import com.dmdirc.Precondition;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameListener;
+import com.dmdirc.util.ListenerList;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -39,37 +39,29 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * The WindowManager maintains a list of all open windows, and their
  * parent/child relations.
  */
-public final class WindowManager {
+public class WindowManager {
+
+    /** Singleton instance of the WindowManager. */
+    private static final WindowManager INSTANCE = new WindowManager();
 
     /** A list of root windows. */
-    private static final List<FrameContainer> ROOT_WINDOWS
+    private final List<FrameContainer> rootWindows
             = new CopyOnWriteArrayList<FrameContainer>();
 
     /** A list of frame listeners. */
-    private static final List<FrameListener> FRAME_LISTENERS
-            = new ArrayList<FrameListener>();
-
-    /**
-     * Creates a new instance of WindowManager.
-     */
-    private WindowManager() {
-        // Shouldn't be instansiated
-    }
+    private final ListenerList listeners
+            = new ListenerList();
 
     /**
      * Registers a FrameListener with the WindowManager.
      *
      * @param frameListener The frame listener to be registered
      */
-    @Precondition({
-        "The specified FrameListener is not null",
-        "The specified FrameListener has not already been added"
-    })
-    public static void addFrameListener(final FrameListener frameListener) {
+    @Precondition("The specified FrameListener is not null")
+    public void addListener(final FrameListener frameListener) {
         Logger.assertTrue(frameListener != null);
-        Logger.assertTrue(!FRAME_LISTENERS.contains(frameListener));
 
-        FRAME_LISTENERS.add(frameListener);
+        listeners.add(FrameListener.class, frameListener);
     }
 
     /**
@@ -79,14 +71,11 @@ public final class WindowManager {
      * @param frameListener The frame listener to be registered
      * @since 0.6.6
      */
-    @Precondition({
-        "The specified FrameListener is not null",
-        "The specified FrameListener has not already been added"
-    })
-    public static void addAndExecuteFrameListener(final FrameListener frameListener) {
-        addFrameListener(frameListener);
+    @Precondition("The specified FrameListener is not null")
+    public void addListenerAndSync(final FrameListener frameListener) {
+        addListener(frameListener);
 
-        for (FrameContainer root : ROOT_WINDOWS) {
+        for (FrameContainer root : rootWindows) {
             frameListener.addWindow(root, true);
 
             for (FrameContainer child : root.getChildren()) {
@@ -118,15 +107,8 @@ public final class WindowManager {
      *
      * @param frameListener The frame listener to be removed
      */
-    @Precondition({
-        "The specified FrameListener is not null",
-        "The specified FrameListener has already been added and not removed"
-    })
-    public static void removeFrameListener(final FrameListener frameListener) {
-        Logger.assertTrue(frameListener != null);
-        Logger.assertTrue(FRAME_LISTENERS.contains(frameListener));
-
-        FRAME_LISTENERS.remove(frameListener);
+    public void removeListener(final FrameListener frameListener) {
+        listeners.remove(FrameListener.class, frameListener);
     }
 
     /**
@@ -139,7 +121,7 @@ public final class WindowManager {
         "The specified Window is not null",
         "The specified Window has not already been added"
     })
-    public static void addWindow(final FrameContainer window) {
+    public void addWindow(final FrameContainer window) {
         addWindow(window, true);
     }
 
@@ -154,11 +136,11 @@ public final class WindowManager {
         "The specified Window is not null",
         "The specified Window has not already been added"
     })
-    public static void addWindow(final FrameContainer window, final boolean focus) {
+    public void addWindow(final FrameContainer window, final boolean focus) {
         Logger.assertTrue(window != null);
-        Logger.assertTrue(!ROOT_WINDOWS.contains(window));
+        Logger.assertTrue(!rootWindows.contains(window));
 
-        ROOT_WINDOWS.add(window);
+        rootWindows.add(window);
 
         fireAddWindow(window, focus);
     }
@@ -171,7 +153,7 @@ public final class WindowManager {
      * @since 0.6.4
      */
     @Precondition("The specified Windows are not null")
-    public static void addWindow(final FrameContainer parent,
+    public void addWindow(final FrameContainer parent,
             final FrameContainer child) {
         addWindow(parent, child, true);
     }
@@ -189,7 +171,7 @@ public final class WindowManager {
         "The specified parent is in the window hierarchy already",
         "The specified child is NOT in the window hierarchy already"
     })
-    public static void addWindow(final FrameContainer parent,
+    public void addWindow(final FrameContainer parent,
             final FrameContainer child, final boolean focus) {
         Logger.assertTrue(parent != null);
         Logger.assertTrue(isInHierarchy(parent));
@@ -210,8 +192,8 @@ public final class WindowManager {
      * @param target The container to be tested
      * @return True if the target is in the hierarchy, false otherise
      */
-    protected static boolean isInHierarchy(final FrameContainer target) {
-        return target != null && (ROOT_WINDOWS.contains(target)
+    protected boolean isInHierarchy(final FrameContainer target) {
+        return target != null && (rootWindows.contains(target)
                 || isInHierarchy(target.getParent()));
     }
 
@@ -228,7 +210,7 @@ public final class WindowManager {
         "The specified window is not null",
         "The specified window is in the window hierarchy"
     })
-    public static void removeWindow(final FrameContainer window) {
+    public void removeWindow(final FrameContainer window) {
         Logger.assertTrue(isInHierarchy(window));
         Logger.assertTrue(window != null);
 
@@ -236,9 +218,9 @@ public final class WindowManager {
             child.close();
         }
 
-        if (ROOT_WINDOWS.contains(window)) {
+        if (rootWindows.contains(window)) {
             fireDeleteWindow(window);
-            ROOT_WINDOWS.remove(window);
+            rootWindows.remove(window);
         } else {
             final FrameContainer parent = window.getParent();
             fireDeleteWindow(parent, window);
@@ -275,7 +257,7 @@ public final class WindowManager {
         "The specified window is in the window hierarchy"
     })
     @Deprecated
-    public static void removeWindow(final FrameContainer window, final boolean canWait) {
+    public void removeWindow(final FrameContainer window, final boolean canWait) {
         removeWindow(window);
     }
 
@@ -287,10 +269,10 @@ public final class WindowManager {
      * @return The specified custom window, or null
      */
     @Precondition("The specified window name is not null")
-    public static FrameContainer findCustomWindow(final String name) {
+    public FrameContainer findCustomWindow(final String name) {
         Logger.assertTrue(name != null);
 
-        return findCustomWindow(ROOT_WINDOWS, name);
+        return findCustomWindow(rootWindows, name);
     }
 
     /**
@@ -306,7 +288,7 @@ public final class WindowManager {
         "The specified parent window is not null",
         "The specified parent window has been added to the Window Manager"
     })
-    public static FrameContainer findCustomWindow(final FrameContainer parent,
+    public FrameContainer findCustomWindow(final FrameContainer parent,
             final String name) {
         Logger.assertTrue(parent != null);
         Logger.assertTrue(name != null);
@@ -322,7 +304,7 @@ public final class WindowManager {
      * @param name The name of the custom window to search for
      * @return The custom window if found, or null otherwise
      */
-    private static FrameContainer findCustomWindow(final Collection<FrameContainer> windows,
+    private FrameContainer findCustomWindow(final Collection<FrameContainer> windows,
             final String name) {
         for (FrameContainer window : windows) {
             if (window instanceof CustomWindow
@@ -340,8 +322,8 @@ public final class WindowManager {
      * @since 0.6.4
      * @return A collection of all known root windows.
      */
-    public static Collection<FrameContainer> getRootWindows() {
-        return Collections.unmodifiableCollection(ROOT_WINDOWS);
+    public Collection<FrameContainer> getRootWindows() {
+        return Collections.unmodifiableCollection(rootWindows);
     }
 
     /**
@@ -350,8 +332,8 @@ public final class WindowManager {
      * @param window The window that was added
      * @param focus Should this window become focused
      */
-    private static void fireAddWindow(final FrameContainer window, final boolean focus) {
-        for (FrameListener listener : FRAME_LISTENERS) {
+    private void fireAddWindow(final FrameContainer window, final boolean focus) {
+        for (FrameListener listener : listeners.get(FrameListener.class)) {
             listener.addWindow(window, focus);
         }
     }
@@ -364,9 +346,9 @@ public final class WindowManager {
      * @param focus Should this window become focused
      *
      */
-    private static void fireAddWindow(final FrameContainer parent,
+    private void fireAddWindow(final FrameContainer parent,
             final FrameContainer child, final boolean focus) {
-        for (FrameListener listener : FRAME_LISTENERS) {
+        for (FrameListener listener : listeners.get(FrameListener.class)) {
             listener.addWindow(parent, child, focus);
         }
     }
@@ -376,8 +358,8 @@ public final class WindowManager {
      *
      * @param window The window that was removed
      */
-    private static void fireDeleteWindow(final FrameContainer window) {
-        for (FrameListener listener : FRAME_LISTENERS) {
+    private void fireDeleteWindow(final FrameContainer window) {
+        for (FrameListener listener : listeners.get(FrameListener.class)) {
             listener.delWindow(window);
         }
     }
@@ -388,11 +370,19 @@ public final class WindowManager {
      * @param parent The parent window
      * @param child The child window that was removed
      */
-    private static void fireDeleteWindow(final FrameContainer parent,
+    private void fireDeleteWindow(final FrameContainer parent,
             final FrameContainer child) {
-        for (FrameListener listener : FRAME_LISTENERS) {
+        for (FrameListener listener : listeners.get(FrameListener.class)) {
             listener.delWindow(parent, child);
         }
     }
 
+    /**
+     * Returns a singleton instance of the WindowManager.
+     *
+     * @return A singleton WindowManager instance
+     */
+    public static WindowManager getWindowManager() {
+        return INSTANCE;
+    }
 }

test/com/dmdirc/ui/WindowManagerTest.java

@@ -42,56 +42,60 @@ public class WindowManagerTest {
 
     @Test
     public void testAddRoot() {
+        final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
-        
-        WindowManager.addFrameListener(tfm);
+
+        manager.addListener(tfm);
 
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
-        
-        WindowManager.addWindow(parent.getContainer());
-        
+
+        manager.addWindow(parent.getContainer());
+
         verify(tfm).addWindow(same(parent.getContainer()), eq(true));
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
     }
 
     @Test
     public void testAddChild() {
+        final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent.getContainer());
-        WindowManager.addFrameListener(tfm);
-        
-        WindowManager.addWindow(parent.getContainer(), child.getContainer());
-        
+        manager.addWindow(parent.getContainer());
+        manager.addListener(tfm);
+
+        manager.addWindow(parent.getContainer(), child.getContainer());
+
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
         verify(tfm).addWindow(same(parent.getContainer()), same(child.getContainer()), eq(true));
     }
 
     @Test
     public void testRemoveRoot() {
+        final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent.getContainer());
-        WindowManager.addFrameListener(tfm);
+        manager.addWindow(parent.getContainer());
+        manager.addListener(tfm);
+
+        manager.removeWindow(parent.getContainer());
 
-        WindowManager.removeWindow(parent.getContainer());
-        
         verify(tfm).delWindow(same(parent.getContainer()));
     }
 
     @Test
     public void testRemoveChild() {
+        final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent.getContainer());
-        WindowManager.addWindow(parent.getContainer(), child.getContainer());
-        WindowManager.addFrameListener(tfm);
+        manager.addWindow(parent.getContainer());
+        manager.addWindow(parent.getContainer(), child.getContainer());
+        manager.addListener(tfm);
 
-        WindowManager.removeWindow(child.getContainer());
+        manager.removeWindow(child.getContainer());
 
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
@@ -101,20 +105,21 @@ public class WindowManagerTest {
 
     @Test
     public void testRemoveFrameManager() {
+        final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
         final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
-        WindowManager.addWindow(parent.getContainer());
-        
-        WindowManager.addFrameListener(tfm);
+        manager.addWindow(parent.getContainer());
+
+        manager.addListener(tfm);
+
+        manager.removeListener(tfm);
+        manager.addWindow(parent.getContainer(), child.getContainer());
 
-        WindowManager.removeFrameListener(tfm);
-        WindowManager.addWindow(parent.getContainer(), child.getContainer());
-        
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), eq(true));
         verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject(), eq(true));
         verify(tfm, never()).delWindow((FrameContainer) anyObject());
         verify(tfm, never()).delWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
     }
-    
+
 }