Tidy up some error handling.

src/com/dmdirc/logger/ProgramErrorManager.java

@@ -23,11 +23,13 @@
 package com.dmdirc.logger;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.ErrorEvent;
 import com.dmdirc.events.FatalProgramErrorEvent;
 import com.dmdirc.events.NonFatalProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorDeletedEvent;
 import com.dmdirc.events.ProgramErrorEvent;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.util.EventUtils;
 
 import com.google.common.base.Throwables;
@@ -52,12 +54,6 @@
 @Singleton
 public class ProgramErrorManager {
 
-    /** A list of exceptions which we don't consider bugs and thus don't report. */
-    private static final Class<?>[] BANNED_EXCEPTIONS = new Class<?>[]{
-            NoSuchMethodError.class, NoClassDefFoundError.class,
-            UnsatisfiedLinkError.class, AbstractMethodError.class,
-            IllegalAccessError.class, OutOfMemoryError.class,
-            NoSuchFieldError.class,};
     /** The event bus to listen for errors on. */
     private final DMDircMBassador eventBus;
     /** The current list of errors. */
@@ -81,9 +77,18 @@ public void initialise() {
     }
 
     @Handler
-    void handleErrorEvent(final ErrorEvent event) {
+    void handleAppError(final AppErrorEvent event) {
+        handleErrorEvent(event, true);
+    }
+
+    @Handler
+    void handleUserError(final UserErrorEvent event) {
+        handleErrorEvent(event, false);
+    }
+
+    private void handleErrorEvent(final ErrorEvent event, final boolean appError) {
         final ProgramError error = addError(event.getLevel(), event.getMessage(),
-                event.getThrowable(), event.getDetails(), isValidError(event.getThrowable()));
+                event.getThrowable(), event.getDetails(), appError);
         if (error.getLevel() == ErrorLevel.FATAL) {
             eventBus.publish(new FatalProgramErrorEvent(error));
         } else {
@@ -160,26 +165,4 @@ public void deleteAll() {
     public Set<ProgramError> getErrors() {
         return Collections.unmodifiableSet(errors);
     }
-
-    /**
-     * Determines whether or not the specified exception is one that we are willing to report.
-     *
-     * @param exception The exception to test
-     *
-     * @since 0.6.3m1
-     * @return True if the exception may be reported, false otherwise
-     */
-    private boolean isValidError(final Throwable exception) {
-        // TODO: Dedupe this from here and SentryLoggingErrorManager
-        Throwable target = exception;
-        while (target != null) {
-            for (Class<?> bad : BANNED_EXCEPTIONS) {
-                if (bad.equals(target.getClass())) {
-                    return false;
-                }
-            }
-            target = target.getCause();
-        }
-        return true;
-    }
 }

src/com/dmdirc/logger/SentryLoggingErrorManager.java

@@ -149,7 +149,6 @@ private Optional<String> getSourceLine(final Collection<String> trace) {
      * @return True if the exception may be reported, false otherwise
      */
     private boolean isValidError(final Throwable exception) {
-        // TODO: Dedupe this from here and ProgramErrorManager
         Throwable target = exception;
         while (target != null) {
             for (Class<?> bad : BANNED_EXCEPTIONS) {

src/com/dmdirc/ui/core/errors/CoreErrorsDialogModel.java

@@ -29,6 +29,7 @@
 import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.interfaces.ui.ErrorsDialogModelListener;
 import com.dmdirc.logger.ErrorManager;
+import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -122,7 +123,9 @@ public boolean isDeleteAllAllowed() {
 
     @Override
     public boolean isSendAllowed() {
-        return selectedError.isPresent();
+        final ErrorReportStatus status = selectedError.map(DisplayableError::getReportStatus)
+                .orElse(ErrorReportStatus.NOT_APPLICABLE);
+        return status == ErrorReportStatus.WAITING || status == ErrorReportStatus.ERROR;
     }
 
     @Override