Initial work on new errors dialog.

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

@@ -26,12 +26,10 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialogFactory;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
-import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
@@ -43,7 +41,6 @@ import java.awt.Window;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
-import javax.swing.SwingUtilities;
 
 import net.engio.mbassy.listener.Handler;
 
@@ -79,8 +76,6 @@ public class SwingManager {
     private final Provider<MainFrame> mainFrameProvider;
     /** Swing window manager. */
     private final Provider<SwingWindowManager> swingWindowManager;
-    /** Error list dialog provider. */
-    private final DialogProvider<ErrorListDialog> errorListDialogProvider;
     /** The main frame of the Swing UI. */
     private MainFrame mainFrame;
     /** Swing UI initialiser. */
@@ -103,7 +98,6 @@ public class SwingManager {
      * @param swingEventBus           The swing event bus to listen on for swing events.
      * @param treeProvider            Provider to use for tree-based frame managers.
      * @param swingWindowManager      Swing window manager
-     * @param errorListDialogProvider Error list dialog provider
      * @param uiInitialiser           Initialiser to set system/swing settings.
      */
     @Inject
@@ -122,7 +116,6 @@ public class SwingManager {
             final SwingEventBus swingEventBus,
             final TreeFrameManagerProvider treeProvider,
             final Provider<SwingWindowManager> swingWindowManager,
-            final DialogProvider<ErrorListDialog> errorListDialogProvider,
             final SwingUIInitialiser uiInitialiser) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
@@ -138,7 +131,6 @@ public class SwingManager {
         this.swingEventBus = swingEventBus;
         this.treeProvider = treeProvider;
         this.swingWindowManager = swingWindowManager;
-        this.errorListDialogProvider = errorListDialogProvider;
         this.uiInitialiser = uiInitialiser;
     }
 
@@ -160,7 +152,6 @@ public class SwingManager {
         eventBus.subscribe(this);
         eventBus.subscribe(mainFrame);
         eventBus.subscribe(linkHandler);
-        SwingUtilities.invokeLater(() -> errorListDialogProvider.get().load());
     }
 
     /**
@@ -170,7 +161,6 @@ public class SwingManager {
         swingWindowManager.get().getTopLevelWindows().forEach(Window::dispose);
         windowManager.removeListener(windowFactory.get());
         windowFactory.get().dispose();
-        SwingUtilities.invokeLater(() -> errorListDialogProvider.get().dispose());
         swingEventBus.unsubscribe(mainFrame);
         swingEventBus.unsubscribe(ctrlTabManager);
         mainFrame.dispose();

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.addons.ui_swing.dialogs.newerror.ErrorsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.logger.ErrorLevel;
@@ -36,7 +36,7 @@ import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
-import java.util.List;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -73,7 +73,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     /** Show menu item. */
     private final JMenuItem show;
     /** Error list dialog provider. */
-    private final DialogProvider<ErrorListDialog> errorListDialogProvider;
+    private final DialogProvider<ErrorsDialog> errorListDialogProvider;
     /** Currently showing error level. */
     private ErrorLevel errorLevel;
 
@@ -90,7 +90,7 @@ 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<ErrorsDialog> errorListDialogProvider,
             final ErrorManager errorManager) {
         super(new JLabel());
 
@@ -144,7 +144,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     private void checkErrors() {
         SwingUtilities.invokeLater(() -> {
             clearError();
-            final List<ProgramError> errors = errorManager.getErrors();
+            final Set<ProgramError> errors = errorManager.getErrors();
 
             if (errors.isEmpty()) {
                 setVisible(false);

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

@@ -31,7 +31,7 @@ import com.dmdirc.util.collections.MapList;
 
 import java.awt.Font;
 import java.awt.Window;
-import java.util.List;
+import java.util.Set;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -72,7 +72,7 @@ public class ErrorPopup extends StatusbarPopupWindow {
 
     @Override
     protected void initContent(final JPanel panel) {
-        final List<ProgramError> errors = errorManager.getErrors();
+        final Set<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

@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs.error;
-
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.logger.ErrorListener;
-import com.dmdirc.logger.ErrorManager;
-import com.dmdirc.logger.ProgramError;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
-import javax.swing.text.BadLocationException;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Shows information about an error.
- */
-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;
-    /** Date field. */
-    private JTextField date;
-    /** Severity field. */
-    private JTextField level;
-    /** Report Status field. */
-    private JTextField reportStatus;
-    /** Details field. */
-    private JTextArea details;
-    /** Details scrollpane. */
-    private JScrollPane scrollPane;
-
-    /** Creates a new instance of ErrorDetailPanel. */
-    public ErrorDetailPanel(final ErrorManager errorManager) {
-        this(errorManager, null);
-    }
-
-    /**
-     * Creates a new instance of ErrorDetailPanel.
-     *
-     * @param errorManager The error manager to retrieve errors from
-     * @param error        Error to be displayed
-     */
-    public ErrorDetailPanel(final ErrorManager errorManager, final ProgramError error) {
-        this.errorManager = errorManager;
-        this.error = error;
-
-        initComponents();
-
-        updateDetails();
-
-        layoutComponents();
-    }
-
-    /**
-     * Sets the error used for this panel.
-     *
-     * @param newError New ProgramError
-     */
-    public void setError(final ProgramError newError) {
-        error = newError;
-        updateDetails();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        date = new JTextField();
-        level = new JTextField();
-        reportStatus = new JTextField();
-        details = new JTextArea();
-        scrollPane = new JScrollPane(details);
-
-        date.setEditable(false);
-        level.setEditable(false);
-        reportStatus.setEditable(false);
-        details.setEditable(false);
-        details.setRows(5);
-        details.setWrapStyleWord(true);
-
-        errorManager.addErrorListener(this);
-    }
-
-    /** Updates the panels details. */
-    private void updateDetails() {
-        SwingUtilities.invokeLater(() -> {
-            details.setText("");
-            if (error == null) {
-                date.setText("");
-                level.setText("");
-                reportStatus.setText("");
-
-                return;
-            }
-
-            date.setText(new SimpleDateFormat("MMM dd hh:mm aa").format(error.getDate()));
-            level.setText(error.getLevel().toString());
-            reportStatus.setText(error.getReportStatus().toString());
-
-            details.append(error.getMessage() + '\n');
-            final List<String> trace = error.getTrace();
-            if (!trace.isEmpty()) {
-                details.append("\n");
-            }
-            for (String traceLine : trace) {
-                details.append(traceLine + '\n');
-            }
-            try {
-                details.getDocument().remove(details.getDocument().getLength() - 1, 1);
-            } catch (BadLocationException ex) {
-                //Ignore
-            }
-
-            UIUtilities.resetScrollPane(scrollPane);
-        });
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 2", "[right]rel[grow,fill]", ""));
-
-        add(new JLabel("Date: "));
-        add(date);
-
-        add(new JLabel("Severity: "));
-        add(level);
-
-        add(new JLabel("Report status: "));
-        add(reportStatus);
-
-        add(new JLabel("Details: "));
-        add(scrollPane, "grow, push");
-    }
-
-    @Override
-    public void errorAdded(final ProgramError error) {
-        //Ignore
-    }
-
-    @Override
-    public void errorDeleted(final ProgramError error) {
-        //Ignore
-    }
-
-    @Override
-    public void errorStatusChanged(final ProgramError error) {
-        if (this.error != null && this.error.equals(error)) {
-            reportStatus.setText(error.getReportStatus().toString());
-            date.setText(new SimpleDateFormat("MMM dd hh:mm aa").format(error.getDate()));
-        }
-    }
-
-    @Override
-    public boolean isReady() {
-        return isVisible();
-    }
-
-}

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

@@ -1,308 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs.error;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.logger.ErrorManager;
-import com.dmdirc.logger.ErrorReportStatus;
-import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.Dimension;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.inject.Inject;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSplitPane;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-
-import net.miginfocom.layout.PlatformDefaults;
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Error list dialog.
- */
-public final class ErrorListDialog extends StandardDialog implements
-        ActionListener, ListSelectionListener, TableModelListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 5;
-    /** Row selection change lock. */
-    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. */
-    private ErrorTable table;
-    /** Error detail panel. */
-    private ErrorDetailPanel errorDetails;
-    /** Send button. */
-    private JButton sendButton;
-    /** Delete button. */
-    private JButton deleteButton;
-    /** Delete all button. */
-    private JButton deleteAllButton;
-    /** Selected row. */
-    private final AtomicInteger selectedRow = new AtomicInteger(-1);
-    /** Row being deleted. */
-    private boolean rowBeingDeleted = false;
-
-    /**
-     * Creates a new instance of ErrorListDialog.
-     *
-     * @param parentWindow The parent window.
-     * @param iconManager The manager to use to load icons.
-     */
-    @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(errorManager);
-
-        initComponents(errorManager, iconManager);
-        layoutComponents();
-        initListeners();
-
-        selectedRow.set(table.getSelectedRow());
-    }
-
-    /**
-     * Loads the dialog and sets it as ready.
-     */
-    public void load() {
-        tableModel.load();
-    }
-
-    /** Initialises the components. */
-    private void initComponents(final ErrorManager errorManager, final IconManager iconManager) {
-        initButtons();
-
-        scrollPane = new JScrollPane();
-
-        table = new ErrorTable(iconManager, tableModel, scrollPane);
-
-        table.setPreferredScrollableViewportSize(new Dimension(600, 150));
-        scrollPane.setMinimumSize(new Dimension(150, 100));
-
-        scrollPane.setViewportView(table);
-
-        errorDetails = new ErrorDetailPanel(errorManager);
-    }
-
-    /** Initialises the buttons. */
-    private void initButtons() {
-        orderButtons(new JButton(), new JButton());
-
-        getCancelButton().setText("Close");
-        sendButton = new JButton("Send");
-        deleteButton = new JButton("Delete");
-        deleteAllButton = new JButton("Delete All");
-
-        sendButton.setEnabled(false);
-        deleteButton.setEnabled(false);
-        if (tableModel.getRowCount() > 0) {
-            deleteAllButton.setEnabled(true);
-        } else {
-            deleteAllButton.setEnabled(false);
-        }
-    }
-
-    /** Initialises the listeners. */
-    private void initListeners() {
-        tableModel.addTableModelListener(this);
-        table.getSelectionModel().addListSelectionListener(this);
-        sendButton.addActionListener(this);
-        deleteButton.addActionListener(this);
-        deleteAllButton.addActionListener(this);
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        final JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
-                true);
-        final JPanel panel = new JPanel();
-
-        panel.setLayout(new MigLayout("fill"));
-
-        panel.add(errorDetails, "wrap, grow, push");
-        panel.add(deleteAllButton, "split 4, tag left, sg button");
-        panel.add(deleteButton, "tag other, sg button");
-        panel.add(sendButton, "tag other, sg button");
-        panel.add(getCancelButton(), "tag ok, sg button");
-
-        splitPane.setTopComponent(scrollPane);
-        splitPane.setBottomComponent(panel);
-
-        splitPane.setDividerSize((int) PlatformDefaults.getPanelInsets(0).
-                getValue());
-
-        getContentPane().add(splitPane);
-    }
-
-    @Override
-    public void valueChanged(final ListSelectionEvent e) {
-        if (!e.getValueIsAdjusting()) {
-            final int localRow = table.getSelectedRow();
-            if (localRow > -1) {
-                final ProgramError error;
-                try {
-                    error = tableModel.getError(table.getRowSorter()
-                            .convertRowIndexToModel(localRow));
-                } catch (final IndexOutOfBoundsException ex) {
-                    //In the extremely rare case the error gets deleted whilst
-                    //we're changing the value, bail out gracefully
-                    return;
-                }
-                errorDetails.setError(error);
-                deleteButton.setEnabled(true);
-                if (error.getReportStatus() == ErrorReportStatus.NOT_APPLICABLE || error.
-                        getReportStatus() == ErrorReportStatus.FINISHED) {
-                    sendButton.setEnabled(false);
-                } else {
-                    sendButton.setEnabled(true);
-                }
-            } else {
-                errorDetails.setError(null);
-                deleteButton.setEnabled(false);
-                sendButton.setEnabled(false);
-            }
-            synchronized (selectionLock) {
-                if (rowBeingDeleted) {
-                    table.getSelectionModel().setSelectionInterval(selectedRow.
-                            get(), selectedRow.get());
-                    rowBeingDeleted = false;
-                }
-                selectedRow.set(localRow);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == getCancelButton()) {
-            setVisible(false);
-        } else if (e.getSource() == deleteButton) {
-            synchronized (selectionLock) {
-                errorManager.deleteError(tableModel.getError(
-                        table.getRowSorter().convertRowIndexToModel(table.getSelectedRow())));
-            }
-        } else if (e.getSource() == sendButton) {
-            synchronized (selectionLock) {
-                errorManager.sendError(tableModel.getError(
-                        table.getRowSorter().convertRowIndexToModel(table.getSelectedRow())));
-            }
-        } else if (e.getSource() == deleteAllButton) {
-            errorManager.deleteAll();
-        }
-    }
-
-    @Override
-    public boolean enterPressed() {
-        executeAction(getOkButton());
-        return true;
-    }
-
-    @Override
-    public void tableChanged(final TableModelEvent e) {
-        if (tableModel.getRowCount() == 0) {
-            return;
-        }
-        switch (e.getType()) {
-            case TableModelEvent.DELETE:
-                synchronized (selectionLock) {
-                    if (selectedRow.get() >= tableModel.getRowCount()) {
-                        selectedRow.set(tableModel.getRowCount() - 1);
-                    }
-                    table.getSelectionModel().setSelectionInterval(selectedRow.
-                            get(),
-                            selectedRow.get());
-                    rowBeingDeleted = true;
-                }
-                break;
-            case TableModelEvent.INSERT:
-                synchronized (selectionLock) {
-                    table.getSelectionModel().setSelectionInterval(selectedRow.
-                            get(),
-                            selectedRow.get());
-                }
-                break;
-            case TableModelEvent.UPDATE:
-                final int errorRow = e.getFirstRow();
-                final ProgramError error = tableModel.getError(errorRow);
-                if (errorRow == table.getSelectedRow()) {
-                    if (error.getReportStatus() == ErrorReportStatus.NOT_APPLICABLE || error.
-                            getReportStatus() == ErrorReportStatus.FINISHED) {
-                        sendButton.setEnabled(false);
-                    } else {
-                        sendButton.setEnabled(true);
-                    }
-                }
-                break;
-        }
-        if (tableModel.getRowCount() > 0) {
-            deleteAllButton.setEnabled(true);
-        } else {
-            deleteAllButton.setEnabled(false);
-        }
-    }
-
-    @Override
-    public void display() {
-        super.display();
-        setSize(new Dimension(600, 550));
-    }
-
-    @Override
-    public void dispose() {
-        tableModel.dispose();
-        super.dispose();
-    }
-
-}

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

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs.error;
-
-import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.ui.IconManager;
-
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.TableCellRenderer;
-
-/**
- * Table listing ProgramErrors in the client.
- */
-public class ErrorTable extends PackingTable {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3994014806819705247L;
-    /** Icon manager. */
-    private final IconManager iconManager;
-
-    /**
-     * Table listing ProgramErrors in the client.
-     *
-     * @param iconManager Icon manager
-     * @param tableModel  Table model
-     * @param scrollPane  Parent scrollpane
-     */
-    public ErrorTable(final IconManager iconManager,
-            final ErrorTableModel tableModel, final JScrollPane scrollPane) {
-        super(tableModel, scrollPane, true);
-        this.iconManager = iconManager;
-
-        setAutoCreateRowSorter(true);
-        setAutoCreateColumnsFromModel(true);
-        setColumnSelectionAllowed(false);
-        setCellSelectionEnabled(false);
-        setDragEnabled(false);
-        setFillsViewportHeight(false);
-        setRowSelectionAllowed(true);
-        setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        getRowSorter().toggleSortOrder(0);
-        getTableHeader().setReorderingAllowed(false);
-    }
-
-    @Override
-    public TableCellRenderer getCellRenderer(final int row,
-            final int column) {
-        switch (column) {
-            case 0:
-                return new ErrorLevelIconCellRenderer(iconManager);
-            default:
-                return super.getCellRenderer(row, column);
-        }
-    }
-
-}

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

@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.dialogs.error;
-
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.ErrorListener;
-import com.dmdirc.logger.ErrorManager;
-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;
-
-import javax.swing.table.AbstractTableModel;
-
-/**
- * Table model for displaying program errors.
- */
-public final class ErrorTableModel extends AbstractTableModel implements ErrorListener {
-
-    /** A version number for this class. */
-    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(final ErrorManager errorManager) {
-        this.errors = Collections.synchronizedList(new ArrayList<>());
-        this.errorManager = errorManager;
-    }
-
-    public void load() {
-        errorManager.addErrorListener(this);
-        setErrors(errorManager.getErrors());
-        ready = true;
-    }
-
-    /**
-     * Sets the list of errors.
-     *
-     * @param errors List of errors
-     */
-    public void setErrors(final Collection<ProgramError> errors) {
-        synchronized (this.errors) {
-            this.errors.clear();
-            this.errors.addAll(errors);
-        }
-
-        fireTableDataChanged();
-    }
-
-    @Override
-    public int getRowCount() {
-        synchronized (errors) {
-            return errors.size();
-        }
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 3;
-    }
-
-    @Override
-    public String getColumnName(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return "Severity";
-            case 1:
-                return "Report Status";
-            case 2:
-                return "Message";
-            default:
-                throw new IndexOutOfBoundsException(columnIndex + ">= 3");
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return ErrorLevel.class;
-            case 1:
-                return ErrorReportStatus.class;
-            case 2:
-                return String.class;
-            default:
-                throw new IndexOutOfBoundsException(columnIndex + ">= 3");
-        }
-    }
-
-    @Override
-    public boolean isCellEditable(final int rowIndex, final int columnIndex) {
-        return false;
-    }
-
-    @Override
-    public Object getValueAt(final int rowIndex, final int columnIndex) {
-        synchronized (errors) {
-            switch (columnIndex) {
-                case 0:
-                    return errors.get(rowIndex).getLevel();
-                case 1:
-                    return errors.get(rowIndex).getReportStatus();
-                case 2:
-                    return errors.get(rowIndex).getMessage();
-                default:
-                    throw new IndexOutOfBoundsException(columnIndex + ">= 3");
-            }
-        }
-    }
-
-    /**
-     * Gets the error at the specified row.
-     *
-     * @param rowIndex Row to retrieve
-     *
-     * @return Specified error
-     */
-    public ProgramError getError(final int rowIndex) {
-        synchronized (errors) {
-            return errors.get(rowIndex);
-        }
-    }
-
-    /**
-     * Returns the index of the specified error or -1 if the error is not found.
-     *
-     * @param error ProgramError to locate
-     *
-     * @return Error index or -1 if not found
-     */
-    public int indexOf(final ProgramError error) {
-        synchronized (errors) {
-            return errors.indexOf(error);
-        }
-    }
-
-    /**
-     * Adds an error to the list.
-     *
-     * @param error ProgramError to add
-     */
-    public void addRow(final ProgramError error) {
-        synchronized (errors) {
-            errors.add(error);
-            fireTableRowsInserted(errors.indexOf(error), errors.indexOf(error));
-        }
-    }
-
-    /**
-     * Removes a specified error from the list.
-     *
-     * @param error ProgramError to remove
-     */
-    public void removeRow(final ProgramError error) {
-        synchronized (errors) {
-            if (errors.contains(error)) {
-                final int row = errors.indexOf(error);
-                errors.remove(row);
-                fireTableRowsDeleted(row, row);
-            }
-        }
-    }
-
-    @Override
-    public void errorAdded(final ProgramError error) {
-        UIUtilities.invokeLater(() -> addRow(error));
-    }
-
-    @Override
-    public void errorDeleted(final ProgramError error) {
-        UIUtilities.invokeLater(() -> removeRow(error));
-    }
-
-    @Override
-    public void errorStatusChanged(final ProgramError error) {
-        UIUtilities.invokeLater(() -> {
-            synchronized (errors) {
-                final int errorRow = indexOf(error);
-                if (errorRow != -1 && errorRow < getRowCount()) {
-                    fireTableRowsUpdated(errorRow, errorRow);
-                }
-            }
-        });
-    }
-
-    @Override
-    public boolean isReady() {
-        return ready;
-    }
-
-    /**
-     * Disposes of this model, removing any added listeners.
-     */
-    public void dispose() {
-        errorManager.removeErrorListener(this);
-        ready = false;
-    }
-
-}

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/error/package-info.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * Error dialogs.
- */
-package com.dmdirc.addons.ui_swing.dialogs.error;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorLevelIconCellRenderer.java → ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/newerror/ErrorLevelIconCellRenderer.java

@@ -20,12 +20,12 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.error;
+package com.dmdirc.addons.ui_swing.dialogs.newerror;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.IconManager;
 
-import javax.swing.JLabel;
+import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableCellRenderer;
 
 /** List cell renderer for dates. */
@@ -47,7 +47,7 @@ public final class ErrorLevelIconCellRenderer extends DefaultTableCellRenderer {
 
     @Override
     public void setValue(final Object value) {
-        setHorizontalAlignment(JLabel.CENTER);
+        setHorizontalAlignment(SwingConstants.CENTER);
         setIcon(iconManager.getIcon(((ErrorLevel) value).getIcon()));
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/newerror/ErrorsDialog.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.dialogs.newerror;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.error.ErrorLevelIconCellRenderer;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.logger.ErrorLevel;
@@ -82,7 +81,6 @@ public class ErrorsDialog extends StandardDialog {
         layoutComponents();
         setTitle("Error list");
         setMinimumSize(new Dimension(600, 550));
-
     }
 
     @Override
@@ -93,6 +91,12 @@ public class ErrorsDialog extends StandardDialog {
         super.display();
     }
 
+    @Override
+    public void dispose() {
+        model.unload();
+        super.dispose();
+    }
+
     private void initComponents() {
         deleteAll = new JButton("Delete All");
         delete = new JButton("Delete");
@@ -108,6 +112,7 @@ public class ErrorsDialog extends StandardDialog {
         tableScrollPane = new JScrollPane();
         splitPane = getSplitPane();
         table = new JTable(tableModel);
+        table.setAutoCreateRowSorter(true);
         table.getModel().addTableModelListener(table);
         tableScrollPane.setViewportView(table);
         table.setPreferredScrollableViewportSize(new Dimension(600, 150));

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/newerror/ErrorsDialogController.java

@@ -45,9 +45,10 @@ import javax.swing.ListSelectionModel;
 /**
  * Controller linking the {@link ErrorsDialogModel} to the {@link ErrorsDialog}.
  */
-public class ErrorsDialogController implements ErrorsDialogModelListener {
+class ErrorsDialogController implements ErrorsDialogModelListener {
 
     private final ErrorsDialogModel model;
+    private JTable table;
     private GenericTableModel<ProgramError> tableModel;
     private JTextField date;
     private JTextField severity;
@@ -66,6 +67,7 @@ public class ErrorsDialogController implements ErrorsDialogModelListener {
             final JTextField reportStatus, final JTextArea details, final JButton deleteAll,
             final JButton delete, final JButton send, final JButton close) {
         this.tableModel = tableModel;
+        this.table = table;
         this.date = date;
         this.severity = severity;
         this.reportStatus = reportStatus;
@@ -93,13 +95,13 @@ public class ErrorsDialogController implements ErrorsDialogModelListener {
         delete.addActionListener(e -> model.deleteSelectedError());
         send.addActionListener(e -> model.sendSelectedError());
         close.addActionListener(e -> dialog.dispose());
+        checkEnabledStates();
     }
 
     @Override
     public void errorDeleted(final ProgramError error) {
-        UIUtilities.invokeAndWait(() -> {
+        UIUtilities.invokeLater(() -> {
             tableModel.removeValue(error);
-            deleteAll.setEnabled(model.isDeleteAllAllowed());
             checkEnabledStates();
         });
     }
@@ -114,15 +116,20 @@ public class ErrorsDialogController implements ErrorsDialogModelListener {
 
     @Override
     public void selectedErrorChanged(final Optional<ProgramError> selectedError) {
+        if (selectedError.isPresent()) {
+            final int index = tableModel.getIndex(selectedError.get());
+            table.getSelectionModel().setSelectionInterval(index, index);
+        } else {
+            table.getSelectionModel().setSelectionInterval(-1, -1);
+        }
         UIUtilities.invokeLater(() -> {
             date.setText(selectedError.map(ProgramError::getDate)
                     .map(d -> new SimpleDateFormat("MMM dd hh:mm aa").format(d)).orElse(""));
-            severity.setText(selectedError
-                    .map(ProgramError::getLevel)
-                    .map(ErrorLevel::name).orElse(""));
-            reportStatus.setText(selectedError
-                    .map(ProgramError::getReportStatus)
-                    .map(ErrorReportStatus::name).orElse(""));
+            severity.setText(
+                    selectedError.map(ProgramError::getLevel).map(ErrorLevel::name).orElse(""));
+            reportStatus.setText(
+                    selectedError.map(ProgramError::getReportStatus).map(ErrorReportStatus::name)
+                            .orElse(""));
             details.setText(selectedError.map(ProgramError::getDetails).orElse(""));
             details.append(Joiner.on('\n').skipNulls()
                     .join(selectedError.map(ProgramError::getTrace).orElse(Lists.newArrayList())));

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
-import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.feedback.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.newserver.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
@@ -137,13 +136,6 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
-    @Provides
-    @Singleton
-    public DialogProvider<ErrorListDialog> getErrorListDialogProvider(
-            final Provider<ErrorListDialog> provider) {
-        return new DialogProvider<>(provider);
-    }
-
     @Provides
     @Singleton
     public DialogProvider<FeedbackDialog> getFeedbackDialogProvider(