Stop using ErrorManager.getErrorManager().

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

@@ -83,6 +83,8 @@ public class SwingManager {
     private final Provider<SwingWindowManager> swingWindowManager;
     /** Error list dialog provider. */
     private final DialogProvider<ErrorListDialog> errorListDialogProvider;
+    /** Error manager for error management. */
+    private final ErrorManager errorManager;
     /** The main frame of the Swing UI. */
     private MainFrame mainFrame;
     /** Swing UI initialiser. */
@@ -125,7 +127,8 @@ public class SwingManager {
             final TreeFrameManagerProvider treeProvider,
             final Provider<SwingWindowManager> swingWindowManager,
             final DialogProvider<ErrorListDialog> errorListDialogProvider,
-            final SwingUIInitialiser uiInitialiser) {
+            final SwingUIInitialiser uiInitialiser,
+            final ErrorManager errorManager) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.menuBar = menuBar;
@@ -142,6 +145,7 @@ public class SwingManager {
         this.swingWindowManager = swingWindowManager;
         this.errorListDialogProvider = errorListDialogProvider;
         this.uiInitialiser = uiInitialiser;
+        this.errorManager = errorManager;
     }
 
     /**
@@ -150,10 +154,10 @@ public class SwingManager {
     public void load() {
         uiInitialiser.load();
         this.mainFrame = mainFrameProvider.get();
-        this.mainFrame.setMenuBar(menuBar.get());
-        this.mainFrame.setWindowManager(ctrlTabManager);
-        this.mainFrame.setStatusBar(statusBar.get());
-        this.mainFrame.initComponents();
+        mainFrame.setMenuBar(menuBar.get());
+        mainFrame.setWindowManager(ctrlTabManager);
+        mainFrame.setStatusBar(statusBar.get());
+        mainFrame.initComponents();
         swingEventBus.subscribe(mainFrame);
         swingEventBus.subscribe(ctrlTabManager);
 
@@ -162,17 +166,14 @@ public class SwingManager {
         eventBus.subscribe(this);
         eventBus.subscribe(mainFrame);
         eventBus.subscribe(linkHandler);
-        SwingUtilities.invokeLater(
-                () -> errorListDialogProvider.get().load(ErrorManager.getErrorManager()));
+        SwingUtilities.invokeLater(() -> errorListDialogProvider.get().load());
     }
 
     /**
      * Handles unloading of the UI.
      */
     public void unload() {
-        for (final Window window : swingWindowManager.get().getTopLevelWindows()) {
-            window.dispose();
-        }
+        swingWindowManager.get().getTopLevelWindows().forEach(Window::dispose);
         windowManager.removeListener(windowFactory.get());
         windowFactory.get().dispose();
         SwingUtilities.invokeLater(() -> errorListDialogProvider.get().dispose());

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPanel.java

@@ -36,7 +36,6 @@ import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
-import java.util.Collection;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -68,7 +67,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     /** The manager to use to retrieve icons. */
     private final IconManager iconManager;
     /** Error manager. */
-    private final transient ErrorManager errorManager = ErrorManager.getErrorManager();
+    private final transient ErrorManager errorManager;
     /** Dismiss menu. */
     private final JPopupMenu menu;
     /** Show menu item. */
@@ -91,13 +90,15 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
             @GlobalConfig final IconManager iconManager,
             @MainWindow final Window parentWindow,
             final Provider<SwingStatusBar> statusBar,
-            final DialogProvider<ErrorListDialog> errorListDialogProvider) {
+            final DialogProvider<ErrorListDialog> errorListDialogProvider,
+            final ErrorManager errorManager) {
         super(new JLabel());
 
         this.parentWindow = parentWindow;
         this.statusBar = statusBar;
         this.iconManager = iconManager;
         this.errorListDialogProvider = errorListDialogProvider;
+        this.errorManager = errorManager;
         defaultIcon = iconManager.getIcon("normal");
 
         menu = new JPopupMenu();
@@ -115,7 +116,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
 
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new ErrorPopup(iconManager, this, parentWindow);
+        return new ErrorPopup(errorManager, iconManager, this, parentWindow);
     }
 
     /** Clears the error. */
@@ -212,10 +213,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
         if (e.getSource() == show) {
             errorListDialogProvider.displayOrRequestFocus();
         } else {
-            final Collection<ProgramError> errors = ErrorManager.getErrorManager().getErrors();
-            for (final ProgramError error : errors) {
-                ErrorManager.getErrorManager().deleteError(error);
-            }
+            errorManager.getErrors().forEach(errorManager::deleteError);
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPopup.java

@@ -48,26 +48,31 @@ public class ErrorPopup extends StatusbarPopupWindow {
     private static final long serialVersionUID = 1;
     /** Icon manager. */
     private final IconManager iconManager;
+    /** Error manager to retrieve errors from. */
+    private ErrorManager errorManager;
 
     /**
      * Creates a new error popup.
      *
+     * @param errorManager The error manager to retrieve errors from
      * @param iconManager  The manager to use to retrieve icons.
      * @param parent       Parent panel
      * @param parentWindow Parent window
      */
     public ErrorPopup(
+            final ErrorManager errorManager,
             final IconManager iconManager,
             final JPanel parent,
             final Window parentWindow) {
         super(parent, parentWindow);
 
+        this.errorManager = errorManager;
         this.iconManager = iconManager;
     }
 
     @Override
     protected void initContent(final JPanel panel) {
-        final List<ProgramError> errors = ErrorManager.getErrorManager().getErrors();
+        final List<ProgramError> errors = errorManager.getErrors();
         final MapList<ErrorLevel, ProgramError> buckets = new MapList<>();
         final MapList<ErrorReportStatus, ProgramError> statuses = new MapList<>();
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorDetailPanel.java

@@ -44,6 +44,8 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 3;
+    /** The error manager to retrieve errors from. */
+    private final ErrorManager errorManager;
     /** Error to show. */
     private ProgramError error;
     /** ID field. */
@@ -60,17 +62,18 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
     private JScrollPane scrollPane;
 
     /** Creates a new instance of ErrorDetailPanel. */
-    public ErrorDetailPanel() {
-        this(null);
+    public ErrorDetailPanel(final ErrorManager errorManager) {
+        this(errorManager, null);
     }
 
     /**
      * Creates a new instance of ErrorDetailPanel.
      *
-     * @param error Error to be displayed
+     * @param errorManager The error manager to retrieve errors from
+     * @param error        Error to be displayed
      */
-    public ErrorDetailPanel(final ProgramError error) {
-
+    public ErrorDetailPanel(final ErrorManager errorManager, final ProgramError error) {
+        this.errorManager = errorManager;
         this.error = error;
 
         initComponents();
@@ -107,7 +110,7 @@ public final class ErrorDetailPanel extends JPanel implements ErrorListener {
         details.setRows(5);
         details.setWrapStyleWord(true);
 
-        ErrorManager.getErrorManager().addErrorListener(this);
+        errorManager.addErrorListener(this);
     }
 
     /** Updates the panels details. */

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -61,6 +61,8 @@ public final class ErrorListDialog extends StandardDialog implements
     private final Object selectionLock = new Object();
     /** Table model. */
     private final ErrorTableModel tableModel;
+    /** Error manager to retrieve errors from. */
+    private final ErrorManager errorManager;
     /** Table scrollpane. */
     private JScrollPane scrollPane;
     /** Error table. */
@@ -86,16 +88,18 @@ public final class ErrorListDialog extends StandardDialog implements
      */
     @Inject
     public ErrorListDialog(
+            final ErrorManager errorManager,
             @MainWindow final Window parentWindow,
             @GlobalConfig final IconManager iconManager) {
         super(parentWindow, ModalityType.MODELESS);
+        this.errorManager = errorManager;
 
         setTitle("Error list");
         setMinimumSize(new Dimension(600, 550));
 
-        tableModel = new ErrorTableModel();
+        tableModel = new ErrorTableModel(errorManager);
 
-        initComponents(iconManager);
+        initComponents(errorManager, iconManager);
         layoutComponents();
         initListeners();
 
@@ -104,15 +108,13 @@ public final class ErrorListDialog extends StandardDialog implements
 
     /**
      * Loads the dialog and sets it as ready.
-     *
-     * @param errorManager Error manager to register with.
      */
-    public void load(final ErrorManager errorManager) {
-        tableModel.load(errorManager);
+    public void load() {
+        tableModel.load();
     }
 
     /** Initialises the components. */
-    private void initComponents(final IconManager iconManager) {
+    private void initComponents(final ErrorManager errorManager, final IconManager iconManager) {
         initButtons();
 
         scrollPane = new JScrollPane();
@@ -124,7 +126,7 @@ public final class ErrorListDialog extends StandardDialog implements
 
         scrollPane.setViewportView(table);
 
-        errorDetails = new ErrorDetailPanel();
+        errorDetails = new ErrorDetailPanel(errorManager);
     }
 
     /** Initialises the buttons. */
@@ -228,18 +230,16 @@ public final class ErrorListDialog extends StandardDialog implements
             setVisible(false);
         } else if (e.getSource() == deleteButton) {
             synchronized (selectionLock) {
-                ErrorManager.getErrorManager().deleteError(tableModel.getError(
-                        table.getRowSorter().convertRowIndexToModel(
-                                table.getSelectedRow())));
+                errorManager.deleteError(tableModel.getError(
+                        table.getRowSorter().convertRowIndexToModel(table.getSelectedRow())));
             }
         } else if (e.getSource() == sendButton) {
             synchronized (selectionLock) {
-                ErrorManager.getErrorManager().sendError(tableModel.getError(
-                        table.getRowSorter().convertRowIndexToModel(
-                                table.getSelectedRow())));
+                errorManager.sendError(tableModel.getError(
+                        table.getRowSorter().convertRowIndexToModel(table.getSelectedRow())));
             }
         } else if (e.getSource() == deleteAllButton) {
-            ErrorManager.getErrorManager().deleteAll();
+            errorManager.deleteAll();
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorTableModel.java

@@ -30,6 +30,7 @@ import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -44,17 +45,20 @@ public final class ErrorTableModel extends AbstractTableModel implements ErrorLi
     private static final long serialVersionUID = 2;
     /** Data list. */
     private final List<ProgramError> errors;
+    /** Error manager to add listeners to. */
+    private final ErrorManager errorManager;
     /** Are we ready? */
     private boolean ready;
 
     /**
      * Creates a new instance of ErrorTableModel.
      */
-    public ErrorTableModel() {
+    public ErrorTableModel(final ErrorManager errorManager) {
         this.errors = Collections.synchronizedList(new ArrayList<>());
+        this.errorManager = errorManager;
     }
 
-    public void load(final ErrorManager errorManager) {
+    public void load() {
         errorManager.addErrorListener(this);
         setErrors(errorManager.getErrors());
         ready = true;
@@ -65,7 +69,7 @@ public final class ErrorTableModel extends AbstractTableModel implements ErrorLi
      *
      * @param errors List of errors
      */
-    public void setErrors(final List<ProgramError> errors) {
+    public void setErrors(final Collection<ProgramError> errors) {
         synchronized (this.errors) {
             this.errors.clear();
             this.errors.addAll(errors);
@@ -76,7 +80,7 @@ public final class ErrorTableModel extends AbstractTableModel implements ErrorLi
 
     @Override
     public int getRowCount() {
-        synchronized (this.errors) {
+        synchronized (errors) {
             return errors.size();
         }
     }
@@ -265,7 +269,7 @@ public final class ErrorTableModel extends AbstractTableModel implements ErrorLi
      * Disposes of this model, removing any added listeners.
      */
     public void dispose() {
-        ErrorManager.getErrorManager().removeErrorListener(this);
+        errorManager.removeErrorListener(this);
         ready = false;
     }