Remove {User,App}ErrorEvents.

src/com/dmdirc/Main.java

@@ -37,6 +37,7 @@ import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.logger.ModeAliasReporter;
 import com.dmdirc.logger.ProgramErrorAppender;
+import com.dmdirc.logger.ProgramErrorManager;
 import com.dmdirc.plugins.CorePluginExtractor;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
@@ -98,6 +99,7 @@ public class Main {
     /** Mode alias reporter to use. */
     private final ModeAliasReporter reporter;
     private final ServiceManager serviceManager;
+    private final ProgramErrorManager errorManager;
 
     static {
         // TODO: Can this go in a Dagger module?
@@ -107,6 +109,7 @@ public class Main {
         context.reset();
     }
 
+
     /**
      * Creates a new instance of {@link Main}.
      */
@@ -124,7 +127,8 @@ public class Main {
             final DMDircMBassador eventBus,
             final Set<CommandDetails> commands,
             final ModeAliasReporter reporter,
-            final ServiceManager serviceManager) {
+            final ServiceManager serviceManager,
+            final ProgramErrorManager errorManager) {
         this.identityManager = identityManager;
         this.connectionManager = connectionManager;
         this.commandLineParser = commandLineParser;
@@ -138,6 +142,7 @@ public class Main {
         this.commands = commands;
         this.reporter = reporter;
         this.serviceManager = serviceManager;
+        this.errorManager = errorManager;
     }
 
     /**
@@ -278,7 +283,7 @@ public class Main {
         // TODO: Add a normal logging thing, with or without runtime switching.
         final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
         final ProgramErrorAppender appender = new ProgramErrorAppender();
-        appender.setEventBus(eventBus);
+        appender.setProgramErrorManager(errorManager);
         appender.setContext(context);
         appender.setName("Error Logger");
         appender.start();

src/com/dmdirc/events/AppErrorEvent.java

@@ -1,37 +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.events;
-
-import com.dmdirc.logger.ErrorLevel;
-
-/**
- * Event class for app errors.
- */
-public class AppErrorEvent extends ErrorEvent {
-
-    public AppErrorEvent(final ErrorLevel level, final Throwable throwable, final String message,
-            final String details) {
-        super(level, throwable, message, details);
-    }
-
-}

src/com/dmdirc/events/UserErrorEvent.java

@@ -1,37 +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.events;
-
-import com.dmdirc.logger.ErrorLevel;
-
-/**
- * Event class for user errors.
- */
-public class UserErrorEvent extends ErrorEvent {
-
-    public UserErrorEvent(final ErrorLevel level, final Throwable throwable, final String message,
-            final String details) {
-        super(level, throwable, message, details);
-    }
-
-}

src/com/dmdirc/logger/DiskLoggingErrorManager.java

@@ -28,6 +28,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ErrorEvent;
+import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.base.Throwables;
@@ -96,19 +97,22 @@ public class DiskLoggingErrorManager {
     }
 
     @Handler
-    void handleErrorEvent(final ErrorEvent error) {
+    void handleErrorEvent(final ProgramErrorEvent error) {
         if (directoryError || !logging) {
             return;
         }
-        final String logName = error.getTimestamp() + "-" + error.getLevel();
+        final String logName = error.getTimestamp() + "-" + error.getError().getLevel();
         final Path errorFile = errorsDirectory.resolve(logName + ".log");
         final List<String> data = Lists
                 .newArrayList("Date: " + new Date(error.getTimestamp()),
-                        "Level: " + error.getLevel(),
-                        "Description: " + error.getMessage(),
+                        "Level: " + error.getError().getLevel(),
+                        "Description: " + error.getError().getMessage(),
                         "Details: ");
-        Arrays.stream(Throwables.getStackTraceAsString(error.getThrowable()).split("\n"))
-                .forEach(data::add);
+        //noinspection ThrowableResultOfMethodCallIgnored
+        if (error.getError().getThrowable() != null) {
+            Arrays.stream(Throwables.getStackTraceAsString(error.getError().getThrowable())
+                    .split("\n")).forEach(data::add);
+        }
         try {
             Files.write(errorFile, data, Charset.forName("UTF-8"));
         } catch (IOException ex) {

src/com/dmdirc/logger/ProgramErrorAppender.java

@@ -22,32 +22,19 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.ProgramError;
-
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
 
-import static com.dmdirc.util.LogUtils.APP_ERROR;
-import static com.dmdirc.util.LogUtils.FATAL_APP_ERROR;
-import static com.dmdirc.util.LogUtils.FATAL_USER_ERROR;
-import static com.dmdirc.util.LogUtils.USER_ERROR;
-import static com.dmdirc.util.LogUtils.getErrorLevel;
-import static com.dmdirc.util.LogUtils.getThrowable;
-
 /**
  * Converts log states into {@link ProgramError}s so they can be displayed to the user.
  */
 public class ProgramErrorAppender extends AppenderBase<ILoggingEvent> {
 
-    private DMDircMBassador eventBus;
+    private ProgramErrorManager errorManager;
 
     @Override
     public void start() {
-        if (eventBus == null) {
+        if (errorManager == null) {
             addError("No eventBus set for the appender named ["+ name +"].");
             return;
         }
@@ -59,23 +46,10 @@ public class ProgramErrorAppender extends AppenderBase<ILoggingEvent> {
         if (eventObject.getMarker() == null) {
             return;
         }
-        if (eventObject.getMarker() == APP_ERROR) {
-            eventBus.publish(new AppErrorEvent(
-                    getErrorLevel(eventObject.getLevel()),
-                    getThrowable(eventObject), eventObject.getFormattedMessage(), ""));
-        } else if (eventObject.getMarker() == USER_ERROR) {
-            eventBus.publish(new UserErrorEvent(getErrorLevel(eventObject.getLevel()),
-                    getThrowable(eventObject), eventObject.getFormattedMessage(), ""));
-        } else if (eventObject.getMarker() == FATAL_APP_ERROR) {
-            eventBus.publish(new AppErrorEvent(ErrorLevel.FATAL, getThrowable(eventObject),
-                    eventObject.getFormattedMessage(), ""));
-        } else if (eventObject.getMarker() == FATAL_USER_ERROR) {
-            eventBus.publish(new UserErrorEvent(ErrorLevel.FATAL, getThrowable(eventObject),
-                    eventObject.getFormattedMessage(), ""));
-        }
+        errorManager.handle(eventObject);
     }
 
-    public void setEventBus(final DMDircMBassador eventBus) {
-        this.eventBus = eventBus;
+    public void setProgramErrorManager(final ProgramErrorManager errorManager) {
+        this.errorManager = errorManager;
     }
 }

src/com/dmdirc/logger/ProgramErrorManager.java

@@ -23,14 +23,15 @@
 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.dmdirc.util.LogUtils;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
 
 import com.google.common.base.Throwables;
 
@@ -43,9 +44,12 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.slf4j.Marker;
+
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -77,19 +81,19 @@ public class ProgramErrorManager {
         eventBus.subscribe(this);
     }
 
-    @Handler
-    void handleAppError(final AppErrorEvent event) {
-        handleErrorEvent(event, true);
+    void handle(final ILoggingEvent event) {
+        final ProgramError error = addError(LogUtils.getErrorLevel(event.getLevel()),
+                event.getFormattedMessage(), LogUtils.getThrowable(event), "",
+                isAppError(event.getMarker()));
+        handleErrorEvent(error);
     }
 
-    @Handler
-    void handleUserError(final UserErrorEvent event) {
-        handleErrorEvent(event, false);
+    private boolean isAppError(@Nullable final Marker marker) {
+        return marker != null
+                && (marker == LogUtils.APP_ERROR || marker == LogUtils.FATAL_APP_ERROR);
     }
 
-    private void handleErrorEvent(final ErrorEvent event, final boolean appError) {
-        final ProgramError error = addError(event.getLevel(), event.getMessage(),
-                event.getThrowable(), event.getDetails(), appError);
+    void handleErrorEvent(final ProgramError error) {
         if (error.getLevel() == ErrorLevel.FATAL) {
             eventBus.publish(new FatalProgramErrorEvent(error));
         } else {

test/com/dmdirc/logger/DiskLoggingErrorManagerTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.logger;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
-import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.jimfs.Configuration;
@@ -33,6 +33,7 @@ import com.google.common.jimfs.Jimfs;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,12 +52,17 @@ public class DiskLoggingErrorManagerTest {
     @Mock private DMDircMBassador eventBus;
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder configBinder;
+    @Mock private ProgramErrorEvent error;
+    @Mock private ProgramError programError;
 
     private FileSystem fileSystem;
     private DiskLoggingErrorManager instance;
 
     @Before
     public void setUp() throws Exception {
+        when(error.getTimestamp()).thenReturn(new Date().getTime());
+        when(error.getError()).thenReturn(programError);
+        when(programError.getLevel()).thenReturn(ErrorLevel.MEDIUM);
         when(config.getBinder()).thenReturn(configBinder);
         fileSystem = Jimfs.newFileSystem(Configuration.unix());
         instance = new DiskLoggingErrorManager(fileSystem.getPath("/errors"), eventBus);
@@ -78,11 +84,9 @@ public class DiskLoggingErrorManagerTest {
 
     @Test
     public void testHandleErrorEvent() throws Exception {
-        final UserErrorEvent error = new UserErrorEvent(ErrorLevel.MEDIUM,
-                new IllegalStateException(""), "", "");
         instance.initialise(config);
         instance.handleLoggingSetting(true);
-        final String logName = error.getTimestamp() + "-" + error.getLevel() + ".log";;
+        final String logName = error.getTimestamp() + "-" + error.getError().getLevel() + ".log";;
         assertFalse(Files.exists(fileSystem.getPath("/errors", logName)));
         instance.handleErrorEvent(error);
         final Path errorPath = fileSystem.getPath("/errors", logName);
@@ -92,12 +96,9 @@ public class DiskLoggingErrorManagerTest {
 
     @Test
     public void testHandleErrorEventNotLogging() throws Exception {
-        final UserErrorEvent error = new UserErrorEvent(ErrorLevel.MEDIUM,
-                new IllegalStateException(""),
-                "", "");
         instance.initialise(config);
         instance.handleLoggingSetting(false);
-        final String logName = error.getTimestamp() + "-" + error.getLevel() + ".log";;
+        final String logName = error.getTimestamp() + "-" + error.getError().getLevel() + ".log";;
         assertFalse(Files.exists(fileSystem.getPath("/errors", logName)));
         instance.handleErrorEvent(error);
         assertFalse(Files.exists(fileSystem.getPath("/errors", logName)));