SLF4J some more Logging statements in the Swing UI.

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

 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.events.ClientOpenedEvent;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
 import javax.swing.JMenuItem;
 import javax.swing.UIManager;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.engio.mbassy.listener.Handler;
 
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Integrate DMDirc with OS X better.
  */
 @Singleton
 public class Apple implements InvocationHandler {
 
+    private static final Logger LOG = LoggerFactory.getLogger(Apple.class);
     /** Store any addresses that are opened before CLIENT_OPENED. */
     private final Collection<URI> addresses = new ArrayList<>();
     /** Config manager used to read settings. */
                 registerOpenURLCallback();
                 eventBus.subscribe(this);
             } catch (UnsatisfiedLinkError ule) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM,
-                        ule, "Unable to load JNI library", ""));
+                LOG.warn(USER_ERROR, "Unable to load JNI library", ule);
             }
         }
     }
                     : classes);
             return method.invoke(obj, objects == null ? new Object[0] : objects);
         } catch (ReflectiveOperationException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to find OS X classes.", ""));
+            LOG.info(USER_ERROR, "Unable to find OS X classes.", ex);
         }
 
         return null;

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

 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Handles redo's on text components.
  */
 public final class RedoAction extends AbstractAction {
 
+    private static final Logger LOG = LoggerFactory.getLogger(RedoAction.class);
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Undo manager. */
     private final UndoManager undoManager;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of RedoAction.
      *
-     * @param eventBus    The event bus to post errors to
      * @param undoManager UndoManager to use for this redo action
      */
-    public RedoAction(final DMDircMBassador eventBus, final UndoManager undoManager) {
+    public RedoAction(final UndoManager undoManager) {
         super("Undo");
 
         this.undoManager = undoManager;
-        this.eventBus = eventBus;
     }
 
     @Override
                 undoManager.redo();
             }
         } catch (CannotUndoException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to redo", ""));
+            LOG.info(USER_ERROR, "Unable to redo", ex);
         }
     }
 

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

 
 import com.dmdirc.ClientModule.AddonConfig;
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 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.util.LogUtils;
 
 import java.awt.Font;
 import java.awt.KeyboardFocusManager;
 
 import net.miginfocom.layout.PlatformDefaults;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Initialises swing and system UI settings.
  */
 public class SwingUIInitialiser {
 
+    private static final Logger LOG = LoggerFactory.getLogger(SwingUIInitialiser.class);
     private final Apple apple;
     private final AggregateConfigProvider globalConfig;
     private final ConfigProvider addonConfig;
     private final DialogKeyListener dialogKeyListener;
     private final DMDircEventQueue eventQueue;
-    private final DMDircMBassador eventBus;
 
     @Inject
-    public SwingUIInitialiser(final DMDircMBassador eventBus, final Apple apple,
+    public SwingUIInitialiser(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;
                         Font.PLAIN, 12));
             } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
                     IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                        "Unable to set UI Settings", ""));
+                LOG.info(LogUtils.USER_ERROR, "Unable to set UI settings", ex);
             }
 
             if ("Metal".equals(UIManager.getLookAndFeel().getName())

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

 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrameFactory;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.FrameListener;
-import com.dmdirc.logger.ErrorLevel;
 
 import java.util.Collection;
 import java.util.HashMap;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Handles creation of windows in the Swing UI.
  *
 @Singleton
 public class SwingWindowFactory implements FrameListener {
 
+    private static final Logger LOG = LoggerFactory.getLogger(SwingWindowFactory.class);
     /** A map of known implementations of window interfaces. */
     private final Map<Collection<String>, WindowProvider> implementations = new HashMap<>();
     /** A map of frame containers to their Swing windows. */
     private final Map<WindowModel, TextFrame> windows = new HashMap<>();
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
     /** The swing event bus. */
     private final SwingEventBus swingEventBus;
 
      * @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
      * @param swingEventBus           The swing event bus;
      */
     @Inject
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
-            final DMDircMBassador eventBus,
             final SwingEventBus swingEventBus) {
-        this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;
 
         registerImplementation(customFrameFactory);
      */
     protected TextFrame doAddWindow(final WindowModel window) {
         if (!implementations.containsKey(window.getComponents())) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, null,
-                    "Unable to create window: Unknown type.", ""));
+            LOG.error(USER_ERROR, "Unable to create window: Unknown type.");
             return null;
         }
 

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

 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Handles undo's on text components.
  */
 public final class UndoAction extends AbstractAction {
 
+    private static final Logger LOG = LoggerFactory.getLogger(UndoAction.class);
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Undo manager. */
     private final UndoManager undoManager;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of UndoAction.
      *
-     * @param eventBus    The event bus to post errors to
      * @param undoManager UndoManager to use for this redo action
      */
-    public UndoAction(final DMDircMBassador eventBus, final UndoManager undoManager) {
+    public UndoAction(final UndoManager undoManager) {
         super("Undo");
 
         this.undoManager = undoManager;
-        this.eventBus = eventBus;
     }
 
     @Override
                 undoManager.undo();
             }
         } catch (CannotUndoException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to undo", ""));
+            LOG.info(USER_ERROR, "Unable to undo", ex);
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/actions/ReplacePasteAction.java

 
 package com.dmdirc.addons.ui_swing.actions;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.util.LogUtils;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import javax.swing.AbstractAction;
 import javax.swing.text.JTextComponent;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Paste action that replaces matching regexes.
  */
 public final class ReplacePasteAction extends AbstractAction {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ReplacePasteAction.class);
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Clipboard to handle pasting. */
     private final String replacementRegex;
     /** Replacement string. */
     private final String replacementString;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of regex replacement paste action.
      *
-     * @param eventBus          The event bus to post errors to
      * @param clipboard         Clipboard to handle pasting
      * @param replacementRegex  Regex to match for replacement
      * @param replacementString Replacement string
      */
-    public ReplacePasteAction(final DMDircMBassador eventBus, final Clipboard clipboard,
+    public ReplacePasteAction(final Clipboard clipboard,
             final String replacementRegex, final String replacementString) {
         super("NoSpacesPasteAction");
 
-        this.eventBus = eventBus;
         this.clipboard = clipboard;
         this.replacementRegex = replacementRegex;
         this.replacementString = replacementString;
             ((JTextComponent) e.getSource()).replaceSelection(
                     ((String) clipboard.getData(DataFlavor.stringFlavor))
                             .replaceAll(replacementRegex, replacementString));
-        } catch (IOException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unable to get clipboard contents: " + ex.getMessage(), ""));
-        } catch (UnsupportedFlavorException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unable to get clipboard contents", ""));
+        } catch (IOException | UnsupportedFlavorException ex) {
+            LOG.info(LogUtils.USER_ERROR, "Unable to get clipboard contents: {}",
+                    ex.getMessage(), ex);
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/InputTextFramePasteAction.java

 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.logger.ErrorLevel;
 
 import java.awt.Toolkit;
 import java.awt.Window;
 
 import javax.swing.AbstractAction;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Paste action for input frames.
  */
 public final class InputTextFramePasteAction extends AbstractAction {
 
+    private static final Logger LOG = LoggerFactory.getLogger(InputTextFramePasteAction.class);
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Clipboard to paste from. */
                 return;
             }
         } catch (final IllegalStateException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unable to paste from clipboard.", ""));
+            LOG.info(USER_ERROR, "Unable to paste from clipboard.", ex);
             return;
         }
 
             doPaste((String) Toolkit.getDefaultToolkit()
                     .getSystemClipboard().getData(DataFlavor.stringFlavor));
         } catch (final IOException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unable to get clipboard contents: " + ex.getMessage(), ""));
+            LOG.info(USER_ERROR, "Unable to get clipboard contents: {}",
+                    ex.getMessage(), ex);
         } catch (final UnsupportedFlavorException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
-                    "Unsupported clipboard type", ""));
+            LOG.info(USER_ERROR, "Unsupported clipboard type: {}",
+                    ex.getMessage(), ex);
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateConfigPanel.java

 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
 
 import net.miginfocom.swing.MigLayout;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Updates configuration UI.
  */
 public class UpdateConfigPanel extends JPanel implements ActionListener,
         PreferencesInterface, ConfigChangeListener {
 
+    private static final Logger LOG = LoggerFactory.getLogger(UpdateConfigPanel.class);
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Global checkbox. */
     private final CachingUpdateManager updateManager;
     /** Controller to pass to the update checker. */
     private final IdentityController identityController;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new update config panel.
      * @param globalConfig       The configuration to read global settings from.
      * @param updateManager      The manager to read update information from.
      * @param identityController Controller to pass to the update checker.
-     * @param eventBus           The event bus to post the errors to
      */
     @Inject
     public UpdateConfigPanel(
             @UserConfig final ConfigProvider userConfig,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CachingUpdateManager updateManager,
-            final IdentityController identityController,
-            final DMDircMBassador eventBus) {
+            final IdentityController identityController) {
         this.userConfig = userConfig;
         this.globalConfig = globalConfig;
         this.updateManager = updateManager;
         this.identityController = identityController;
-        this.eventBus = eventBus;
 
         initComponents();
         loadModel();
         try {
             channel = UpdateChannel.valueOf(globalConfig.getOption("updater", "channel"));
         } catch (IllegalArgumentException e) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
-                    "Invalid setting for update channel, defaulting to none.", ""));
+            LOG.info(USER_ERROR, "Invalid setting for update channel, defaulting to none.", e);
         }
         updateChannel.setSelectedItem(channel);
         scrollPane.setViewportView(table);

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

 package com.dmdirc.addons.ui_swing.framemanager.ctrltab;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.util.LogUtils;
 
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.engio.mbassy.listener.Handler;
 
 /**
 @Singleton
 public class CtrlTabWindowManager {
 
+    private static final Logger LOG = LoggerFactory.getLogger(CtrlTabWindowManager.class);
     /** Node storage, used for adding and deleting nodes correctly. */
     private final Map<TextFrame, TreeViewNode> nodes;
     /** Data model. */
     private final TreeScroller treeScroller;
     /** Selection model for the tree scroller. */
     private final TreeSelectionModel selectionModel;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     @Inject
     public CtrlTabWindowManager(
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final MainFrame mainFrame,
-            final DMDircMBassador eventBus,
             final SwingEventBus swingEventBus) {
-        this.eventBus = eventBus;
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));
         selectionModel = new DefaultTreeSelectionModel();
             }
             final TreeViewNode node = nodes.get(window);
             if (node.getLevel() == 0) {
-                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM,
-                        new IllegalArgumentException(),
-                        "delServer triggered for root node" + node, ""));
+                LOG.warn(LogUtils.USER_ERROR, "delServer triggered for root node {}",
+                        node, new IllegalArgumentException());
             } else {
                 model.removeNodeFromParent(nodes.get(window));
             }

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

 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.LogUtils;
 
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 
 import net.miginfocom.swing.MigLayout;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.engio.mbassy.listener.Handler;
 import net.engio.mbassy.listener.Invoke;
 
  */
 public class TreeFrameManager implements FrameManager, Serializable, ConfigChangeListener {
 
+    private static final Logger LOG = LoggerFactory.getLogger(TreeFrameManager.class);
     /** Serial version UID. */
     private static final long serialVersionUID = 5;
     /** node storage, used for adding and deleting nodes correctly. */
             }
             final DefaultMutableTreeNode node = nodes.get(window);
             if (node.getLevel() == 0) {
-                eventBus.publishAsync(
-                        new UserErrorEvent(ErrorLevel.MEDIUM, new IllegalArgumentException(),
-                                "delServer triggered for root node" + node, ""));
+                LOG.warn(LogUtils.USER_ERROR, "delServer triggered for root node {}",
+                        node, new IllegalArgumentException());
             } else {
                 model.removeNodeFromParent(nodes.get(window));
             }