Event bus logging.

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

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

@@ -26,9 +26,9 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.events.ClientOpenedEvent;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
@@ -104,7 +104,8 @@ public class Apple implements InvocationHandler {
                 registerOpenURLCallback();
                 eventBus.register(this);
             } catch (UnsatisfiedLinkError ule) {
-                Logger.appError(ErrorLevel.MEDIUM, "Unable to load JNI library.", ule);
+                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                        ule, "Unable to load JNI library", ""));
             }
         }
     }
@@ -135,7 +136,7 @@ public class Apple implements InvocationHandler {
                     : classes);
             return method.invoke(obj, objects == null ? new Object[0] : objects);
         } catch (ReflectiveOperationException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to find OS X classes");
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to find OS X classes.", ""));
         }
 
         return null;

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

@@ -25,10 +25,12 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.ClientModule.AddonConfig;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+
+import com.google.common.eventbus.EventBus;
 
 import java.awt.Font;
 import java.awt.KeyboardFocusManager;
@@ -50,13 +52,15 @@ public class SwingUIInitialiser {
     private final ConfigProvider addonConfig;
     private final DialogKeyListener dialogKeyListener;
     private final DMDircEventQueue eventQueue;
+    private final EventBus eventBus;
 
     @Inject
-    public SwingUIInitialiser(final Apple apple,
+    public SwingUIInitialiser(final EventBus eventBus, final Apple apple,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @AddonConfig final ConfigProvider addonConfig,
             final DialogKeyListener dialogKeyListener,
             final DMDircEventQueue eventQueue) {
+        this.eventBus = eventBus;
         this.apple = apple;
         this.globalConfig = globalConfig;
         this.addonConfig = addonConfig;
@@ -122,7 +126,8 @@ public class SwingUIInitialiser {
                             Font.PLAIN, 12));
                 } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
                         IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
+                    eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                            "Unable to set UI Settings", ""));
                 }
 
                 if ("Metal".equals(UIManager.getLookAndFeel().getName())

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

@@ -29,11 +29,13 @@ import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ServerFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.util.collections.ListenerList;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -60,6 +62,8 @@ public class SwingWindowFactory implements FrameListener {
     private final Provider<ActiveFrameManager> activeFrameManager;
     /** Our list of listeners. */
     private final ListenerList listeners = new ListenerList();
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new window factory for the specified controller.
@@ -69,6 +73,7 @@ public class SwingWindowFactory implements FrameListener {
      * @param customInputFrameFactory The factory to use to produce custom input frames.
      * @param serverFrameFactory      The factory to use to produce server frames.
      * @param channelFrameFactory     The factory to use to produce channel frames.
+     * @param eventBus                The event bus to post errors to
      */
     @Inject
     public SwingWindowFactory(
@@ -76,8 +81,10 @@ public class SwingWindowFactory implements FrameListener {
             final CustomFrameFactory customFrameFactory,
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
-            final ChannelFrameFactory channelFrameFactory) {
+            final ChannelFrameFactory channelFrameFactory,
+            final EventBus eventBus) {
         this.activeFrameManager = activeFrameManager;
+        this.eventBus = eventBus;
 
         registerImplementation(customFrameFactory);
         registerImplementation(customInputFrameFactory);
@@ -131,7 +138,8 @@ public class SwingWindowFactory implements FrameListener {
      */
     protected TextFrame doAddWindow(final FrameContainer window) {
         if (!implementations.containsKey(window.getComponents())) {
-            Logger.userError(ErrorLevel.HIGH, "Unable to create window: Unknown type");
+            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, null,
+                    "Unable to create window: Unknown type.", ""));
             return null;
         }