Merge pull request #410 from greboid/dev3

Move Info item adding to SwingManager.

ui_swing/src/com/dmdirc/addons/ui_swing/SwingManager.java

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
+import com.dmdirc.events.ClientInfoRequestEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
@@ -38,12 +39,16 @@ import com.dmdirc.events.UnknownURLEvent;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.about.InfoItem;
 
 import java.awt.Window;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
+import javax.swing.UIManager;
+
+import net.miginfocom.layout.LayoutUtil;
 
 import net.engio.mbassy.listener.Handler;
 
@@ -230,4 +235,13 @@ public class SwingManager {
                         event.getModel().getIdentity()).getSwingUICategory());
     }
 
+    @Handler
+    public void handleInfoRequest(final ClientInfoRequestEvent event) {
+        event.addInfoItem(InfoItem.create("Swing UI Version",
+                        pluginInfo.getMetaData().getVersion().toString()),
+                InfoItem.create("Look and Feel", UIManager.getLookAndFeel().getName()),
+                InfoItem.create("MiG Layout Version", LayoutUtil.getVersion())
+        );
+    }
+
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -24,15 +24,10 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.events.ClientInfoRequestEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
-import com.dmdirc.plugins.PluginDomain;
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.ui.core.about.InfoItem;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.Window;
@@ -40,14 +35,10 @@ import java.awt.Window;
 import javax.inject.Inject;
 import javax.swing.JButton;
 import javax.swing.JTabbedPane;
-import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 
-import net.miginfocom.layout.LayoutUtil;
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.listener.Handler;
-
 /**
  * About dialog.
  */
@@ -58,7 +49,6 @@ public class AboutDialog extends StandardDialog {
     private final AboutDialogModel model;
     private final DMDircMBassador eventBus;
     private final AggregateConfigProvider config;
-    private final PluginInfo pluginInfo;
 
     @Inject
     public AboutDialog(
@@ -66,16 +56,12 @@ public class AboutDialog extends StandardDialog {
             @MainWindow final Window parentWindow,
             final AboutDialogModel model,
             final URLHandler urlHandler,
-            final DMDircMBassador eventBus,
-            @PluginDomain(SwingController.class) final PluginInfo pluginInfo) {
+            final DMDircMBassador eventBus) {
         super(parentWindow, ModalityType.MODELESS);
         this.urlHandler = urlHandler;
         this.model = model;
         this.eventBus = eventBus;
         this.config = config;
-        this.pluginInfo = pluginInfo;
-
-        eventBus.subscribe(this);
         model.load();
         initComponents();
     }
@@ -103,19 +89,4 @@ public class AboutDialog extends StandardDialog {
         getContentPane().add(tabbedPane, "grow, push");
         getContentPane().add(getOkButton(), "right");
     }
-
-    @Handler
-    public void handleInfoRequest(final ClientInfoRequestEvent event) {
-        event.addInfoItem(InfoItem.create("Swing UI Version",
-                        pluginInfo.getMetaData().getVersion().toString()),
-                InfoItem.create("Look and Feel", UIManager.getLookAndFeel().getName()),
-                InfoItem.create("MiG Layout Version", LayoutUtil.getVersion())
-        );
-    }
-
-    @Override
-    public void dispose() {
-        eventBus.unsubscribe(this);
-        super.dispose();
-    }
 }