EventBus logging for LoggingSwingWorker.

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

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

@@ -56,7 +56,7 @@ public class FontPicker extends JComboBox<Object> {
         this.fontFamily = fontFamily;
 
         setRenderer(new FontListCellRenderer(getRenderer()));
-        new LoggingSwingWorker<String[], String[]>() {
+        new LoggingSwingWorker<String[], String[]>(eventBus) {
 
             @Override
             protected String[] doInBackground() {

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

@@ -22,8 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
+
+import com.google.common.eventbus.EventBus;
 
 import java.util.concurrent.ExecutionException;
 
@@ -37,6 +39,17 @@ import javax.swing.SwingWorker;
  */
 public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
 
+    private final EventBus eventBus;
+
+    /**
+     * Creates a new logging swing worker.
+     *
+     * @param eventBus Event bus to post errors to.
+     */
+    public LoggingSwingWorker(final EventBus eventBus) {
+        this.eventBus = eventBus;
+    }
+
     @Override
     protected void done() {
         if (isCancelled()) {
@@ -47,7 +60,7 @@ public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
         }
     }
 

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

@@ -116,6 +116,7 @@ public class DataLoaderWorker
             @Unbound final boolean download,
             @Unbound final BrowserWindow browserWindow,
             @Unbound final JScrollPane scrollPane) {
+        super(eventBus);
         this.downloader = downloader;
         this.globalConfig = globalConfig;
         this.urlBuilder = urlBuilder;

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

@@ -30,6 +30,8 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.annotations.factory.Unbound;
 import com.dmdirc.util.io.Downloader;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
@@ -60,9 +62,10 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
             @SuppressWarnings("qualifiers") @Directory(DirectoryType.PLUGINS) final String pluginDirectory,
             @SuppressWarnings("qualifiers") @Directory(DirectoryType.THEMES) final String themeDirectory,
             final PluginManager pluginManager,
+            final EventBus eventBus,
             @Unbound final AddonInfo info,
             @Unbound final InstallerWindow window) {
-
+        super(eventBus);
         this.downloader = downloader;
         this.info = info;
         this.installer = window;

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

@@ -26,6 +26,8 @@ import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.io.Downloader;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 
 /**
@@ -38,21 +40,23 @@ public class InstallWorkerFactory {
     private final String pluginDirectory;
     private final String themeDirectory;
     private final PluginManager pluginManager;
+    private final EventBus eventBus;
 
     @Inject
     public InstallWorkerFactory(final Downloader downloader,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.TEMPORARY) final String tempDirectory,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.PLUGINS) final String pluginDirectory,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.THEMES) final String themeDirectory,
-            final PluginManager pluginManager) {
+            final PluginManager pluginManager, final EventBus eventBus) {
         this.downloader = downloader;
         this.tempDirectory = tempDirectory;
         this.pluginDirectory = pluginDirectory;
         this.themeDirectory = themeDirectory;
         this.pluginManager = pluginManager;
+        this.eventBus = eventBus;
     }
     public InstallWorker getInstallWorker(final AddonInfo info, final InstallerWindow installer) {
         return new InstallWorker(downloader, tempDirectory, pluginDirectory, themeDirectory,
-                pluginManager, info, installer);
+                pluginManager, eventBus, info, installer);
     }
 }

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

@@ -30,6 +30,8 @@ import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Window;
 
 import javax.swing.JLabel;
@@ -60,6 +62,8 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
     private final Window parentWindow;
     /** The factory to use to produce data loader workers. */
     private final DataLoaderWorkerFactory workerFactory;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
     /** Addon list scroll pane. */
     private JScrollPane scrollPane;
     /** Blurb label. */
@@ -77,11 +81,11 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      * @param parentWindow  Parent window
      * @param workerFactory The factory to use to produce data loader workers.
      */
-    public AddonPanel(final Window parentWindow, final DataLoaderWorkerFactory workerFactory) {
-        super();
-
+    public AddonPanel(final Window parentWindow, final DataLoaderWorkerFactory workerFactory,
+            final EventBus eventBus) {
         this.parentWindow = parentWindow;
         this.workerFactory = workerFactory;
+        this.eventBus = eventBus;
 
         initComponents();
         layoutComponents();
@@ -127,21 +131,17 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      * Populates the list in a background thread.
      */
     protected void load() {
-        /** {@inheritDoc}. */
-        new LoggingSwingWorker<Object, Object>() {
-            /** {@inheritDoc}. */
+        new LoggingSwingWorker<Object, Object>(eventBus) {
             @Override
             protected Object doInBackground() {
                 return populateList(addonList);
             }
 
-            /** {@inheritDoc}. */
             @Override
             protected void done() {
                 super.done();
                 scrollPane.setViewportView(addonList);
                 UIUtilities.invokeLater(new Runnable() {
-                    /** {@inheritDoc}. */
                     @Override
                     public void run() {
                         addonList.getSelectionModel()
@@ -179,7 +179,6 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      */
     protected abstract String getTypeName();
 
-    /** {@inheritDoc}. */
     @Override
     public void valueChanged(final ListSelectionEvent e) {
         final int newSelection = addonList.getSelectedRow();
@@ -192,7 +191,6 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
         selectedAddon = addonList.getSelectedRow();
     }
 
-    /** {@inheritDoc}. */
     @Override
     public void hyperlinkUpdate(final HyperlinkEvent e) {
         if (e.getEventType() == EventType.ACTIVATED) {

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

@@ -82,7 +82,7 @@ public class PluginPanel extends AddonPanel {
             @GlobalConfig final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig) {
-        super(parentWindow, workerFactory);
+        super(parentWindow, workerFactory, eventBus);
         this.pluginManager = pluginManager;
         this.iconManager = iconManager;
         this.updateManager = updateManager;

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

@@ -33,6 +33,8 @@ import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -67,6 +69,7 @@ public class ThemePanel extends AddonPanel {
      * @param iconManager   Manager to use to retrieve addon-related icons.
      * @param updateManager Manager to use to retrieve update information.
      * @param userConfig    Configuration to write update-related settings to.
+     * @param eventBus      The event bus to post errors to.
      */
     @Inject
     public ThemePanel(
@@ -75,8 +78,9 @@ public class ThemePanel extends AddonPanel {
             final DataLoaderWorkerFactory workerFactory,
             @GlobalConfig final IconManager iconManager,
             final CachingUpdateManager updateManager,
-            @UserConfig final ConfigProvider userConfig) {
-        super(parentWindow, workerFactory);
+            @UserConfig final ConfigProvider userConfig,
+            final EventBus eventBus) {
+        super(parentWindow, workerFactory, eventBus);
         this.themeManager = themeManager;
         this.iconManager = iconManager;
         this.updateManager = updateManager;

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

@@ -49,6 +49,8 @@ import javax.swing.text.JTextComponent;
  */
 public class SwingInputHandler extends InputHandler implements KeyListener {
 
+    private final EventBus eventBus;
+
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target that we need to operate.
      *
@@ -67,6 +69,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             final FrameContainer parentWindow,
             final EventBus eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -148,7 +151,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
             @Override
             public void actionPerformed(final ActionEvent e) {
-                new LoggingSwingWorker<Object, Void>() {
+                new LoggingSwingWorker<Object, Void>(eventBus) {
 
                     @Override
                     protected Object doInBackground() {
@@ -172,7 +175,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
                     @Override
                     public void actionPerformed(final ActionEvent e) {
-                        new LoggingSwingWorker<Object, Void>() {
+                        new LoggingSwingWorker<Object, Void>(eventBus) {
 
                             @Override
                             protected Object doInBackground() {
@@ -230,7 +233,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                                             "Event is not from known source.");
                         }
                         if (source.isEditable()) {
-                            new LoggingSwingWorker<Object, Void>() {
+                            new LoggingSwingWorker<Object, Void>(eventBus) {
 
                                 @Override
                                 protected Object doInBackground() {

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -27,6 +27,8 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -59,12 +61,14 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
     /**
      * Instantiates a new licence loader.
      *
-     * @param plugins List of plugins to get licenses from
-     * @param tree    Tree to add licenses to
-     * @param model   Model to load licences into
+     * @param plugins  List of plugins to get licenses from
+     * @param tree     Tree to add licenses to
+     * @param model    Model to load licences into
+     * @param eventBus The event bus to post errors to
      */
     public LicenceLoader(final Collection<PluginInfo> plugins, final JTree tree,
-            final DefaultTreeModel model) {
+            final DefaultTreeModel model, final EventBus eventBus) {
+        super(eventBus);
         this.plugins = plugins;
         this.tree = tree;
         this.model = model;

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -29,6 +29,8 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Font;
 import java.awt.Rectangle;
 
@@ -73,14 +75,15 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
      *
      * @param globalConfig  The config to read settings from.
      * @param pluginManager The manager to use to find plugins (to display their licenses).
+     * @param eventBus      The event bus to post errors to.
      */
     @Inject
     public LicencesPanel(
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final PluginManager pluginManager) {
+            final PluginManager pluginManager, final EventBus eventBus) {
         config = globalConfig;
         initComponents();
-        new LicenceLoader(pluginManager.getPluginInfos(), list, listModel).execute();
+        new LicenceLoader(pluginManager.getPluginInfos(), list, listModel, eventBus).execute();
         addListeners();
         layoutComponents();
     }

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

@@ -58,6 +58,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
      */
     public IconLoader(final IconManager iconManager, final EventBus eventBus,
             final CategoryLabel label, final String icon) {
+        super(eventBus);
         this.iconManager = iconManager;
         this.eventBus = eventBus;
         this.label = label;

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

@@ -84,6 +84,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
             final EventBus eventBus,
             final CategoryPanel categoryPanel,
             final PreferencesCategory category) {
+        super(eventBus);
         this.factory = factory;
         this.eventBus = eventBus;
         this.categoryPanel = categoryPanel;

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

@@ -114,7 +114,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
 
         initComponents();
 
-        worker = new LoggingSwingWorker<PreferencesDialogModel, Void>() {
+        worker = new LoggingSwingWorker<PreferencesDialogModel, Void>(eventBus) {
 
             @Override
             protected PreferencesDialogModel doInBackground() {
@@ -251,7 +251,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             saveOptions();
         }
 
-        new LoggingSwingWorker<Void, Void>() {
+        new LoggingSwingWorker<Void, Void>(eventBus) {
             @Override
             protected Void doInBackground() {
                 if (manager != null) {

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

@@ -39,6 +39,8 @@ import com.dmdirc.updater.manager.UpdateManagerListener;
 import com.dmdirc.updater.manager.UpdateManagerStatus;
 import com.dmdirc.updater.manager.UpdateStatus;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Dimension;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -79,6 +81,8 @@ public class SwingUpdaterDialog extends StandardDialog implements
     private UpdateStatusTableCellRenderer updateStatusRenderer;
     /** Provider of restart dialogs. */
     private final DialogProvider<SwingRestartDialog> restartDialogProvider;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of the updater dialog.
@@ -86,16 +90,19 @@ public class SwingUpdaterDialog extends StandardDialog implements
      * @param updateManager         The update manager to use for information
      * @param parentWindow          Parent window
      * @param restartDialogProvider Provider of restart dialogs.
+     * @param eventBus              The event bus to post errors to
      */
     @Inject
     public SwingUpdaterDialog(
             final CachingUpdateManager updateManager,
             @MainWindow final Window parentWindow,
-            @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider) {
+            @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider,
+            final EventBus eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.updateManager = updateManager;
         this.restartDialogProvider = restartDialogProvider;
+        this.eventBus = eventBus;
 
         initComponents();
         layoutComponents();
@@ -110,8 +117,6 @@ public class SwingUpdaterDialog extends StandardDialog implements
 
     /**
      * Initialises the components.
-     *
-     * @param updates The updates that are available
      */
     private void initComponents() {
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -188,7 +193,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
 
             header.setText("DMDirc is updating the following components:");
 
-            new LoggingSwingWorker<Void, Void>() {
+            new LoggingSwingWorker<Void, Void>(eventBus) {
 
                 @Override
                 protected Void doInBackground() {

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

@@ -28,6 +28,8 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -67,6 +69,8 @@ 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 EventBus eventBus;
     /**
      * Background image.
      */
@@ -81,6 +85,7 @@ 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
@@ -88,6 +93,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
     public BackgroundPainter(
             final AggregateConfigProvider configManager,
             final URLBuilder urlBuilder,
+            final EventBus eventBus,
             final String domain, final String imageKey,
             final String optionKey) {
         this.configManager = configManager;
@@ -95,6 +101,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
         this.domain = domain;
         this.imageKey = imageKey;
         this.optionKey = optionKey;
+        this.eventBus = eventBus;
         configManager.getBinder().bind(this, BackgroundPainter.class);
     }
 
@@ -124,7 +131,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
         if (value == null || value.isEmpty()) {
             backgroundImage = null;
         } else {
-            new ImageLoader(urlBuilder.getUrl(value), this).execute();
+            new ImageLoader(urlBuilder.getUrl(value), this, eventBus).execute();
         }
     }
 

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

@@ -24,6 +24,8 @@ package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Image;
 import java.io.IOException;
 import java.net.URL;
@@ -48,14 +50,13 @@ public class ImageLoader extends LoggingSwingWorker<Image, Void> {
      */
     private final BackgroundPainter painter;
 
-    public ImageLoader(final URL imageURL, final BackgroundPainter painter) {
+    public ImageLoader(final URL imageURL, final BackgroundPainter painter,
+            final EventBus eventBus) {
+        super(eventBus);
         this.imageURL = imageURL;
         this.painter = painter;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected Image doInBackground() {
         try {
@@ -70,9 +71,6 @@ public class ImageLoader extends LoggingSwingWorker<Image, Void> {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void done() {
         try {

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

@@ -32,6 +32,8 @@ import com.dmdirc.ui.messages.LinePosition;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Color;
 import java.awt.Point;
 import java.awt.datatransfer.Clipboard;
@@ -86,16 +88,17 @@ 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 clipboard    The clipboard to handle copy and paste actions
      * @param frame        Parent Frame
      */
     public TextPane(
+            final EventBus eventBus,
             final String configDomain,
             final URLBuilder urlBuilder, final Clipboard clipboard,
             final TextFrame frame) {
-        super();
         this.frame = frame;
         this.configDomain = configDomain;
         this.clipboard = clipboard;
@@ -110,7 +113,8 @@ public final class TextPane extends JComponent implements MouseWheelListener,
 
         setLayout(new MigLayout("fill, hidemode 3"));
         backgroundPainter = new BackgroundPainter(frame.getContainer().getConfigManager(),
-                urlBuilder, configDomain, "textpanebackground", "textpanebackgroundoption");
+                urlBuilder, eventBus, configDomain, "textpanebackground",
+                "textpanebackgroundoption");
         canvas = new TextPaneCanvas(this, document);
         final JXLayer<JComponent> layer = new JXLayer<JComponent>(canvas);
         layer.setUI(backgroundPainter);

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

@@ -27,6 +27,8 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.URLBuilder;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.datatransfer.Clipboard;
 
 import javax.inject.Inject;
@@ -41,17 +43,19 @@ public class TextPaneFactory {
     private final String configDomain;
     private final URLBuilder urlBuilder;
     private final Clipboard clipboard;
+    private final EventBus eventBus;
 
     @Inject
     public TextPaneFactory(@PluginDomain(SwingController.class) final String configDomain,
-            final URLBuilder urlBuilder, final Clipboard clipboard) {
+            final URLBuilder urlBuilder, final Clipboard clipboard, final EventBus eventBus) {
         this.configDomain = configDomain;
         this.urlBuilder = urlBuilder;
         this.clipboard = clipboard;
+        this.eventBus = eventBus;
     }
 
     public TextPane getTextPane(final TextFrame frame) {
-        return new TextPane(configDomain, urlBuilder, clipboard, frame);
+        return new TextPane(eventBus, configDomain, urlBuilder, clipboard, frame);
     }
 
 }