Merge pull request #423 from greboid/dev3

SLF4J some more logging statements in the Swing UI.

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

@@ -26,10 +26,8 @@ import com.dmdirc.ClientModule.GlobalConfig;
 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;
 
@@ -53,14 +51,20 @@ import javax.swing.JMenuBar;
 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. */
@@ -105,8 +109,7 @@ public class Apple implements InvocationHandler {
                 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);
             }
         }
     }
@@ -137,7 +140,7 @@ public class Apple implements InvocationHandler {
                     : 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

@@ -22,39 +22,37 @@
 
 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
@@ -64,7 +62,7 @@ public final class RedoAction extends AbstractAction {
                 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

@@ -24,12 +24,10 @@ package com.dmdirc.addons.ui_swing;
 
 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;
@@ -41,25 +39,27 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 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;
@@ -122,8 +122,7 @@ public class SwingUIInitialiser {
                         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

@@ -22,7 +22,6 @@
 
 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;
@@ -32,10 +31,8 @@ import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
 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;
@@ -47,6 +44,11 @@ import javax.annotation.Nullable;
 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.
  *
@@ -55,12 +57,11 @@ import javax.inject.Singleton;
 @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;
 
@@ -71,7 +72,6 @@ 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
      * @param swingEventBus           The swing event bus;
      */
     @Inject
@@ -80,9 +80,7 @@ public class SwingWindowFactory implements FrameListener {
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
-            final DMDircMBassador eventBus,
             final SwingEventBus swingEventBus) {
-        this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;
 
         registerImplementation(customFrameFactory);
@@ -137,8 +135,7 @@ public class SwingWindowFactory implements FrameListener {
      */
     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/UIUtilities.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
 import com.dmdirc.addons.ui_swing.components.RunnableLoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.RunnableSwingWorker;
@@ -91,10 +90,9 @@ public final class UIUtilities {
     /**
      * Adds an undo manager and associated key bindings to the specified text component.
      *
-     * @param eventBus  The event bus to post errors to
      * @param component The text component to add an undo manager to
      */
-    public static void addUndoManager(final DMDircMBassador eventBus, final JTextComponent component) {
+    public static void addUndoManager(final JTextComponent component) {
         final UndoManager undoManager = new UndoManager();
 
         // Listen for undo and redo events
@@ -102,13 +100,13 @@ public final class UIUtilities {
                 new DMDircUndoableEditListener(undoManager));
 
         // Create an undo action and add it to the text component
-        component.getActionMap().put("Undo", new UndoAction(eventBus, undoManager));
+        component.getActionMap().put("Undo", new UndoAction(undoManager));
 
         // Bind the undo action to ctl-Z
         component.getInputMap().put(KeyStroke.getKeyStroke("control Z"), "Undo");
 
         // Create a redo action and add it to the text component
-        component.getActionMap().put("Redo", new RedoAction(eventBus, undoManager));
+        component.getActionMap().put("Redo", new RedoAction(undoManager));
 
         // Bind the redo action to ctl-Y
         component.getInputMap().put(KeyStroke.getKeyStroke("control Y"), "Redo");

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

@@ -22,39 +22,37 @@
 
 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
@@ -64,7 +62,7 @@ public final class UndoAction extends AbstractAction {
                 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

@@ -22,9 +22,7 @@
 
 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;
@@ -35,11 +33,15 @@ import java.io.IOException;
 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. */
@@ -48,22 +50,18 @@ public final class ReplacePasteAction extends AbstractAction {
     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;
@@ -83,12 +81,9 @@ public final class ReplacePasteAction extends AbstractAction {
             ((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/TopicBar.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -136,8 +135,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
             final GroupChat channel,
             final ChannelFrame window,
             final IconManager iconManager,
-            final TabCompleterUtils tabCompleterUtils,
-            final DMDircMBassador eventBus) {
+            final TabCompleterUtils tabCompleterUtils) {
         this.channel = channel;
         this.domain = domain;
         this.colourManager = colourManager;
@@ -151,7 +149,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
                 new NewlinesDocumentFilter());
 
         topicText.getActionMap().put("paste-from-clipboard",
-                new ReplacePasteAction(eventBus, clipboard, "(\r\n|\n|\r)", " "));
+                new ReplacePasteAction(clipboard, "(\r\n|\n|\r)", " "));
         topicEdit = new ImageButton<>("edit",
                 iconManager.getIcon("edit-inactive"),
                 iconManager.getIcon("edit"));

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBarFactory.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
@@ -56,7 +55,6 @@ public class TopicBarFactory {
     private final ServiceManager serviceManager;
     private final Clipboard clipboard;
     private final CommandController commandController;
-    private final DMDircMBassador eventBus;
     private final TabCompleterUtils tabCompleterUtils;
     private final IconManager iconManager;
 
@@ -69,7 +67,6 @@ public class TopicBarFactory {
             final ServiceManager serviceManager,
             final Clipboard clipboard,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
             final TabCompleterUtils tabCompleterUtils,
             final IconManager iconManager) {
         this.parentWindow = parentWindow;
@@ -79,7 +76,6 @@ public class TopicBarFactory {
         this.serviceManager = serviceManager;
         this.clipboard = clipboard;
         this.commandController = commandController;
-        this.eventBus = eventBus;
         this.tabCompleterUtils = tabCompleterUtils;
         this.iconManager = iconManager;
     }
@@ -90,7 +86,7 @@ public class TopicBarFactory {
         return new TopicBar(parentWindow.get(), globalConfig, domain,
                 colourManagerFactory.getColourManager(channel.getWindowModel().getConfigManager()),
                 serviceManager, clipboard, commandController, channel, window, iconManager,
-                tabCompleterUtils, eventBus);
+                tabCompleterUtils);
     }
 
 }

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

@@ -172,7 +172,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow, M
      * Initialises the input field.
      */
     private void initInputField() {
-        UIUtilities.addUndoManager(eventBus, getInputField().getTextField());
+        UIUtilities.addUndoManager(getInputField().getTextField());
 
         getInputField().getActionMap().put("paste", inputTextFramePasteActionFactory
                 .getInputTextFramePasteAction(this, inputField, getContainer()));

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

@@ -25,9 +25,7 @@ package com.dmdirc.addons.ui_swing.components.frames;
 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;
@@ -39,11 +37,17 @@ import java.io.IOException;
 
 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. */
@@ -94,8 +98,7 @@ public final class InputTextFramePasteAction extends AbstractAction {
                 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;
         }
 
@@ -105,11 +108,11 @@ public final class InputTextFramePasteAction extends AbstractAction {
             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/aliases/AliasManagerDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -55,7 +54,6 @@ public class AliasManagerDialog extends StandardDialog {
     private static final long serialVersionUID = 1;
     private final AliasDialogModel model;
     private final IconManager iconManager;
-    private final DMDircMBassador eventBus;
     private JList<Alias> aliasList;
     private JTextField command;
     private JSpinner argumentsNumber;
@@ -66,11 +64,10 @@ public class AliasManagerDialog extends StandardDialog {
 
     @Inject
     public AliasManagerDialog(@MainWindow final Window mainFrame, final AliasDialogModel model,
-            final IconManager iconManager, final DMDircMBassador eventBus) {
+            final IconManager iconManager) {
         super(mainFrame, ModalityType.DOCUMENT_MODAL);
         this.model = model;
         this.iconManager = iconManager;
-        this.eventBus = eventBus;
         initComponents();
         layoutComponents();
     }
@@ -78,7 +75,7 @@ public class AliasManagerDialog extends StandardDialog {
     @Override
     public void display() {
         final AliasManagerLinker linker = new AliasManagerLinker(model, this, iconManager);
-        UIUtilities.addUndoManager(eventBus, response);
+        UIUtilities.addUndoManager(response);
         linker.bindCommandList(aliasList);
         linker.bindCommand(command);
         linker.bindArgumentsNumber(argumentsNumber);

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -48,6 +47,7 @@ import java.awt.event.ActionListener;
 import javax.swing.JButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
@@ -90,8 +90,6 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     private final Clipboard clipboard;
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
     /** Colour manager factory. */
     private final ColourManagerFactory colourManagerFactory;
 
@@ -108,7 +106,6 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * @param parentWindow       Parent window
      * @param clipboard          Clipboard to copy and paste from
      * @param commandController  The controller to use to retrieve command information.
-     * @param eventBus           The event bus to post errors to.
      */
     public ChannelSettingsDialog(
             final IdentityFactory identityFactory,
@@ -121,7 +118,6 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils,
             final IconManager iconManager) {
@@ -134,7 +130,6 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         this.channel = checkNotNull(groupChat);
         this.clipboard = clipboard;
         this.commandController = checkNotNull(commandController);
-        this.eventBus = eventBus;
         this.colourManagerFactory = colourManagerFactory;
         this.iconManager = iconManager;
 
@@ -178,7 +173,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     private void initTopicTab(final TabCompleterUtils tabCompleterUtils) {
         topicModesPane = new TopicPane(channel, iconManager,
                 commandController, serviceManager,
-                this, channelWindow, clipboard, eventBus, colourManagerFactory, tabCompleterUtils);
+                this, channelWindow, clipboard, colourManagerFactory, tabCompleterUtils);
         tabbedPane.addTab("Topic", topicModesPane);
     }
 
@@ -187,7 +182,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         channelModesPane = new ChannelModesPane(channel, iconManager);
 
         final JScrollPane channelModesSP = new JScrollPane(channelModesPane);
-        channelModesSP.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        channelModesSP.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         channelModesSP.setOpaque(UIUtilities.getTabbedPaneOpaque());
         channelModesSP.getViewport().setOpaque(UIUtilities.getTabbedPaneOpaque());
         channelModesSP.setBorder(null);

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
@@ -71,8 +70,6 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
     private final int topicLengthMax;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
     /** label showing the number of characters left in a topic. */
     private JLabel topicLengthLabel;
     /** Topic text entry text area. */
@@ -91,12 +88,11 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
      * @param channelWindow     Channel window
      * @param clipboard         Clipboard to copy and paste
      * @param commandController The controller to use to retrieve command information.
-     * @param eventBus          The event bus to post errors to.
      */
     public TopicDisplayPane(final GroupChat groupChat, final IconManager iconManager,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
-            final CommandController commandController, final DMDircMBassador eventBus,
+            final CommandController commandController,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
         this.clipboard = clipboard;
@@ -104,7 +100,6 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         this.parent = parent;
         topicLengthMax = groupChat.getConnection().get().getParser().get().getMaxTopicLength();
         this.channelWindow = channelWindow;
-        this.eventBus = eventBus;
 
         initComponents(iconManager, groupChat.getWindowModel().getConfigManager(), serviceManager,
                 commandController, colourManagerFactory, tabCompleterUtils);
@@ -137,13 +132,13 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         handler.setTabCompleter(groupChat.getWindowModel().getTabCompleter());
 
         topicText.getActionMap().put("paste-from-clipboard",
-                new ReplacePasteAction(eventBus, clipboard, "(\r\n|\n|\r)", " "));
+                new ReplacePasteAction(clipboard, "(\r\n|\n|\r)", " "));
         topicText.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,
                 0), new TopicEnterAction(parent));
         topicText.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,
                 UIUtilities.getCtrlDownMask()), new TopicEnterAction(parent));
 
-        UIUtilities.addUndoManager(eventBus, topicText);
+        UIUtilities.addUndoManager(topicText);
     }
 
     /** Adds listeners to the components. */

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -70,13 +69,11 @@ public class TopicPane extends JPanel implements ActionListener {
      * @param parent            Parent dialog
      * @param channelWindow     Channel window
      * @param clipboard         Clipboard to copy and paste with
-     * @param eventBus          The event bus to post errors to
      */
     public TopicPane(final GroupChat groupChat, final IconManager iconManager,
             final CommandController commandController,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
-            final DMDircMBassador eventBus,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
         setOpaque(UIUtilities.getTabbedPaneOpaque());
@@ -88,8 +85,8 @@ public class TopicPane extends JPanel implements ActionListener {
         setVisible(false);
 
         removeAll();
-        initTopicsPanel(iconManager, serviceManager, commandController, eventBus,
-                colourManagerFactory, tabCompleterUtils);
+        initTopicsPanel(iconManager, serviceManager, commandController, colourManagerFactory,
+                tabCompleterUtils);
         layoutComponents();
 
         topicHistoryPane.addActionListener(this);
@@ -101,11 +98,10 @@ public class TopicPane extends JPanel implements ActionListener {
             final IconManager iconManager,
             final ServiceManager serviceManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
         topicDisplayPane = new TopicDisplayPane(groupChat, iconManager, serviceManager, parent,
-                channelWindow, clipboard, commandController, eventBus, colourManagerFactory,
+                channelWindow, clipboard, commandController, colourManagerFactory,
                 tabCompleterUtils);
         topicHistoryPane = new TopicHistoryPane(groupChat);
     }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -137,7 +137,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         editButton = new JButton("Edit");
         infoLabel = new TextLabel();
 
-        UIUtilities.addUndoManager(eventBus, textField);
+        UIUtilities.addUndoManager(textField);
 
         orderButtons(new JButton(), new JButton());
         getOkButton().setText("Send");

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

@@ -24,16 +24,13 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 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;
@@ -54,12 +51,18 @@ import javax.swing.JScrollPane;
 
 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. */
@@ -80,8 +83,6 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     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.
@@ -90,20 +91,17 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      * @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();
@@ -164,8 +162,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         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

@@ -23,7 +23,6 @@
 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;
@@ -38,9 +37,8 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 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;
@@ -58,6 +56,9 @@ import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -66,6 +67,7 @@ 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. */
@@ -74,16 +76,12 @@ public class CtrlTabWindowManager {
     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();
@@ -146,9 +144,8 @@ public class CtrlTabWindowManager {
             }
             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

@@ -39,15 +39,14 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 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;
@@ -70,6 +69,9 @@ import javax.swing.tree.TreePath;
 
 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;
 
@@ -78,6 +80,7 @@ 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. */
@@ -195,9 +198,8 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             }
             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));
             }

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -222,8 +222,8 @@ public class DialogModule {
             protected ChannelSettingsDialog getInstance(final GroupChat key) {
                 return new ChannelSettingsDialog(identityFactory, windowFactory,
                         userConfig, serviceManager, preferencesManager, compFactory, key,
-                        parentWindow, clipboard, commandController, eventBus,
-                        colourManagerFactory, tabCompleterUtils, iconManager);
+                        parentWindow, clipboard, commandController, colourManagerFactory,
+                        tabCompleterUtils, iconManager);
             }
         };
     }