Switch to DisplayableError for the core errors dialog.

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

@@ -30,8 +30,8 @@ import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.ui.ErrorsDialogModelListener;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.core.errors.CoreErrorsDialogModel;
+import com.dmdirc.ui.core.errors.DisplayableError;
 
 import java.awt.Window;
 import java.awt.event.MouseEvent;
@@ -100,8 +100,8 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements ErrorsDia
 
     /** Checks all the errors for the most significant error. */
     private void checkErrors() {
-        final Set<ProgramError> errors = model.getErrors();
-        label.setIcon(iconManager.getIcon(errors.stream().map(ProgramError::getLevel)
+        final Set<DisplayableError> errors = model.getErrors();
+        label.setIcon(iconManager.getIcon(errors.stream().map(DisplayableError::getSeverity)
                 .reduce(ErrorLevel.UNKNOWN, ErrorLevel::getMoreImportant).getIcon()));
         setVisible(!errors.isEmpty());
     }
@@ -151,22 +151,22 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements ErrorsDia
     }
 
     @Override
-    public void errorDeleted(final ProgramError error) {
+    public void errorDeleted(final DisplayableError error) {
         UIUtilities.invokeAndWait(this::checkErrors);
     }
 
     @Override
-    public void errorAdded(final ProgramError error) {
+    public void errorAdded(final DisplayableError error) {
         UIUtilities.invokeAndWait(this::checkErrors);
     }
 
     @Override
-    public void selectedErrorChanged(final Optional<ProgramError> selectedError) {
+    public void selectedErrorChanged(final Optional<DisplayableError> selectedError) {
         //Ignore
     }
 
     @Override
-    public void errorStatusChanged(final ProgramError error) {
+    public void errorStatusChanged(final DisplayableError error) {
         //Ignore
     }
 }

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

@@ -25,8 +25,8 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorReportStatus;
-import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.core.errors.CoreErrorsDialogModel;
+import com.dmdirc.ui.core.errors.DisplayableError;
 import com.dmdirc.util.collections.MapList;
 
 import java.awt.Font;
@@ -73,12 +73,12 @@ public class ErrorPopup extends StatusbarPopupWindow {
 
     @Override
     protected void initContent(final JPanel panel) {
-        final Set<ProgramError> errors = model.getErrors();
-        final MapList<ErrorLevel, ProgramError> buckets = new MapList<>();
-        final MapList<ErrorReportStatus, ProgramError> statuses = new MapList<>();
+        final Set<DisplayableError> errors = model.getErrors();
+        final MapList<ErrorLevel, DisplayableError> buckets = new MapList<>();
+        final MapList<ErrorReportStatus, DisplayableError> statuses = new MapList<>();
 
-        for (final ProgramError error : errors) {
-            buckets.add(error.getLevel(), error);
+        for (final DisplayableError error : errors) {
+            buckets.add(error.getSeverity(), error);
             statuses.add(error.getReportStatus(), error);
         }
 

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

@@ -23,13 +23,13 @@
 package com.dmdirc.addons.ui_swing.dialogs.errors;
 
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.ProgramError;
-import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.ui.core.errors.DisplayableError;
 
 import java.awt.Dimension;
 import java.awt.Window;
@@ -55,7 +55,7 @@ public class ErrorsDialog extends StandardDialog {
     private final ErrorsDialogModel model;
     private final IconManager iconManager;
     private JTable table;
-    private GenericTableModel<ProgramError> tableModel;
+    private GenericTableModel<DisplayableError> tableModel;
     private JSplitPane splitPane;
     private JScrollPane tableScrollPane;
     private JScrollPane detailsScrollPane;
@@ -107,9 +107,9 @@ public class ErrorsDialog extends StandardDialog {
         reportStatus = new JTextField();
         details = new JTextArea();
         getCancelButton().setText("Close");
-        tableModel = new GenericTableModel<>(ProgramError.class,
-                "getLevel", "getReportStatus", "getMessage");
-        tableModel.setHeaderNames("Severity", "Report Status", "Message");
+        tableModel = new GenericTableModel<>(DisplayableError.class,
+                "getSeverity", "getReportStatus", "getSummary");
+        tableModel.setHeaderNames("Severity", "Report Status", "Summary");
         tableScrollPane = new JScrollPane();
         detailsScrollPane = new JScrollPane();
         detailsScrollPane.setViewportView(details);

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

@@ -28,9 +28,7 @@ import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.interfaces.ui.ErrorsDialogModelListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorReportStatus;
-import com.dmdirc.logger.ProgramError;
-
-import com.google.common.base.Joiner;
+import com.dmdirc.ui.core.errors.DisplayableError;
 
 import java.text.SimpleDateFormat;
 import java.util.Optional;
@@ -49,7 +47,7 @@ class ErrorsDialogController implements ErrorsDialogModelListener {
 
     private final ErrorsDialogModel model;
     private JTable table;
-    private GenericTableModel<ProgramError> tableModel;
+    private GenericTableModel<DisplayableError> tableModel;
     private JTextField date;
     private JTextField severity;
     private JTextField reportStatus;
@@ -63,7 +61,7 @@ class ErrorsDialogController implements ErrorsDialogModelListener {
         this.model = model;
     }
 
-    public void init(final ErrorsDialog dialog, final GenericTableModel<ProgramError> tableModel,
+    public void init(final ErrorsDialog dialog, final GenericTableModel<DisplayableError> tableModel,
             final JTable table, final JTextField date, final JTextField severity,
             final JTextField reportStatus, final JTextArea details, final JScrollPane detailsScroll,
             final JButton deleteAll, final JButton delete, final JButton send, final JButton close) {
@@ -101,7 +99,7 @@ class ErrorsDialogController implements ErrorsDialogModelListener {
     }
 
     @Override
-    public void errorDeleted(final ProgramError error) {
+    public void errorDeleted(final DisplayableError error) {
         UIUtilities.invokeLater(() -> {
             tableModel.removeValue(error);
             checkEnabledStates();
@@ -109,7 +107,7 @@ class ErrorsDialogController implements ErrorsDialogModelListener {
     }
 
     @Override
-    public void errorAdded(final ProgramError error) {
+    public void errorAdded(final DisplayableError error) {
         UIUtilities.invokeLater(() -> {
             tableModel.addValue(error);
             checkEnabledStates();
@@ -117,7 +115,7 @@ class ErrorsDialogController implements ErrorsDialogModelListener {
     }
 
     @Override
-    public void selectedErrorChanged(final Optional<ProgramError> selectedError) {
+    public void selectedErrorChanged(final Optional<DisplayableError> selectedError) {
         if (selectedError.isPresent()) {
             final int index = tableModel.getIndex(selectedError.get());
             table.getSelectionModel().setSelectionInterval(index, index);
@@ -125,27 +123,21 @@ class ErrorsDialogController implements ErrorsDialogModelListener {
             table.getSelectionModel().setSelectionInterval(-1, -1);
         }
         UIUtilities.invokeLater(() -> {
-            date.setText(selectedError.map(ProgramError::getDate)
+            date.setText(selectedError.map(DisplayableError::getDate)
                     .map(d -> new SimpleDateFormat("MMM dd hh:mm aa").format(d)).orElse(""));
-            severity.setText(
-                    selectedError.map(ProgramError::getLevel).map(ErrorLevel::name).orElse(""));
+            severity.setText(selectedError.map(DisplayableError::getSeverity)
+                    .map(ErrorLevel::name).orElse(""));
             reportStatus.setText(
-                    selectedError.map(ProgramError::getReportStatus).map(ErrorReportStatus::name)
-                            .orElse(""));
-            details.setText("");
-            selectedError.map(ProgramError::getMessage).ifPresent(
-                    message -> details.append("Message: " + message + '\n'));
-            selectedError.map(ProgramError::getDetails).ifPresent(
-                    detail -> details.append("Detail: " + detail +'\n'));
-            selectedError.map(ProgramError::getTrace).ifPresent(
-                    trace -> details.append("Exception: " + Joiner.on('\n').skipNulls().join(trace)));
+                    selectedError.map(DisplayableError::getReportStatus)
+                            .map(ErrorReportStatus::name).orElse(""));
+            details.setText(selectedError.map(DisplayableError::getDetails).orElse(""));
             checkEnabledStates();
             UIUtilities.resetScrollPane(detailsScroll);
         });
     }
 
     @Override
-    public void errorStatusChanged(final ProgramError error) {
+    public void errorStatusChanged(final DisplayableError error) {
         UIUtilities.invokeLater(() -> {
             final int index = tableModel.getIndex(error);
             tableModel.fireTableRowsUpdated(index, index);