EventBus logging for the prefs dialog.

Also fix a couple of things IDEA complained about.

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

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

@@ -25,6 +25,8 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Dimension;
 
 import javax.annotation.Nullable;
@@ -43,8 +45,6 @@ public class CategoryLabel extends JLabel {
 
     /** Serial version UID. */
     private static final long serialVersionUID = -1659415238166842265L;
-    /** Panel gap. */
-    private final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
     /** Parent list. */
     @Nullable
     private final JList<? extends PreferencesCategory> parentList;
@@ -59,15 +59,15 @@ public class CategoryLabel extends JLabel {
      * @param index       Index of this label
      */
     public CategoryLabel(final IconManager iconManager,
+            final EventBus eventBus,
             @Nullable final JList<? extends PreferencesCategory> parentList,
             final PreferencesCategory category, final int numCats,
             final int index) {
-        super();
-
         this.parentList = parentList;
+        final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
 
         setText(category.getTitle());
-        new IconLoader(iconManager, this, category.getIcon()).execute();
+        new IconLoader(iconManager, eventBus, this, category.getIcon()).execute();
 
         int level = 0;
         PreferencesCategory temp = category;
@@ -80,8 +80,11 @@ public class CategoryLabel extends JLabel {
                 + padding));
         setBorder(BorderFactory.createEmptyBorder(padding / 2, padding + level
                 * 18, padding / 2, padding));
-        setBackground(parentList.getBackground());
-        setForeground(parentList.getForeground());
+
+        if (parentList != null) {
+            setBackground(parentList.getBackground());
+            setForeground(parentList.getForeground());
+        }
         setOpaque(true);
         setToolTipText(null);
 
@@ -105,11 +108,6 @@ public class CategoryLabel extends JLabel {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param icon New icon
-     */
     @Override
     public void setIcon(final Icon icon) {
         super.setIcon(icon);

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

@@ -32,6 +32,8 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Component;
 import java.util.Collections;
 import java.util.HashMap;
@@ -73,35 +75,41 @@ 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 EventBus 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 EventBus eventBus,
             final PrefsComponentFactory factory,
             @GlobalConfig final IconManager iconManager) {
-        this(factory, iconManager, null);
+        this(eventBus, 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 PrefsComponentFactory factory,
+    public CategoryPanel(
+            final EventBus eventBus, 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<PreferencesCategory, JPanel>());
+        panels = Collections.synchronizedMap(new HashMap<PreferencesCategory, JPanel>());
 
         loading = new JPanel(new MigLayout("fillx"));
         loading.add(new TextLabel("Loading..."));
@@ -214,7 +222,7 @@ public class CategoryPanel extends JPanel {
                 }
             });
 
-            worker = new PrefsCategoryLoader(factory, this, category);
+            worker = new PrefsCategoryLoader(factory, eventBus, this, category);
             worker.execute();
         } else {
             categoryLoaded(category);

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

@@ -23,10 +23,12 @@
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.Icon;
@@ -38,6 +40,8 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
 
     /** Category this icon will be used for. */
     private final CategoryLabel label;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
     /** Icon to load. */
     private final String icon;
     /** Icon manager. */
@@ -48,14 +52,14 @@ 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 load1111
+     * @param icon        Icon to load
      */
-    public IconLoader(final IconManager iconManager,
+    public IconLoader(final IconManager iconManager, final EventBus eventBus,
             final CategoryLabel label, final String icon) {
-        super();
-
         this.iconManager = iconManager;
+        this.eventBus = eventBus;
         this.label = label;
         this.icon = icon;
     }
@@ -72,7 +76,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            Logger.appError(ErrorLevel.LOW, ex.getMessage(), ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, ex.getMessage(), ""));
         }
 
     }

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

@@ -25,6 +25,8 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Component;
 import java.awt.Font;
 import java.util.HashMap;
@@ -48,18 +50,22 @@ 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 EventBus 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,
+    public PreferencesListCellRenderer(final IconManager iconManager, final EventBus eventBus,
             final int numCats) {
         labelMap = new HashMap<>();
         this.numCats = numCats;
         this.iconManager = iconManager;
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -67,7 +73,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,
+            labelMap.put(value, new CategoryLabel(iconManager, eventBus,
                     list, value, numCats, index));
         }
         final JLabel label = labelMap.get(value);

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

@@ -30,8 +30,10 @@ 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.logger.Logger;
+
+import com.google.common.eventbus.EventBus;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -67,20 +69,23 @@ 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 EventBus 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 EventBus eventBus,
             final CategoryPanel categoryPanel,
             final PreferencesCategory category) {
-        super();
-
         this.factory = factory;
+        this.eventBus = eventBus;
         this.categoryPanel = categoryPanel;
         this.category = category;
 
@@ -119,7 +124,8 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
         } catch (InterruptedException ex) {
             panel = errorCategory;
         } catch (ExecutionException ex) {
-            Logger.appError(ErrorLevel.MEDIUM, "Error loading prefs panel", ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+                    "Error loading prefs panel", ""));
             panel = errorCategory;
         }
         return panel;
@@ -275,7 +281,6 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      *
      * @since 0.6.3m1
      * @param category   The category to be added
-     * @param namePrefix Category name prefix
      */
     private JPanel addCategory(final PreferencesCategory category) {
         final JPanel panel = UIUtilities.invokeAndWait(

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

@@ -33,10 +33,12 @@ 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 com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -76,14 +78,14 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private PreferencesDialogModel manager;
     /** Manager loading swing worker. */
     private final LoggingSwingWorker<PreferencesDialogModel, Void> worker;
-    /** Panel size. */
-    private int panelSize = 500;
     /** The provider to use for restart dialogs. */
     private final DialogProvider<SwingRestartDialog> restartDialogProvider;
     /** The provider to use to produce a category panel. */
     private final Provider<CategoryPanel> categoryPanelProvider;
     /** Icon manager to retrieve icons from. */
     private final IconManager iconManager;
+    /** The event bus to post errors to. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
@@ -93,6 +95,7 @@ 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,12 +103,14 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             @GlobalConfig final IconManager iconManager,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
-            final Provider<CategoryPanel> categoryPanelProvider) {
+            final Provider<CategoryPanel> categoryPanelProvider,
+            final EventBus eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.iconManager = iconManager;
         this.restartDialogProvider = restartDialogProvider;
         this.categoryPanelProvider = categoryPanelProvider;
+        this.eventBus = eventBus;
 
         initComponents();
 
@@ -119,8 +124,8 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                     prefsManager = dialogModelProvider.get();
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
-                    Logger.appError(ErrorLevel.HIGH, "Unable to load the" + "preferences dialog.",
-                            ex);
+                    eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex,
+                            "Unable to load the preferences dialog", ""));
                 }
                 return prefsManager;
             }
@@ -136,7 +141,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                     } catch (InterruptedException ex) {
                         //Ignore
                     } catch (ExecutionException ex) {
-                        Logger.appError(ErrorLevel.MEDIUM, ex.getMessage(), ex);
+                        eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
                     }
                 }
             }
@@ -151,7 +156,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         mainPanel.setCategory(null);
 
         final int count = countCategories(manager.getCategories());
-        tabList.setCellRenderer(new PreferencesListCellRenderer(iconManager, count));
+        tabList.setCellRenderer(new PreferencesListCellRenderer(iconManager, eventBus, count));
 
         addCategories(manager.getCategories());
     }
@@ -282,22 +287,11 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             final int index = tabList.getSelectedIndex();
             tabList.scrollRectToVisible(tabList.getCellBounds(index, index));
             selected = node;
-            if (selected != null) {
-                selected.fireCategorySelected();
-            }
+            selected.fireCategorySelected();
             mainPanel.setCategory(selected);
         }
     }
 
-    /**
-     * Returns the selected category.
-     *
-     * @return Selected category
-     */
-    protected PreferencesCategory getSelectedCategory() {
-        return selected;
-    }
-
     public void saveOptions() {
         if (manager != null && manager.save()) {
             dispose();
@@ -305,28 +299,10 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         }
     }
 
-    /**
-     * Gets the maximum panel size.
-     *
-     * @return Max panel size
-     */
-    public int getPanelHeight() {
-        return panelSize;
-    }
-
-    /**
-     * Sets the panel size to the specified value.
-     *
-     * @param panelSize New panel size
-     */
-    protected void setPanelHeight(final int panelSize) {
-        this.panelSize = panelSize;
-    }
-
     @Override
     public void dispose() {
         synchronized (SwingPreferencesDialog.this) {
-            if (worker != null && !worker.isDone()) {
+            if (!worker.isDone()) {
                 worker.cancel(true);
             }
             if (manager != null) {

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

@@ -26,16 +26,18 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 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.logger.Logger;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -64,8 +66,6 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     private JScrollPane scrollPane;
     /** Component table model. */
     private UpdateTableModel tableModel;
-    /** Component table. */
-    private PackingTable table;
     /** Check now button. */
     private JButton checkNow;
     /** Update channel. */
@@ -78,6 +78,8 @@ 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 EventBus eventBus;
 
     /**
      * Instantiates a new update config panel.
@@ -86,17 +88,20 @@ 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 IdentityController identityController,
+            final EventBus eventBus) {
         this.userConfig = userConfig;
         this.globalConfig = globalConfig;
         this.updateManager = updateManager;
         this.identityController = identityController;
+        this.eventBus = eventBus;
 
         initComponents();
         addListeners();
@@ -126,7 +131,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         enable = new JCheckBox();
         scrollPane = new JScrollPane();
         tableModel = new UpdateTableModel(updateManager, updateManager.getComponents());
-        table = new PackingTable(tableModel, scrollPane);
+        final PackingTable table = new PackingTable(tableModel, scrollPane);
         checkNow = new JButton("Check now");
         checkNow.setEnabled(globalConfig.getOptionBool("updater", "enable"));
         updateChannel = new JComboBox<>(new DefaultComboBoxModel<>(UpdateChannel.values()));
@@ -136,8 +141,8 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         try {
             channel = UpdateChannel.valueOf(globalConfig.getOption("updater", "channel"));
         } catch (IllegalArgumentException e) {
-            Logger.userError(ErrorLevel.LOW, "Invalid setting for update "
-                    + "channel, defaulting to none.");
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                    "Invalid setting for update channel, defaulting to none.", ""));
         }
         updateChannel.setSelectedItem(channel);
         scrollPane.setViewportView(table);