More eventbus logging.

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

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

@@ -28,9 +28,9 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Unbound;
@@ -39,6 +39,8 @@ import com.dmdirc.util.io.DownloadListener;
 import com.dmdirc.util.io.Downloader;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -84,6 +86,8 @@ public class DataLoaderWorker
     private final AggregateConfigProvider globalConfig;
     /** Downloader to download files. */
     private final Downloader downloader;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new data loader worker.
@@ -94,6 +98,7 @@ 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
@@ -106,6 +111,7 @@ public class DataLoaderWorker
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
             @SuppressWarnings("qualifiers") @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
+            final EventBus eventBus,
             @Unbound final AddonTable table,
             @Unbound final boolean download,
             @Unbound final BrowserWindow browserWindow,
@@ -120,6 +126,7 @@ public class DataLoaderWorker
         this.tempDirectory = tempDirectory;
         this.browserWindow = browserWindow;
         this.scrollPane = scrollPane;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -140,7 +147,7 @@ public class DataLoaderWorker
                         tempDirectory + "addons.feed", this);
             } catch (final IOException ex) {
                 loadingPanel.removeAll();
-                loadingPanel.add(new TextLabel("Unable to download feeds."));
+                loadingPanel.add(new TextLabel("Unable to download feeds: " + ex.getMessage()));
                 return Collections.<AddonInfo>emptyList();
             }
         }
@@ -173,7 +180,7 @@ public class DataLoaderWorker
         } catch (final InterruptedException ex) {
             data = Collections.<AddonInfo>emptyList();
         } catch (final ExecutionException ex) {
-            Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
             data = Collections.<AddonInfo>emptyList();
         }
         final int selectedRow;

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

@@ -29,6 +29,8 @@ import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.Downloader;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 import javax.swing.JScrollPane;
 
@@ -43,6 +45,7 @@ public class DataLoaderWorkerFactory {
     private final InstallWorkerFactory workerFactory;
     private final UpdateManager updateManager;
     private final String tempDirectory;
+    private final EventBus eventBus;
 
     @Inject
     public DataLoaderWorkerFactory(final Downloader downloader,
@@ -50,6 +53,7 @@ public class DataLoaderWorkerFactory {
             final URLBuilder urlBuilder,
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
+            final EventBus eventBus,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.TEMPORARY) final String tempDirectory) {
         this.downloader = downloader;
         this.globalConfig = globalConfig;
@@ -57,10 +61,11 @@ 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, list, download, browserWindow, scrollPane);
+                updateManager, tempDirectory, eventBus, list, download, browserWindow, scrollPane);
     }
 }