Begin DI for web ui

Change-Id: Iee6c747a565f08f35966e7a5889f7e04ab008adc
Reviewed-on: http://gerrit.dmdirc.com/3117
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -26,6 +26,7 @@ import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;
 
+import javax.inject.Inject;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -39,33 +40,23 @@ import org.mortbay.jetty.handler.AbstractHandler;
  */
 public class StaticRequestHandler extends AbstractHandler {
 
-    private ResourceManager rm;
-
-    private final WebInterfaceUI controller;
+    private final ResourceManager rm;
 
     /**
      * Create a new StaticRequestHandler.
      *
-     * @param controller UI Controller that owns this handler.
+     * @param rm Resource manager
      */
-    public StaticRequestHandler(final WebInterfaceUI controller) {
-        this.controller = controller;
+    @Inject
+    public StaticRequestHandler(final ResourceManager rm) {
+        this.rm = rm;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void handle(final String target, final HttpServletRequest request,
             final HttpServletResponse response, final int dispatch)
             throws IOException, ServletException {
 
-        if (rm == null) {
-            try {
-                rm = controller.getPluginInfo().getResourceManager();
-            } catch (IOException ex) {
-                // Die horribly
-            }
-        }
-
         if (((request instanceof Request) ? (Request) request
                 : HttpConnection.getCurrentConnection().getRequest()).isHandled()) {
             return;

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * 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.ClientModule;
+import com.dmdirc.plugins.PluginInfo;
+
+import com.dmdirc.util.resourcemanager.ResourceManager;
+
+import java.io.IOException;
+import javax.inject.Qualifier;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(injects={WebInterfaceUI.class, StaticRequestHandler.class}, addsTo=ClientModule.class)
+public class WebInterfaceModule {
+
+    private final PluginInfo pluginInfo;
+
+    public WebInterfaceModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Qualifier
+    public @interface WebUIDomain {};
+
+    @Provides
+    @WebUIDomain
+    public String getSettingsDomain() {
+        return pluginInfo.getDomain();
+    }
+
+    @Singleton
+    @Provides
+    public ResourceManager getResourceManager() {
+        try {
+            return pluginInfo.getResourceManager();
+        } catch (IOException ex) {
+            throw new IllegalStateException("Die Horrible", ex);
+        }
+    }
+
+}

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

@@ -22,81 +22,31 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.ServerManager;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.implementations.BasePlugin;
-import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.core.components.StatusBarManager;
 
-import org.mortbay.jetty.Handler;
+import dagger.ObjectGraph;
 
 /**
  * The main web interface plugin.
  */
 public class WebInterfacePlugin extends BasePlugin {
 
-    /** Server manager to use. */
-    private final ServerManager serverManager;
-
-    /** The controller to read/write settings with. */
-    private final IdentityController identityController;
-
-    /** Plugin manager to use. */
-    private final PluginManager pluginManager;
-
-    /** This plugin's information object. */
-    private final PluginInfo pluginInfo;
-
-    /** Window management. */
-    private final WindowManager windowManager;
-
-    /** The status bar manager to use. */
-    private final StatusBarManager statusBarManager;
-
     /** The UI that we're using. */
     private WebInterfaceUI controller;
 
-    public WebInterfacePlugin(final ServerManager serverManager,
-            final IdentityController identityController, final PluginManager pluginManager,
-            final PluginInfo pluginInfo, final WindowManager windowManager,
-            final StatusBarManager statusBarManager) {
-        this.serverManager = serverManager;
-        this.identityController = identityController;
-        this.pluginManager = pluginManager;
-        this.pluginInfo = pluginInfo;
-        this.windowManager = windowManager;
-        this.statusBarManager = statusBarManager;
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+        setObjectGraph(graph.plus(new WebInterfaceModule(pluginInfo)));
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
-        if (controller == null) {
-            controller = new WebInterfaceUI(getDomain(),
-                    identityController, serverManager,
-                    pluginManager, pluginInfo, windowManager,
-                    statusBarManager);
-        }
-    }
-
-    /**
-     * Adds the specified handler to the WebInterface's web server.
-     *
-     * @param newHandler The handler to be added
-     */
-    public void addWebHandler(final Handler newHandler) {
-        if (controller == null) {
-            controller = new WebInterfaceUI(getDomain(),
-                    identityController, serverManager,
-                    pluginManager, pluginInfo, windowManager,
-                    statusBarManager);
-        }
-
-        controller.addWebHandler(newHandler);
+        getObjectGraph().get(WebInterfaceUI.class);
     }
 
     /**

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

@@ -25,17 +25,19 @@ package com.dmdirc.addons.ui_web;
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
+import com.dmdirc.addons.ui_web.WebInterfaceModule.WebUIDomain;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.net.URI;
 
+import javax.inject.Inject;
+
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.security.Constraint;
 import org.mortbay.jetty.security.ConstraintMapping;
@@ -56,9 +58,6 @@ public class WebInterfaceUI implements UIController {
     /** The dynamic request handler in use. */
     private final DynamicRequestHandler handler;
 
-    /** The PluginInfo object for this plugin. */
-    private final PluginInfo pluginInfo;
-
     /** The plugin manager used to find other plugins. */
     private final PluginManager pluginManager;
 
@@ -69,22 +68,22 @@ public class WebInterfaceUI implements UIController {
      * @param identityController The controller to read/write settings with.
      * @param serverManager The manager to use to find and create servers
      * @param pluginManager The manager to use to find other plugins
-     * @param pluginInfo The information object for this UI's plugin.
      * @param coreWindowManager Window management
      * @param statusBarManager The status bar manager.
+     * @param staticRequestHandler Status request handler
      */
+    @Inject
     public WebInterfaceUI(
-            final String domain,
+            @WebUIDomain final String domain,
             final IdentityController identityController,
             final ServerManager serverManager,
             final PluginManager pluginManager,
-            final PluginInfo pluginInfo,
             final WindowManager coreWindowManager,
-            final StatusBarManager statusBarManager) {
+            final StatusBarManager statusBarManager,
+            final StaticRequestHandler staticRequestHandler) {
         super();
 
         this.pluginManager = pluginManager;
-        this.pluginInfo = pluginInfo;
 
         final SecurityHandler sh = new SecurityHandler();
         final Constraint constraint = new Constraint();
@@ -106,7 +105,7 @@ public class WebInterfaceUI implements UIController {
         webServer.setHandlers(new Handler[]{
             sh,
             new RootRequestHandler(),
-            new StaticRequestHandler(this),
+            staticRequestHandler,
             new DMDircRequestHandler(),
             handler,
         });
@@ -130,10 +129,6 @@ public class WebInterfaceUI implements UIController {
         return handler;
     }
 
-    public PluginInfo getPluginInfo() {
-        return pluginInfo;
-    }
-
     public PluginManager getPluginManager() {
         return pluginManager;
     }