EventBus some more logging.

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

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -35,10 +35,12 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+
+import com.google.common.eventbus.EventBus;
 
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
@@ -57,8 +59,7 @@ import javax.swing.tree.TreeSelectionModel;
  * A Window manager to handle ctrl[+shift]+tab switching between windows.
  */
 @Singleton
-public class CtrlTabWindowManager implements SwingWindowListener,
-        SelectionListener {
+public class CtrlTabWindowManager implements SwingWindowListener, SelectionListener {
 
     /** Node storage, used for adding and deleting nodes correctly. */
     private final Map<Window, TreeViewNode> nodes;
@@ -68,21 +69,26 @@ public class CtrlTabWindowManager implements SwingWindowListener,
     private final TreeScroller treeScroller;
     /** Selection model for the tree scroller. */
     private final TreeSelectionModel selectionModel;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new ctrl tab window manager.
      *
      * @param globalConfig       The configuration to read settings from.
      * @param windowFactory      The window factory to use to create and listen for windows.
-     * @param mainFrame     The main frame that owns this window manager
+     * @param mainFrame          The main frame that owns this window manager
      * @param activeFrameManager Active frame manager.
+     * @param eventBus           The eventBus to post errors to
      */
     @Inject
     public CtrlTabWindowManager(
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final SwingWindowFactory windowFactory,
             final ActiveFrameManager activeFrameManager,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame,
+            final EventBus eventBus) {
+        this.eventBus = eventBus;
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));
         selectionModel = new DefaultTreeSelectionModel();
@@ -126,8 +132,7 @@ public class CtrlTabWindowManager implements SwingWindowListener,
 
             @Override
             public void run() {
-                final TreeViewNode node = new TreeViewNode(null, window.
-                        getContainer());
+                final TreeViewNode node = new TreeViewNode(null, window.getContainer());
                 synchronized (nodes) {
                     nodes.put(window, node);
                 }
@@ -144,15 +149,14 @@ public class CtrlTabWindowManager implements SwingWindowListener,
 
             @Override
             public void run() {
-                if (nodes == null || nodes.get(window) == null) {
+                if (nodes.get(window) == null) {
                     return;
                 }
                 final TreeViewNode node = nodes.get(window);
                 if (node.getLevel() == 0) {
-                    Logger.appError(ErrorLevel.MEDIUM,
-                            "delServer triggered for root node"
-                            + node.toString(),
-                            new IllegalArgumentException());
+                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                            new IllegalArgumentException(),
+                            "delServer triggered for root node" + node.toString(), ""));
                 } else {
                     model.removeNodeFromParent(nodes.get(window));
                 }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -31,17 +31,19 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
@@ -65,9 +67,8 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Manages open windows in the application in a tree style view.
  */
-public class TreeFrameManager implements FrameManager,
-        Serializable, ConfigChangeListener, NotificationListener,
-        FrameInfoListener {
+public class TreeFrameManager implements FrameManager, Serializable, ConfigChangeListener,
+        NotificationListener, FrameInfoListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 5;
@@ -89,6 +90,8 @@ public class TreeFrameManager implements FrameManager,
     private final WindowManager windowManager;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of the TreeFrameManager.
@@ -99,6 +102,7 @@ public class TreeFrameManager implements FrameManager,
      * @param activeFrameManager The active window manager
      * @param windowFactory      The factory to use to retrieve swing windows.
      * @param domain             The domain to read settings from.
+     * @param eventBus           The event bus to post errors to
      */
     @Inject
     public TreeFrameManager(
@@ -107,13 +111,15 @@ public class TreeFrameManager implements FrameManager,
             final ColourManager colourManager,
             final ActiveFrameManager activeFrameManager,
             final SwingWindowFactory windowFactory,
-            @PluginDomain(SwingController.class) final String domain) {
+            @PluginDomain(SwingController.class) final String domain,
+            final EventBus eventBus) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.nodes = new HashMap<>();
         this.config = globalConfig;
         this.colourManager = colourManager;
         this.activeFrameManager = activeFrameManager;
+        this.eventBus = eventBus;
 
         UIUtilities.invokeLater(new Runnable() {
             @Override
@@ -186,15 +192,14 @@ public class TreeFrameManager implements FrameManager,
 
             @Override
             public void run() {
-                if (nodes == null || nodes.get(window.getContainer()) == null) {
+                if (nodes.get(window.getContainer()) == null) {
                     return;
                 }
                 final DefaultMutableTreeNode node = nodes.get(window.getContainer());
                 if (node.getLevel() == 0) {
-                    Logger.appError(ErrorLevel.MEDIUM,
-                            "delServer triggered for root node"
-                            + node.toString(),
-                            new IllegalArgumentException());
+                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                            new IllegalArgumentException(),
+                            "delServer triggered for root node" + node.toString(), ""));
                 } else {
                     model.removeNodeFromParent(nodes.get(window.getContainer()));
                 }
@@ -321,8 +326,7 @@ public class TreeFrameManager implements FrameManager,
 
                 for (FrameContainer window : windowManager.getRootWindows()) {
                     addWindow(null, window);
-                    final Collection<FrameContainer> childWindows = window
-                            .getChildren();
+                    final Collection<FrameContainer> childWindows = window.getChildren();
                     for (FrameContainer childWindow : childWindows) {
                         addWindow(nodes.get(window), childWindow);
                     }

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -34,13 +34,15 @@ import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.FirstRunWizard;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Dialog.ModalityType;
 import java.awt.Dimension;
 import java.awt.Window;
@@ -67,6 +69,8 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
     private final String actionsDirectory;
     /** Provider to use to obtain PMDs. */
     private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Instantiate the wizard.
@@ -77,22 +81,23 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
      * @param pluginExtractor       Plugin extractor to use.
      * @param iconManager           Manager to use to find icons.
      * @param profileDialogProvider Provider to use to obtain PMDs.
+     * @param eventBus              The event bus to post errors to.
      */
     @Inject
-    public SwingFirstRunWizard(
-            @MainWindow final Window parentWindow,
+    public SwingFirstRunWizard(@MainWindow final Window parentWindow,
             @UserConfig final ConfigProvider config,
             @Directory(DirectoryType.ACTIONS) final String actionsDirectory,
-            final CorePluginExtractor pluginExtractor,
-            @GlobalConfig final IconManager iconManager,
-            final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
+            final CorePluginExtractor pluginExtractor, @GlobalConfig final IconManager iconManager,
+            final DialogProvider<ProfileManagerDialog> profileDialogProvider,
+            final EventBus eventBus) {
         this.corePluginExtractor = pluginExtractor;
         this.config = config;
         this.actionsDirectory = actionsDirectory;
         this.profileDialogProvider = profileDialogProvider;
+        this.eventBus = eventBus;
 
-        wizardDialog = new WizardDialog("Setup wizard", new ArrayList<Step>(),
-                parentWindow, ModalityType.APPLICATION_MODAL);
+        wizardDialog = new WizardDialog("Setup wizard", new ArrayList<Step>(), parentWindow,
+                ModalityType.APPLICATION_MODAL);
         wizardDialog.setIconImage(iconManager.getImage("icon"));
         wizardDialog.addWizardListener(this);
         if (Apple.isAppleUI()) {
@@ -147,25 +152,25 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
                 getResourcesStartingWithAsBytes("com/dmdirc/actions/defaults");
         for (Entry<String, byte[]> resource : resources.entrySet()) {
             try {
-                final String resourceName = actionsDirectory + resource.getKey()
-                        .substring(27, resource.getKey().length());
-                final File newDir = new File(resourceName.substring(0,
-                        resourceName.lastIndexOf('/')) + "/");
+                final String resourceName = actionsDirectory +
+                        resource.getKey().substring(27, resource.getKey().length());
+                final File newDir =
+                        new File(resourceName.substring(0, resourceName.lastIndexOf('/')) + "/");
 
                 if (!newDir.exists()) {
                     newDir.mkdirs();
                 }
 
-                final File newFile = new File(newDir,
-                        resourceName.substring(resourceName.lastIndexOf('/') + 1,
-                                resourceName.length()));
+                final File newFile = new File(newDir, resourceName
+                        .substring(resourceName.lastIndexOf('/') + 1, resourceName.length()));
 
                 if (!newFile.isDirectory()) {
                     ResourceManager.getResourceManager().
                             resourceToFile(resource.getValue(), newFile);
                 }
             } catch (IOException ex) {
-                Logger.userError(ErrorLevel.LOW, "Failed to extract actions");
+                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                        "Failed to extract actions", ""));
             }
         }
     }