Merge pull request #520 from ShaneMcC/debugShowRaw

Add showraw setting to DebugPlugin.

debug/plugin.config

@@ -23,4 +23,5 @@ updates:
 version:
   friendly=1.0
 
-defaults:
+defaults:
+ showraw=false

debug/src/main/java/com/dmdirc/addons/debug/DebugManager.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2006-2017 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.debug;
+
+import com.dmdirc.config.GlobalConfig;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.events.ServerConnectingEvent;
+import com.dmdirc.events.eventbus.EventBus;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.ui.WindowManager;
+import net.engio.mbassy.listener.Handler;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Debug plugin manager.
+ */
+@Singleton
+public class DebugManager {
+
+    private final RawWindowFactory windowFactory;
+
+    private final AggregateConfigProvider config;
+
+    private final String domain;
+
+    private final WindowManager windowManager;
+
+    private final EventBus eventBus;
+
+    @Inject
+    public DebugManager(@PluginDomain(DebugPlugin.class) final String domain,
+            @GlobalConfig final AggregateConfigProvider globalConfig, final RawWindowFactory windowFactory,
+            final WindowManager windowManager, final EventBus eventBus) {
+        this.domain = domain;
+        this.windowManager = windowManager;
+        this.eventBus = eventBus;
+        this.config = globalConfig;
+        this.windowFactory = windowFactory;
+    }
+
+    public void load() {
+        eventBus.subscribe(this);
+    }
+
+    public void unload() {
+        eventBus.unsubscribe(this);
+    }
+
+    @Handler
+    public void handleServerConnecting(final ServerConnectingEvent event) {
+        if (config.getOptionBool(domain, "showraw") && !windowManager
+                .getChildren(event.getConnection().getWindowModel()).stream().anyMatch(RawWindow.class::isInstance)) {
+            windowFactory.getRawWindow(event.getConnection());
+        }
+    }
+}

debug/src/main/java/com/dmdirc/addons/debug/DebugModule.java

@@ -37,15 +37,27 @@ import com.dmdirc.addons.debug.commands.ShowRaw;
 import com.dmdirc.addons.debug.commands.StatusbarMessage;
 import com.dmdirc.addons.debug.commands.Threads;
 import com.dmdirc.addons.debug.commands.Time;
-
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 import dagger.Module;
 import dagger.Provides;
 
 /**
  * Dependency injection module for the debug plugin.
  */
-@Module(injects = Debug.class, addsTo = ClientModule.class)
+@Module(addsTo = ClientModule.class, injects = {DebugManager.class, Debug.class})
 public class DebugModule {
+    private final PluginInfo pluginInfo;
+
+    public DebugModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    @PluginDomain(DebugPlugin.class)
+    public String getDomain() {
+        return pluginInfo.getDomain();
+    }
 
     @Provides(type = Provides.Type.SET)
     public DebugCommand getCommand(final Benchmark command) {

debug/src/main/java/com/dmdirc/addons/debug/DebugPlugin.java

@@ -22,17 +22,33 @@ import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import dagger.ObjectGraph;
 
+
 /**
  * Debug plugin providing commands to aid in debugging the client.
  */
 public class DebugPlugin extends BaseCommandPlugin {
 
+    /** The manager in use. */
+    private DebugManager manager;
+
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new DebugModule()));
+        setObjectGraph(graph.plus(new DebugModule(pluginInfo)));
+        manager = getObjectGraph().get(DebugManager.class);
         registerCommand(Debug.class, Debug.INFO);
     }
 
+    @Override
+    public void onLoad() {
+        super.onLoad();
+        manager.load();
+    }
+
+    @Override
+    public void onUnload() {
+        super.onUnload();
+        manager.unload();
+    }
 }