Initial work on making web UI work again

Change-Id: I5756228bd66dd6d62c82ef89b9e3aab2bf9bb0cc
Reviewed-on: http://gerrit.dmdirc.com/1427
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

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

@@ -44,7 +44,7 @@ public class Client {
 
     private final List<Event> events = new LinkedList<Event>();
 
-    public Client(final String ip) {
+    public Client(final WebInterfaceUI controller, final String ip) {
         events.add(new Event("statusbar", "Welcome to the DMDirc web interface"));
 
         this.ip = ip;
@@ -54,7 +54,8 @@ public class Client {
 
         while (!queued.isEmpty()) {
             final Window window = queued.remove(0);
-            final Window parent = window.getContainer().getParent().getFrame();
+            final Window parent = controller.getWindowManager()
+                    .getWindow(window.getContainer().getParent());
 
             if (parent == null) {
                 events.add(new Event("newwindow", window));

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

@@ -67,13 +67,18 @@ public class DynamicRequestHandler extends AbstractHandler {
     /** The last time each client was seen. */
     private static final Map<String, Client> CLIENTS = new HashMap<String, Client>();
 
+    /** The controller which owns this request handler. */
+    private final WebInterfaceUI controller;
+
     /**
      * Creates a new instance of DynamicRequestHandler. Registers object
      * convertors with the JSON serialiser.
      */
-    public DynamicRequestHandler() {
+    public DynamicRequestHandler(final WebInterfaceUI controller) {
         super();
 
+        this.controller = controller;
+
         JSON.registerConvertor(Event.class, new JSONObjectConvertor());
         JSON.registerConvertor(WebWindow.class, new JSONObjectConvertor());
         JSON.registerConvertor(Message.class, new JSONObjectConvertor());
@@ -108,7 +113,7 @@ public class DynamicRequestHandler extends AbstractHandler {
             final String clientID = request.getParameter("clientID");
             
             if (!CLIENTS.containsKey(clientID)) {
-                CLIENTS.put(clientID, new Client(request.getRemoteHost()));
+                CLIENTS.put(clientID, new Client(controller, request.getRemoteHost()));
             }
 
             synchronized (CLIENTS) {
@@ -273,9 +278,9 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         nickEvents.add(new Event("clearnicklist", false));
 
-        for (ChannelClientInfo cci : ((Channel) ((WebChannelWindow)
-                WebInterfaceUI.active).getContainer()).getChannelInfo()
-                .getChannelClients()) {
+        for (ChannelClientInfo cci : ((Channel) (WebWindow.getWindow(
+                request.getParameter("window"))).getContainer())
+                .getChannelInfo().getChannelClients()) {
             nickEvents.add(new Event("addnicklist",
                     cci.getClient().getNickname()));
         }

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Main;
 import com.dmdirc.plugins.Plugin;
+import com.dmdirc.ui.interfaces.UIController;
 
 import org.mortbay.jetty.Handler;
 
@@ -54,6 +55,15 @@ public class WebInterfacePlugin extends Plugin {
         Main.setUI(ui);
     }
 
+    /**
+     * Returns the UI Controller for the web interface.
+     *
+     * @return The web interface's UI controller
+     */
+    public UIController getController() {
+        return ui;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {

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

@@ -27,16 +27,20 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.addons.ui_web.uicomponents.WebChannelWindow;
-import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebMainWindow;
-import com.dmdirc.addons.ui_web.uicomponents.WebQueryWindow;
-import com.dmdirc.addons.ui_web.uicomponents.WebServerWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-import com.dmdirc.ui.interfaces.*;
+import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.interfaces.MainWindow;
+import com.dmdirc.ui.interfaces.QueryWindow;
+import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.ui.interfaces.StatusBar;
+import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.ui.interfaces.UpdaterDialog;
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.updater.Update;
 
 import java.net.URI;
@@ -66,9 +70,12 @@ public class WebInterfaceUI implements UIController {
     /** The web server we're using. */
     private final org.mortbay.jetty.Server webServer;
 
+    /** The window manager for this UI. */
+    private final WebWindowManager windowManager;
+
     /**
      * Creates a new WebInterfaceUI belonging to the specified plugin.
-     * 
+     *
      * @param plugin The plugin which owns this Web UI
      */
     public WebInterfaceUI(final WebInterfacePlugin plugin) {       
@@ -93,7 +100,7 @@ public class WebInterfaceUI implements UIController {
             new RootRequestHandler(),
             new StaticRequestHandler(),
             new DMDircRequestHandler(),
-            new DynamicRequestHandler(),
+            new DynamicRequestHandler(this),
         });
         
         try {
@@ -101,11 +108,17 @@ public class WebInterfaceUI implements UIController {
         } catch (Exception ex) {
             // Break horribly!
         }
+
+        windowManager = new WebWindowManager(this);
+    }
+
+    public WebWindowManager getWindowManager() {
+        return windowManager;
     }
     
     /**
      * Adds the specified handler to the webserver.
-     * 
+     *
      * @param newHandler The handler to add.
      */
     public void addWebHandler(final Handler newHandler) {
@@ -132,7 +145,7 @@ public class WebInterfaceUI implements UIController {
      */
     @Override @Deprecated
     public ChannelWindow getChannel(final Channel channel) {
-        return new WebChannelWindow(channel);
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -143,7 +156,7 @@ public class WebInterfaceUI implements UIController {
      */
     @Override @Deprecated
     public ServerWindow getServer(final Server server) {
-        return new WebServerWindow(server);
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -154,7 +167,7 @@ public class WebInterfaceUI implements UIController {
      */
     @Override @Deprecated
     public QueryWindow getQuery(final Query query) {
-        return new WebQueryWindow(query);
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -165,7 +178,7 @@ public class WebInterfaceUI implements UIController {
      */
     @Override @Deprecated
     public Window getWindow(final FrameContainer<?> owner) {
-        return new WebWindow(owner);
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -176,7 +189,7 @@ public class WebInterfaceUI implements UIController {
      */
     @Override @Deprecated
     public InputWindow getInputWindow(final WritableFrameContainer<?> owner) {
-        return new WebInputWindow(owner, owner.getCommandParser());
+        throw new UnsupportedOperationException();
     }
 
     /** {@inheritDoc} */

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

@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_web;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_web.uicomponents.WebChannelWindow;
+import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
+import com.dmdirc.addons.ui_web.uicomponents.WebQueryWindow;
+import com.dmdirc.addons.ui_web.uicomponents.WebServerWindow;
+import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.ChannelWindow;
+import com.dmdirc.ui.interfaces.FrameListener;
+import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.ui.interfaces.QueryWindow;
+import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.ui.interfaces.Window;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Manages WebUI windows.
+ *
+ * @author chris
+ */
+public class WebWindowManager implements FrameListener {
+
+    /** A map of known implementations of window interfaces. */
+    private static final Map<Class<? extends Window>, Class<? extends Window>> IMPLEMENTATIONS
+            = new HashMap<Class<? extends Window>, Class<? extends Window>>();
+
+    static {
+        IMPLEMENTATIONS.put(Window.class, WebWindow.class);
+        IMPLEMENTATIONS.put(InputWindow.class, WebInputWindow.class);
+        IMPLEMENTATIONS.put(ServerWindow.class, WebServerWindow.class);
+        IMPLEMENTATIONS.put(QueryWindow.class, WebQueryWindow.class);
+        IMPLEMENTATIONS.put(ChannelWindow.class, WebChannelWindow.class);
+    }
+
+    /** The controller that owns this manager. */
+    private final WebInterfaceUI controller;
+
+    /** Map of known windows. */
+    private final Map<FrameContainer<?>, Window> windows
+            = new HashMap<FrameContainer<?>, Window>();
+
+    public WebWindowManager(final WebInterfaceUI controller) {
+        this.controller = controller;
+        
+        WindowManager.addFrameListener(this);
+
+        for (FrameContainer<?> container : WindowManager.getRootWindows()) {
+            recursiveAdd(container);
+        }
+    }
+
+    public Window getWindow(final FrameContainer<?> window) {
+        return windows.get(window);
+    }
+
+    private void recursiveAdd(final FrameContainer<?> window) {
+        addWindow(window, false);
+
+        for (FrameContainer<?> child : window.getChildren()) {
+            recursiveAdd(child);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addWindow(final FrameContainer<?> window, final boolean focus) {
+        windows.put(window, doAddWindow(window, focus));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void delWindow(final FrameContainer<?> window) {
+        windows.get(window).close();
+        windows.remove(window);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void addWindow(final FrameContainer<?> parent, final FrameContainer<?> window,
+            final boolean focus) {
+        addWindow(window, focus);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void delWindow(final FrameContainer<?> parent, final FrameContainer<?> window) {
+        delWindow(window);
+    }
+
+    /**
+     * Creates a new window for the specified container.
+     *
+     * @param <T> The type of window that should be created
+     * @param window The container that owns the window
+     * @param focus Whether the window should be focused initially
+     * @return The created window or null on error
+     */
+    @SuppressWarnings("unchecked")
+    protected <T extends Window> T doAddWindow(final FrameContainer<T> window,
+            final boolean focus) {
+        final Class<T> clazz;
+
+        if (IMPLEMENTATIONS.containsKey(window.getWindowClass())) {
+            clazz = (Class<T>) IMPLEMENTATIONS.get(window.getWindowClass());
+        } else {
+            clazz = window.getWindowClass();
+        }
+
+        try {
+            final T frame = (T) clazz.getConstructors()[0].newInstance(controller, window);
+            window.addWindow(frame);
+
+            return frame;
+        } catch (Exception ex) {
+            Logger.appError(ErrorLevel.HIGH, "Unable to create window", ex);
+            return null;
+        }
+    }
+
+}

src/com/dmdirc/addons/ui_web/plugin.config

@@ -27,3 +27,6 @@ updates:
   id=29
 
 defaults:
+
+exports:
+  getController in com.dmdirc.addons.ui_web.WebInterfacePlugin as getController

src/com/dmdirc/addons/ui_web/res/javascript/dmdirc.js

@@ -46,7 +46,7 @@ function treeview_add(name, id, type, parent) {
     var wrapperNode = document.createElement('div');
     wrapperNode.innerHTML = name;
     wrapperNode.style.cursor = 'pointer';
-    wrapperNode.onclick = function() { treeview_click(newNode); };
+    wrapperNode.onclick = function() {treeview_click(newNode);};
     newNode.appendChild(wrapperNode);
 
     parentNode.appendChild(newNode);
@@ -92,7 +92,7 @@ function wus_show() {
     wus_open = true;
     
     new Ajax.Updater('wus', '/static/webuistatus.html', {onSuccess:function() {
-            setTimeout('wus_init()', 200); }});
+            setTimeout('wus_init()', 200);}});
     new Effect.Appear('wus');
     
     wus_query();
@@ -193,7 +193,7 @@ function nsd_show() {
     }
 
     new Ajax.Updater('nsd', '/static/newserverdialog.html', {onSuccess:function() {
-            setTimeout('draggable("nsd")', 200); }});
+            setTimeout('draggable("nsd")', 200);}});
     new Ajax.Request('/dynamic/getprofiles',
     {onFailure:errFunc, onSuccess:handlerFunc, onException:excFunc});
     new Effect.Appear('nsd');
@@ -267,7 +267,8 @@ function nicklist_show() {
         document.getElementById('content').style.right = '240px';
         nicklist.style.display = 'block';
         new Ajax.Request('/dynamic/nicklistrefresh',
-        {onFailure:errFunc})
+        {parameters: {window: activeWindow}, onFailure: errFunc,
+            onSuccess: handlerFunc})
     }
 }
 

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_web.uicomponents;
 import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
 import com.dmdirc.addons.ui_web.Event;
+import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 
@@ -38,8 +39,8 @@ public class WebChannelWindow extends WebInputWindow implements ChannelWindow {
     
     private final Channel channel;
 
-    public WebChannelWindow(Channel channel) {
-        super(channel, channel.getCommandParser());
+    public WebChannelWindow(final WebInterfaceUI controller, Channel channel) {
+        super(controller, channel);
         this.channel = channel;
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -45,10 +46,10 @@ public class WebInputWindow extends WebWindow implements InputWindow {
     private final Map<String, WebInputHandler> inputHandlers
             = new HashMap<String, WebInputHandler>();
 
-    public WebInputWindow(WritableFrameContainer<?> parent, CommandParser parser) {
-        super(parent);
+    public WebInputWindow(WebInterfaceUI controller, WritableFrameContainer<?> parent) {
+        super(controller, parent);
         this.parent = parent;
-        this.commandparser = parser;
+        this.commandparser = parent.getCommandParser();
         this.inputhandler = new WebInputHandler(new WebInputField(), commandparser, this);
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.Query;
+import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.ui.interfaces.QueryWindow;
 
 /**
@@ -33,8 +34,8 @@ public class WebQueryWindow extends WebInputWindow implements QueryWindow {
     
     private final Query query;
 
-    public WebQueryWindow(final Query parent) {
-        super(parent, parent.getCommandParser());
+    public WebQueryWindow(final WebInterfaceUI controller, final Query parent) {
+        super(controller, parent);
         this.query = parent;
     }
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.Server;
+import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.ui.interfaces.ServerWindow;
 
 /**
@@ -33,8 +34,8 @@ public class WebServerWindow extends WebInputWindow implements ServerWindow {
  
     private final Server server;
 
-    public WebServerWindow(Server server) {
-        super(server, server.getCommandParser());
+    public WebServerWindow(WebInterfaceUI controller, Server server) {
+        super(controller, server);
         
         this.server = server;
     }

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

@@ -26,6 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
 import com.dmdirc.addons.ui_web.Event;
 import com.dmdirc.addons.ui_web.Message;
+import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.ui.core.util.Utils;
 import com.dmdirc.ui.interfaces.UIController;
@@ -66,7 +67,7 @@ public class WebWindow implements Window {
 
     private String title;
 
-    public WebWindow(final FrameContainer<?> parent) {
+    public WebWindow(final WebInterfaceUI controller, final FrameContainer<?> parent) {
         super();
 
         this.parent = parent;