More web UI tidying

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

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
 import com.dmdirc.ui.interfaces.Window;
 
 import java.util.LinkedList;
@@ -61,7 +60,7 @@ public class Client {
 
         final List<Window> added = new LinkedList<Window>();
         final List<Window> queued
-                = new LinkedList<Window>(WebWindow.getWindows());
+                = new LinkedList<Window>(controller.getWindowManager().getWindows());
 
         while (!queued.isEmpty()) {
             final Window window = queued.remove(0);

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

@@ -201,7 +201,7 @@ public class DynamicRequestHandler extends AbstractHandler {
     }
 
     private void doInput(final HttpServletRequest request) throws IOException {
-        final WebWindow window = WebWindow.getWindow(
+        final WebWindow window = controller.getWindowManager().getWindow(
                 request.getParameter("window"));
 
         if (window instanceof WebInputWindow) {
@@ -213,7 +213,7 @@ public class DynamicRequestHandler extends AbstractHandler {
     }
 
     private void doKey(final HttpServletRequest request) throws IOException {
-        final WebWindow window = WebWindow.getWindow(
+        final WebWindow window = controller.getWindowManager().getWindow(
                 request.getParameter("window"));
 
         if (window instanceof WebInputWindow) {
@@ -237,8 +237,8 @@ public class DynamicRequestHandler extends AbstractHandler {
     }
 
     private void doTab(final HttpServletRequest request) throws IOException {
-        final WebWindow window = WebWindow.getWindow(request.getParameter(
-                "window"));
+        final WebWindow window = controller.getWindowManager().getWindow(
+                request.getParameter("window"));
 
         if (window instanceof WebInputWindow) {
             final WebInputWindow wiw = (WebInputWindow) window;
@@ -253,8 +253,8 @@ public class DynamicRequestHandler extends AbstractHandler {
 
     private void doKeyUpDown(final boolean up, final HttpServletRequest request)
             throws IOException {
-        final WebWindow window = WebWindow.getWindow(request.getParameter(
-                "window"));
+        final WebWindow window = controller.getWindowManager().getWindow(
+                request.getParameter("window"));
 
         if (window instanceof WebInputWindow) {
             final WebInputWindow wiw = (WebInputWindow) window;
@@ -294,8 +294,8 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         nickEvents.add(new Event("clearnicklist", false));
 
-        for (ChannelClientInfo cci : ((Channel) (WebWindow.getWindow(
-                request.getParameter("window"))).getContainer())
+        for (ChannelClientInfo cci : ((Channel) (controller.getWindowManager()
+                .getWindow(request.getParameter("window"))).getContainer())
                 .getChannelInfo().getChannelClients()) {
             nickEvents.add(new Event("addnicklist",
                     cci.getClient().getNickname()));
@@ -328,8 +328,8 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         final List<Event> windowEvents = new ArrayList<Event>();
 
-        final WebWindow window = WebWindow.getWindow(request.getParameter(
-                "window"));
+        final WebWindow window = controller.getWindowManager().getWindow(
+                request.getParameter("window"));
 
         windowEvents.add(new Event("clearwindow", window.getId()));
 
@@ -350,7 +350,7 @@ public class DynamicRequestHandler extends AbstractHandler {
     private void doJoinChannel(final HttpServletRequest request)
             throws IOException {
         final String windowID = request.getParameter("source");
-        final WebWindow window = WebWindow.getWindow(windowID);
+        final WebWindow window = controller.getWindowManager().getWindow(windowID);
         window.getContainer().getServer().join(new ChannelJoinRequest(request.
                 getParameter("channel")));
     }
@@ -358,7 +358,7 @@ public class DynamicRequestHandler extends AbstractHandler {
     private void doOpenQuery(final HttpServletRequest request)
             throws IOException {
         final String windowID = request.getParameter("source");
-        final WebWindow window = WebWindow.getWindow(windowID);
+        final WebWindow window = controller.getWindowManager().getWindow(windowID);
         window.getContainer().getServer().getQuery(request.getParameter(
                 "target"));
     }

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

@@ -34,6 +34,7 @@ import com.dmdirc.ui.interfaces.Window;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -71,9 +72,16 @@ public class WebWindowManager implements FrameListener {
     /** The controller that owns this manager. */
     private final WebInterfaceUI controller;
 
+    /** The ID of the next window to be created. */
+    private long nextId = 0l;
+
     /** Map of known windows. */
-    private final Map<FrameContainer, Window> windows
-            = new HashMap<FrameContainer, Window>();
+    private final Map<FrameContainer, WebWindow> windows
+            = new HashMap<FrameContainer, WebWindow>();
+
+    /** A map of window IDs to their windows. */
+    private final Map<String, WebWindow> windowsById
+            = new HashMap<String, WebWindow>();
 
     /**
      * Creates a new window manager for the specified controller.
@@ -93,10 +101,20 @@ public class WebWindowManager implements FrameListener {
      * @param container The container whose window should be retrieved
      * @return The corresponding web window, or null if there is none
      */
-    public Window getWindow(final FrameContainer container) {
+    public WebWindow getWindow(final FrameContainer container) {
         return windows.get(container);
     }
 
+    /**
+     * Retrieves the web window with the specified ID, if any.
+     *
+     * @param id The ID of the window to retrieve
+     * @return The corresponding web window, or null if there isn't one
+     */
+    public WebWindow getWindow(final String id) {
+        return windowsById.get(id);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void addWindow(final FrameContainer window, final boolean focus) {
@@ -107,6 +125,7 @@ public class WebWindowManager implements FrameListener {
     @Override
     public void delWindow(final FrameContainer window) {
         if (windows.containsKey(window)) {
+            windowsById.remove(windows.get(window).getId());
             windows.remove(window);
         }
     }
@@ -128,6 +147,15 @@ public class WebWindowManager implements FrameListener {
         }
     }
 
+    /**
+     * Retrieves a collection of all known windows.
+     *
+     * @return The collection of all known windows
+     */
+    public Collection<WebWindow> getWindows() {
+        return Collections.unmodifiableCollection(windows.values());
+    }
+
     /**
      * Creates a new window for the specified container.
      *
@@ -147,9 +175,12 @@ public class WebWindowManager implements FrameListener {
         }
 
         try {
-            final Window frame = (Window) clazz.getConstructors()[0].newInstance(controller, window);
+            final String id = String.valueOf(nextId++);
+
+            final WebWindow frame = (WebWindow) clazz.getConstructors()[0].newInstance(controller, window, id);
 
             windows.put(window, frame);
+            windowsById.put(id, frame);
         } catch (Exception ex) {
             Logger.appError(ErrorLevel.MEDIUM, "Unable to create window of type "
                     + clazz.getCanonicalName() + " for web ui", ex);

src/com/dmdirc/addons/ui_web/uicomponents/WebInputField.java

@@ -30,7 +30,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyListener;
 
 /**
- * An input field for a specific
+ * An input field for a specific client.
  */
 public class WebInputField implements InputField {
 

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

@@ -47,8 +47,8 @@ public class WebInputWindow extends WebWindow implements InputWindow {
             = new HashMap<Client, WebInputHandler>();
 
     public WebInputWindow(final WebInterfaceUI controller,
-            final WritableFrameContainer parent) {
-        super(controller, parent);
+            final WritableFrameContainer parent, final String id) {
+        super(controller, parent, id);
         this.parent = parent;
         this.commandparser = parent.getCommandParser();
         this.inputhandler = new WebInputHandler(new WebInputField(),

src/com/dmdirc/addons/ui_web/uicomponents/WebWindow.java

@@ -38,8 +38,6 @@ import java.awt.Color;
 import java.awt.font.TextAttribute;
 import java.text.AttributedCharacterIterator;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,27 +49,27 @@ import org.apache.commons.lang.StringEscapeUtils;
 public class WebWindow implements Window, IRCDocumentListener,
         FrameInfoListener, FrameCloseListener {
 
-    protected static int counter = 0;
-
-    protected static final Map<String, WebWindow> WINDOWS
-            = new HashMap<String, WebWindow>();
-
-    protected int myID = ++counter;
+    /** The unique ID of this window, used by clients to address the window. */
+    private final String id;
 
+    /** The container that this window corresponds to. */
     private final FrameContainer parent;
 
     /** The handler to pass global events to. */
     private final DynamicRequestHandler handler;
 
+    /** The controller that owns this window. */
+    private final WebInterfaceUI controller;
+
     public WebWindow(final WebInterfaceUI controller,
-            final FrameContainer parent) {
+            final FrameContainer parent, final String id) {
         super();
 
+        this.id = id;
         this.parent = parent;
+        this.controller = controller;
         this.handler = controller.getHandler();
 
-        WINDOWS.put(getId(), this);
-
         parent.getDocument().addIRCDocumentListener(this);
         parent.addFrameInfoListener(this);
 
@@ -84,14 +82,6 @@ public class WebWindow implements Window, IRCDocumentListener,
         }
     }
 
-    public static Collection<WebWindow> getWindows() {
-        return WINDOWS.values();
-    }
-
-    public static WebWindow getWindow(final String id) {
-        return WINDOWS.get(id);
-    }
-
     public List<String> getMessages() {
         final List<String> messages = new ArrayList<String>(getContainer()
                 .getDocument().getNumLines());
@@ -110,7 +100,7 @@ public class WebWindow implements Window, IRCDocumentListener,
     }
 
     public String getId() {
-        return String.valueOf(myID);
+        return id;
     }
 
     protected String style(final AttributedCharacterIterator aci) {
@@ -206,8 +196,7 @@ public class WebWindow implements Window, IRCDocumentListener,
     /** {@inheritDoc} */
     @Override
     public UIController getController() {
-        //TODO FIXME
-        return null;
+        return controller;
     }
 
     /** {@inheritDoc} */
@@ -258,7 +247,7 @@ public class WebWindow implements Window, IRCDocumentListener,
     /** {@inheritDoc} */
     @Override
     public void windowClosing(final FrameContainer window) {
-        handler.addEvent(new Event("closewindow", myID));
+        handler.addEvent(new Event("closewindow", id));
     }
 
     /**