SLF4J Logging in the Swing UI.

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

@@ -262,41 +262,36 @@ public final class UIUtilities {
     /**
      * Invokes something off the EDT, logging any exceptions that occur.
      *
-     * @param eventBus Eventbus to post errors to
      * @param runnable Runnable to execute off the EDT
      */
-    public static void invokeOffEDT(final DMDircMBassador eventBus, final Runnable runnable) {
-        new RunnableLoggingSwingWorker<Void, Void>(eventBus, runnable).execute();
+    public static void invokeOffEDT(final Runnable runnable) {
+        new RunnableLoggingSwingWorker<Void, Void>(runnable).execute();
     }
 
     /**
      * Invokes something off the EDT, handling the result when its finished on the EDT, logging
      * any exceptions that occur.
      *
-     * @param eventBus Eventbus to post errors to
      * @param runnable Runnable to execute off the EDT
      * @param consumer Consumer to finalise the runnable on the EDT
      *
      * @param <T>      Type the consumer takes
      */
-    public static <T> void invokeOffEDT(final DMDircMBassador eventBus, final Runnable runnable,
-            final Consumer<T> consumer) {
-        new RunnableLoggingSwingWorker<>(eventBus, runnable, consumer).execute();
+    public static <T> void invokeOffEDT(final Runnable runnable, final Consumer<T> consumer) {
+        new RunnableLoggingSwingWorker<>(runnable, consumer).execute();
     }
 
     /**
      * Invokes something off the EDT, handling the result when its finished on the EDT, logging
      * any exceptions that occur.
      *
-     * @param eventBus Eventbus to post errors to
      * @param runnable Runnable to execute off the EDT
      * @param consumer Consumer to finalise the runnable on the EDT
      *
      * @param <T>      Type the consumer takes
      */
-    public static <T> void invokeOffEDT(final DMDircMBassador eventBus, final Supplier<T> runnable,
-            final Consumer<T> consumer) {
-        new SupplierLoggingSwingWorker<>(eventBus, runnable, consumer).execute();
+    public static <T> void invokeOffEDT(final Supplier<T> runnable, final Consumer<T> consumer) {
+        new SupplierLoggingSwingWorker<>(runnable, consumer).execute();
     }
 
     /**

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

@@ -60,7 +60,7 @@ public class FontPicker extends JComboBox<Object> {
         this.fontFamily = fontFamily;
 
         setRenderer(new FontListCellRenderer(getRenderer()));
-        UIUtilities.invokeOffEDT(eventBus, this::getFonts, this::loadFonts);
+        UIUtilities.invokeOffEDT(this::getFonts, this::loadFonts);
     }
 
     /**

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

@@ -22,14 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.SwingWorker;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Logging swing worker.
  *
@@ -38,16 +37,7 @@ import javax.swing.SwingWorker;
  */
 public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
 
-    private final DMDircMBassador eventBus;
-
-    /**
-     * Creates a new logging swing worker.
-     *
-     * @param eventBus Event bus to post errors to.
-     */
-    public LoggingSwingWorker(final DMDircMBassador eventBus) {
-        this.eventBus = eventBus;
-    }
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingSwingWorker.class);
 
     @Override
     protected void done() {
@@ -59,7 +49,7 @@ public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+            LOG.warn(ex.getMessage(), ex);
         }
     }
 

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

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.DMDircMBassador;
-
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -35,40 +33,33 @@ public class RunnableLoggingSwingWorker<T, V> extends SupplierLoggingSwingWorker
     /**
      * Creates a new logging swing worker.
      *
-     * @param eventBus           Event bus to post errors to.
      * @param backgroundRunnable The runnable to call as the background task, off the EDT.
      */
-    public RunnableLoggingSwingWorker(final DMDircMBassador eventBus,
-            final Runnable backgroundRunnable) {
-        this(eventBus, backgroundRunnable, result -> {});
+    public RunnableLoggingSwingWorker(final Runnable backgroundRunnable) {
+        this(backgroundRunnable, result -> {});
     }
 
     /**
      * Creates a new logging swing worker.
      *
-     * @param eventBus           Event bus to post errors to.
      * @param backgroundRunnable The runnable to call as the background task, off the EDT.
      * @param doneConsumer       The consumer called when the background task is complete
      */
-    public RunnableLoggingSwingWorker(final DMDircMBassador eventBus,
-            final Runnable backgroundRunnable,
+    public RunnableLoggingSwingWorker(final Runnable backgroundRunnable,
             final Consumer<T> doneConsumer) {
-        this(eventBus, backgroundRunnable, doneConsumer, chunks -> {});
+        this(backgroundRunnable, doneConsumer, chunks -> {});
     }
 
     /**
      * Creates a new logging swing worker.
      *
-     * @param eventBus           Event bus to post errors to.
      * @param backgroundRunnable The runnable to call as the background task, off the EDT.
      * @param doneConsumer       The consumer called when the background task is complete
      * @param processConsumer    The consumer called to process results of the background task
      *                           as it progresses
      */
-    public RunnableLoggingSwingWorker(final DMDircMBassador eventBus,
-            final Runnable backgroundRunnable,
-            final Consumer<T> doneConsumer,
-            final Consumer<List<V>> processConsumer) {
-        super(eventBus, () -> { backgroundRunnable.run(); return null; } , doneConsumer, processConsumer);
+    public RunnableLoggingSwingWorker(final Runnable backgroundRunnable,
+            final Consumer<T> doneConsumer, final Consumer<List<V>> processConsumer) {
+        super(() -> { backgroundRunnable.run(); return null; } , doneConsumer, processConsumer);
     }
 }

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

@@ -22,21 +22,20 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * {@link LoggingSwingWorker} that runs a {@link Supplier}.
  */
 public class SupplierLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
 
-    private final DMDircMBassador eventBus;
+    private static final Logger LOG = LoggerFactory.getLogger(SupplierLoggingSwingWorker.class);
     private final Consumer<T> doneConsumer;
     private final Consumer<List<V>> processConsumer;
     private final Supplier<T> backgroundSupplier;
@@ -44,42 +43,37 @@ public class SupplierLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
     /**
      * Creates a new logging swing worker.
      *
-     * @param eventBus           Event bus to post errors to.
      * @param backgroundSupplier The supplier to call as the background task, off the EDT.
      */
-    public SupplierLoggingSwingWorker(final DMDircMBassador eventBus,
+    public SupplierLoggingSwingWorker(
             final Supplier<T> backgroundSupplier) {
-        this(eventBus, backgroundSupplier, result -> {});
+        this(backgroundSupplier, result -> {});
     }
 
     /**
      * Creates a new logging swing worker.
      *
-     * @param eventBus           Event bus to post errors to.
      * @param backgroundSupplier The supplier to call as the background task, off the EDT.
      * @param doneConsumer       The consumer called when the background task is complete
      */
-    public SupplierLoggingSwingWorker(final DMDircMBassador eventBus,
+    public SupplierLoggingSwingWorker(
             final Supplier<T> backgroundSupplier,
             final Consumer<T> doneConsumer) {
-        this(eventBus, backgroundSupplier, doneConsumer, chunks -> {});
+        this(backgroundSupplier, doneConsumer, chunks -> {});
     }
 
     /**
      * Creates a new logging swing worker.
      *
-     * @param eventBus           Event bus to post errors to.
      * @param backgroundSupplier The supplier to call as the background task, off the EDT.
      * @param doneConsumer       The consumer called when the background task is complete
      * @param processConsumer    The consumer called to process results of the background task
      *                           as it progresses
      */
-    public SupplierLoggingSwingWorker(final DMDircMBassador eventBus,
+    public SupplierLoggingSwingWorker(
             final Supplier<T> backgroundSupplier,
             final Consumer<T> doneConsumer,
             final Consumer<List<V>> processConsumer) {
-        super(eventBus);
-        this.eventBus = eventBus;
         this.backgroundSupplier = backgroundSupplier;
         this.doneConsumer = doneConsumer;
         this.processConsumer = processConsumer;
@@ -102,7 +96,7 @@ public class SupplierLoggingSwingWorker<T, V> extends LoggingSwingWorker<T, V> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+            LOG.warn(ex.getMessage(), ex);
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -22,13 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ConfigFile;
@@ -51,6 +48,11 @@ import javax.swing.text.StyleConstants;
 
 import net.miginfocom.swing.MigLayout;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Loads the addon data feed into the addon browser.
  */
@@ -58,6 +60,7 @@ public class DataLoaderWorker
         extends LoggingSwingWorker<Collection<AddonInfo>, Object>
         implements DownloadListener {
 
+    private static final Logger LOG = LoggerFactory.getLogger(DataLoaderWorker.class);
     /** List to load data into. */
     private final AddonTable table;
     /** Browser window to pass to addon info objects. */
@@ -80,8 +83,6 @@ public class DataLoaderWorker
     private final AggregateConfigProvider globalConfig;
     /** Downloader to download files. */
     private final Downloader downloader;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new data loader worker.
@@ -92,7 +93,6 @@ public class DataLoaderWorker
      * @param workerFactory Factory to use to produce install workers.
      * @param updateManager Manager to use to retrieve update information.
      * @param tempDirectory The directory to store temporary items in, such as the addons feed.
-     * @param eventBus      The event bus to post errors to
      * @param table         Table to load data into
      * @param download      Download new addons feed?
      * @param browserWindow Browser window to pass to table objects
@@ -105,12 +105,10 @@ public class DataLoaderWorker
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
             final Path tempDirectory,
-            final DMDircMBassador eventBus,
             final AddonTable table,
             final boolean download,
             final BrowserWindow browserWindow,
             final JScrollPane scrollPane) {
-        super(eventBus);
         this.downloader = downloader;
         this.globalConfig = globalConfig;
         this.urlBuilder = urlBuilder;
@@ -121,7 +119,6 @@ public class DataLoaderWorker
         this.tempDirectory = tempDirectory;
         this.browserWindow = browserWindow;
         this.scrollPane = scrollPane;
-        this.eventBus = eventBus;
     }
 
     @Override
@@ -173,7 +170,7 @@ public class DataLoaderWorker
         } catch (final InterruptedException ex) {
             data = Collections.emptyList();
         } catch (final ExecutionException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+            LOG.warn(USER_ERROR, ex.getMessage(), ex);
             data = Collections.emptyList();
         }
         final int selectedRow;

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorkerFactory.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -47,7 +46,6 @@ public class DataLoaderWorkerFactory {
     private final InstallWorkerFactory workerFactory;
     private final UpdateManager updateManager;
     private final Path tempDirectory;
-    private final DMDircMBassador eventBus;
 
     @Inject
     public DataLoaderWorkerFactory(final Downloader downloader,
@@ -55,7 +53,6 @@ public class DataLoaderWorkerFactory {
             final URLBuilder urlBuilder,
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
-            final DMDircMBassador eventBus,
             @Directory(DirectoryType.TEMPORARY)
             final Path tempDirectory) {
         this.downloader = downloader;
@@ -64,11 +61,10 @@ public class DataLoaderWorkerFactory {
         this.workerFactory = workerFactory;
         this.updateManager = updateManager;
         this.tempDirectory = tempDirectory;
-        this.eventBus = eventBus;
     }
     public DataLoaderWorker getDataLoaderWorker(final AddonTable list, final boolean download,
             final BrowserWindow browserWindow, final JScrollPane scrollPane) {
         return new DataLoaderWorker(downloader, globalConfig, urlBuilder, workerFactory,
-                updateManager, tempDirectory, eventBus, list, download, browserWindow, scrollPane);
+                updateManager, tempDirectory, list, download, browserWindow, scrollPane);
     }
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -62,7 +62,6 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
             final DMDircMBassador eventBus,
             final AddonInfo info,
             final InstallerWindow window) {
-        super(eventBus);
         this.downloader = downloader;
         this.info = info;
         this.installer = window;

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -128,8 +128,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      * Populates the list in a background thread.
      */
     protected void load() {
-        UIUtilities.invokeOffEDT(eventBus,
-                () -> populateList(addonList),
+        UIUtilities.invokeOffEDT(() -> populateList(addonList),
                 value -> {
                     scrollPane.setViewportView(addonList);
                     addonList.getSelectionModel().addListSelectionListener(this);

ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -49,8 +49,6 @@ import javax.swing.text.JTextComponent;
  */
 public class SwingInputHandler extends InputHandler implements KeyListener {
 
-    private final DMDircMBassador eventBus;
-
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target that we need to operate.
      *
@@ -71,7 +69,6 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             final DMDircMBassador eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow,
                 tabCompleterUtils, eventBus);
-        this.eventBus = eventBus;
     }
 
     @Override
@@ -154,7 +151,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             @Override
             public void actionPerformed(final ActionEvent e) {
                 localTarget.setEditable(false);
-                UIUtilities.invokeOffEDT(eventBus, () -> doTabCompletion(false),
+                UIUtilities.invokeOffEDT(() -> doTabCompletion(false),
                         value -> localTarget.setEditable(true));
             }
         });
@@ -166,8 +163,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                     @Override
                     public void actionPerformed(final ActionEvent e) {
                         localTarget.setEditable(false);
-                        UIUtilities.invokeOffEDT(eventBus,
-                                () -> doTabCompletion(true),
+                        UIUtilities.invokeOffEDT(() -> doTabCompletion(true),
                                 value -> localTarget.setEditable(true));
                     }
                 });
@@ -209,7 +205,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                                         "Event is not from known source.");
                     }
                     if (source.isEditable()) {
-                        UIUtilities.invokeOffEDT(eventBus, () -> enterPressed(line));
+                        UIUtilities.invokeOffEDT(() -> enterPressed(line));
                     }
                 });
             }

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

@@ -22,9 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
 
 import java.awt.Dimension;
 
@@ -52,14 +51,12 @@ public class CategoryLabel extends JLabel {
      * Creates a new category label.
      *
      * @param iconManager Icon manager
-     * @param eventBus    The event bus to post errors to
      * @param parentList  Parent list
      * @param category    Parent category
      * @param numCats     Number of categories shown
      * @param index       Index of this label
      */
     public CategoryLabel(final IconManager iconManager,
-            final DMDircMBassador eventBus,
             @Nullable final JList<? extends PreferencesCategory> parentList,
             final PreferencesCategory category, final int numCats,
             final int index) {
@@ -67,7 +64,7 @@ public class CategoryLabel extends JLabel {
         final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
 
         setText(category.getTitle());
-        new IconLoader(iconManager, eventBus, this, category.getIcon()).execute();
+        new IconLoader(iconManager, this, category.getIcon()).execute();
 
         int level = 0;
         PreferencesCategory temp = category;

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

@@ -22,15 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.TitlePanel;
 import com.dmdirc.addons.ui_swing.components.ToolTipPanel;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -73,39 +72,33 @@ public class CategoryPanel extends JPanel {
     private LoggingSwingWorker<JPanel, Object> worker;
     /** Prefs component factory. */
     private final PrefsComponentFactory factory;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new category panel.
      *
-     * @param eventBus    The event bus to post errors to
      * @param factory     Prefs component factory instance
      * @param iconManager Icon manager
      */
     @Inject
     public CategoryPanel(
-            final DMDircMBassador eventBus,
             final PrefsComponentFactory factory,
             final IconManager iconManager) {
-        this(eventBus, factory, iconManager, null);
+        this(factory, iconManager, null);
     }
 
     /**
      * Instantiates a new category panel.
      *
-     * @param eventBus    The event bus to post errors to
      * @param factory     Prefs component factory instance
      * @param iconManager Icon manager
      * @param category    Initial category
      */
     public CategoryPanel(
-            final DMDircMBassador eventBus, final PrefsComponentFactory factory,
+            final PrefsComponentFactory factory,
             final IconManager iconManager,
             final PreferencesCategory category) {
         super(new MigLayout("fillx, wrap, ins 0"));
         this.factory = factory;
-        this.eventBus = eventBus;
 
         panels = Collections.synchronizedMap(new HashMap<>());
 
@@ -208,7 +201,7 @@ public class CategoryPanel extends JPanel {
         } else {
             UIUtilities.invokeAndWait(() -> scrollPane.setViewportView(loading));
 
-            worker = new PrefsCategoryLoader(factory, eventBus, this, category);
+            worker = new PrefsCategoryLoader(factory, this, category);
             worker.execute();
         }
     }

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

@@ -22,25 +22,26 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.Icon;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Loads an icon in the background and uses it for a category label once it has been loaded.
  */
 public class IconLoader extends LoggingSwingWorker<Icon, Void> {
 
+    private static final Logger LOG = LoggerFactory.getLogger(IconLoader.class);
     /** Category this icon will be used for. */
     private final CategoryLabel label;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
     /** Icon to load. */
     private final String icon;
     /** Icon manager. */
@@ -51,15 +52,11 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
      * loaded in the background.
      *
      * @param iconManager Icon manager
-     * @param eventBus    The event bus to post errors to
      * @param label       Label to load category for
      * @param icon        Icon to load
      */
-    public IconLoader(final IconManager iconManager, final DMDircMBassador eventBus,
-            final CategoryLabel label, final String icon) {
-        super(eventBus);
+    public IconLoader(final IconManager iconManager, final CategoryLabel label, final String icon) {
         this.iconManager = iconManager;
-        this.eventBus = eventBus;
         this.label = label;
         this.icon = icon;
     }
@@ -76,7 +73,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, ex.getMessage(), ""));
+            LOG.info(USER_ERROR, ex.getMessage(), ex);
         }
 
     }

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

@@ -22,9 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.config.prefs.PreferencesCategory;
 
 import java.awt.Component;
 import java.awt.Font;
@@ -49,22 +48,17 @@ public class PreferencesListCellRenderer extends JLabel implements
     private final IconManager iconManager;
     /** Label map. */
     private final Map<PreferencesCategory, JLabel> labelMap;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new prefs list cell renderer.
      *
      * @param iconManager Icon manager to load icons
-     * @param eventBus    The event bus to post errors to
      * @param numCats     Number of categories in the list
      */
-    public PreferencesListCellRenderer(final IconManager iconManager, final DMDircMBassador eventBus,
-            final int numCats) {
+    public PreferencesListCellRenderer(final IconManager iconManager, final int numCats) {
         labelMap = new HashMap<>();
         this.numCats = numCats;
         this.iconManager = iconManager;
-        this.eventBus = eventBus;
     }
 
     @Override
@@ -72,8 +66,7 @@ public class PreferencesListCellRenderer extends JLabel implements
             final PreferencesCategory value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
         if (!labelMap.containsKey(value)) {
-            labelMap.put(value, new CategoryLabel(iconManager, eventBus,
-                    list, value, numCats, index));
+            labelMap.put(value, new CategoryLabel(iconManager, list, value, numCats, index));
         }
         final JLabel label = labelMap.get(value);
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -31,8 +30,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.util.LogUtils;
 
 import java.awt.Component;
 import java.awt.MenuContainer;
@@ -47,11 +45,15 @@ import javax.swing.UIManager;
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Loads a preferences panel for a specified preferences category in the background.
  */
 public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
 
+    private static final Logger LOG = LoggerFactory.getLogger(PrefsCategoryLoader.class);
     /** Panel gap. */
     private final int padding = (int) PlatformDefaults.getUnitValueX("related").getValue();
     /** Panel left padding. */
@@ -66,24 +68,18 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
     private final PreferencesCategory category;
     /** Prefs component factory instance. */
     private final PrefsComponentFactory factory;
-    /** The event bus to post the errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new preferences category loader.
      *
      * @param factory       Prefs component factory instance
-     * @param eventBus      The event bus to post errors ro
      * @param categoryPanel Parent Category panel
      * @param category      Preferences Category to load
      */
     public PrefsCategoryLoader(final PrefsComponentFactory factory,
-            final DMDircMBassador eventBus,
             final CategoryPanel categoryPanel,
             final PreferencesCategory category) {
-        super(eventBus);
         this.factory = factory;
-        this.eventBus = eventBus;
         this.categoryPanel = categoryPanel;
         this.category = category;
 
@@ -116,8 +112,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
         } catch (InterruptedException ex) {
             panel = errorCategory;
         } catch (ExecutionException ex) {
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
-                    "Error loading prefs panel", ""));
+            LOG.warn(LogUtils.USER_ERROR, "Error loading prefs panel", ex);
             panel = errorCategory;
         }
         return panel;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-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.ListScroller;
@@ -34,8 +33,6 @@ import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -57,12 +54,18 @@ import javax.swing.event.ListSelectionListener;
 
 import net.miginfocom.swing.MigLayout;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.dmdirc.util.LogUtils.USER_ERROR;
+
 /**
  * Allows the user to modify global client preferences.
  */
 public final class SwingPreferencesDialog extends StandardDialog implements
         ActionListener, ListSelectionListener {
 
+    private static final Logger LOG = LoggerFactory.getLogger(SwingPreferencesDialog.class);
     /** Serial version UID. */
     private static final long serialVersionUID = 9;
     /** Preferences tab list, used to switch option types. */
@@ -81,8 +84,6 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private final Provider<CategoryPanel> categoryPanelProvider;
     /** Icon manager to retrieve icons from. */
     private final IconManager iconManager;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
@@ -92,7 +93,6 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * @param restartDialogProvider The provider to use for restart dialogs.
      * @param dialogModelProvider   The provider to use to get a dialog model.
      * @param categoryPanelProvider The provider to use to produce a category panel.
-     * @param eventBus              The event bus to post errors to.
      */
     @Inject
     public SwingPreferencesDialog(
@@ -100,18 +100,16 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             final IconManager iconManager,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
-            final Provider<CategoryPanel> categoryPanelProvider,
-            final DMDircMBassador eventBus) {
+            final Provider<CategoryPanel> categoryPanelProvider) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.iconManager = iconManager;
         this.restartDialogProvider = restartDialogProvider;
         this.categoryPanelProvider = categoryPanelProvider;
-        this.eventBus = eventBus;
 
         initComponents();
 
-        worker = new SupplierLoggingSwingWorker<>(eventBus,
+        worker = new SupplierLoggingSwingWorker<>(
                 () -> getPrefsModel(dialogModelProvider),
                 value -> {
                     if (value != null) {
@@ -129,8 +127,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             prefsManager = dialogModelProvider.get();
         } catch (IllegalArgumentException ex) {
             mainPanel.setError(ex.getMessage());
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, ex,
-                    "Unable to load the preferences dialog", ""));
+            LOG.error(USER_ERROR, "Unable to load the preferences dialog", ex);
         }
         return prefsManager;
     }
@@ -142,7 +139,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         mainPanel.setCategory(null);
 
         final int count = countCategories(manager.getCategories());
-        tabList.setCellRenderer(new PreferencesListCellRenderer(iconManager, eventBus, count));
+        tabList.setCellRenderer(new PreferencesListCellRenderer(iconManager, count));
 
         addCategories(manager.getCategories());
     }
@@ -231,7 +228,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             saveOptions();
         }
 
-        UIUtilities.invokeOffEDT(eventBus, () -> {
+        UIUtilities.invokeOffEDT(() -> {
             if (manager != null) {
                 manager.dismiss();
             }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -181,7 +181,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
 
             header.setText("DMDirc is updating the following components:");
 
-            UIUtilities.invokeOffEDT(eventBus,
+            UIUtilities.invokeOffEDT(
                     () -> ((UpdateTableModel) table.getModel()).getUpdates().stream()
                     .filter(((UpdateTableModel) table.getModel())::isEnabled)
                     .forEach(updateManager::install));

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/BackgroundPainter.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.BackgroundOption;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigBinding;
@@ -67,8 +66,6 @@ public class BackgroundPainter extends LayerUI<JComponent> {
      * Config manager to bind to and retrieve settings from.
      */
     private final AggregateConfigProvider configManager;
-    /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
     /**
      * Background image.
      */
@@ -83,7 +80,6 @@ public class BackgroundPainter extends LayerUI<JComponent> {
      *
      * @param configManager Config manager to retrieve settings from
      * @param urlBuilder    URL Builder
-     * @param eventBus      The event bus to post errors to
      * @param domain        Domain to retrieve settings from
      * @param imageKey      Key for background image
      * @param optionKey     Key for background type
@@ -91,7 +87,6 @@ public class BackgroundPainter extends LayerUI<JComponent> {
     public BackgroundPainter(
             final AggregateConfigProvider configManager,
             final URLBuilder urlBuilder,
-            final DMDircMBassador eventBus,
             @Nonnull final String domain, @Nonnull final String imageKey,
             @Nonnull final String optionKey) {
         this.configManager = configManager;
@@ -99,7 +94,6 @@ public class BackgroundPainter extends LayerUI<JComponent> {
         this.domain = domain;
         this.imageKey = imageKey;
         this.optionKey = optionKey;
-        this.eventBus = eventBus;
         configManager.getBinder().bind(this, BackgroundPainter.class);
     }
 
@@ -132,7 +126,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
         if (value == null || value.isEmpty()) {
             backgroundImage = null;
         } else {
-            new ImageLoader(urlBuilder.getUrl(value), this, eventBus).execute();
+            new ImageLoader(urlBuilder.getUrl(value), this).execute();
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/ImageLoader.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 
 import java.awt.Image;
@@ -32,6 +31,7 @@ import java.util.concurrent.ExecutionException;
 
 import javax.imageio.ImageIO;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ImageLoader extends LoggingSwingWorker<Image, Void> {
 
-    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ImageLoader.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ImageLoader.class);
     /**
      * URL of image file to load.
      */
@@ -49,9 +49,7 @@ public class ImageLoader extends LoggingSwingWorker<Image, Void> {
      */
     private final BackgroundPainter painter;
 
-    public ImageLoader(final URL imageURL, final BackgroundPainter painter,
-            final DMDircMBassador eventBus) {
-        super(eventBus);
+    public ImageLoader(final URL imageURL, final BackgroundPainter painter) {
         this.imageURL = imageURL;
         this.painter = painter;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
@@ -92,14 +91,12 @@ public final class TextPane extends JComponent implements MouseWheelListener,
     /**
      * Creates a new instance of TextPane.
      *
-     * @param eventBus     The event bus to post errors to.
      * @param configDomain The domain to read configuration from.
      * @param urlBuilder   The builder to use to construct URLs for resources.
      * @param clipboard    The clipboard to handle copy and paste actions
      * @param frame        Parent Frame
      */
     public TextPane(
-            final DMDircMBassador eventBus,
             final String configDomain,
             final URLBuilder urlBuilder, final Clipboard clipboard,
             final Window frame) {
@@ -117,7 +114,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
 
         setLayout(new MigLayout("fill, hidemode 3"));
         backgroundPainter = new BackgroundPainter(frame.getContainer().getConfigManager(),
-                urlBuilder, eventBus, configDomain, "textpanebackground",
+                urlBuilder, configDomain, "textpanebackground",
                 "textpanebackgroundoption");
         canvas = new TextPaneCanvas(this,
                 new CachingDocument<>(document, new AttributedStringMessageMaker()));

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/TextPaneFactory.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.plugins.PluginDomain;
@@ -42,19 +41,17 @@ public class TextPaneFactory {
     private final String configDomain;
     private final URLBuilder urlBuilder;
     private final Clipboard clipboard;
-    private final DMDircMBassador eventBus;
 
     @Inject
     public TextPaneFactory(@PluginDomain(SwingController.class) final String configDomain,
-            final URLBuilder urlBuilder, final Clipboard clipboard, final DMDircMBassador eventBus) {
+            final URLBuilder urlBuilder, final Clipboard clipboard) {
         this.configDomain = configDomain;
         this.urlBuilder = urlBuilder;
         this.clipboard = clipboard;
-        this.eventBus = eventBus;
     }
 
     public TextPane getTextPane(final TextFrame frame) {
-        return new TextPane(eventBus, configDomain, urlBuilder, clipboard, frame);
+        return new TextPane(configDomain, urlBuilder, clipboard, frame);
     }
 
 }