Raise events for error status changes.

src/com/dmdirc/logger/ErrorManager.java

@@ -254,7 +254,7 @@ public class ErrorManager {
     protected ProgramError getError(final ErrorLevel level, final String message,
             final Throwable exception, final String details) {
         return new ProgramError(level, message, exception, getTrace(message, exception), details,
-                new Date(), this);
+                new Date(), this, eventBus);
     }
 
     /**
@@ -381,8 +381,8 @@ public class ErrorManager {
                     listener.errorAdded(event.getError());
                 });
         if (!event.isHandled()) {
-            System.err.println(
-                    "An error has occurred: " + event.getError().getLevel() + ": " + event.getError().getMessage());
+            System.err.println("An error has occurred: " + event.getError().getLevel() + ": "
+                            + event.getError().getMessage());
 
             for (String line : event.getError().getTrace()) {
                 System.err.println("\t" + line);

src/com/dmdirc/logger/ProgramError.java

@@ -22,6 +22,9 @@
 
 package com.dmdirc.logger;
 
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.ProgramErrorStatusEvent;
+
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
 
@@ -57,6 +60,8 @@ public final class ProgramError implements Serializable {
     private final Date firstDate;
     /** The error manager to register with. */
     private final ErrorManager errorManager;
+    /** The eventbus to post status changes to. */
+    private final DMDircMBassador eventBus;
     /** Error report Status. */
     private ErrorReportStatus reportStatus;
     /** Has the error been output. */
@@ -71,13 +76,15 @@ public final class ProgramError implements Serializable {
      * @param trace     The textual trace for this error
      * @param details   The detailed cause of the error, if any.
      * @param date      Error time and date
+     * @param eventBus  The event bus to post status changes to
      */
     public ProgramError(final ErrorLevel level, final String message,
             @Nullable final Throwable exception,
             final Iterable<String> trace,
             @Nullable final String details,
             final Date date,
-            final ErrorManager errorManager) {
+            final ErrorManager errorManager,
+            final DMDircMBassador eventBus) {
         checkNotNull(level);
         checkNotNull(message);
         checkNotNull(date);
@@ -91,6 +98,7 @@ public final class ProgramError implements Serializable {
         this.firstDate = (Date) date.clone();
         this.reportStatus = ErrorReportStatus.WAITING;
         this.errorManager = errorManager;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -152,14 +160,10 @@ public final class ProgramError implements Serializable {
      * @param newStatus new ErrorReportStatus for the error
      */
     public void setReportStatus(final ErrorReportStatus newStatus) {
-        // TODO: Shift this into ErrorManager and use the event not the listeners
         if (newStatus != null && reportStatus != newStatus) {
             reportStatus = newStatus;
+            eventBus.publishAsync(new ProgramErrorStatusEvent(this));
             errorManager.fireErrorStatusChanged(this);
-
-            synchronized (this) {
-                notifyAll();
-            }
         }
     }
 

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.logger;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.util.ClientInfo;
 
 import com.google.common.collect.Lists;
@@ -41,42 +42,44 @@ import static org.junit.Assert.assertTrue;
 public class ProgramErrorTest {
 
     @Mock private ErrorManager errorManager;
+    @Mock private DMDircMBassador eventBus;
     @Mock private ClientInfo clientInfo;
 
     @Test(expected = NullPointerException.class)
     public void testConstructorNullErrorLevel() {
-        new ProgramError(null, "moo", null, Lists.newArrayList(), null, new Date(), errorManager);
+        new ProgramError(null, "moo", null, Lists.newArrayList(), null, new Date(), errorManager,
+                eventBus);
     }
 
     @Test(expected = NullPointerException.class)
     public void testConstructorNullMessage() {
         new ProgramError(ErrorLevel.HIGH, null, null, Lists.newArrayList(), null, new Date(),
-                errorManager);
+                errorManager, eventBus);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testConstructorEmptyMessage() {
         new ProgramError(ErrorLevel.HIGH, "", null, Lists.newArrayList(), null, new Date(),
-                errorManager);
+                errorManager, eventBus);
     }
 
     @Test(expected = NullPointerException.class)
     public void testConstructorNullDate() {
         new ProgramError(ErrorLevel.HIGH, "moo", null, Lists.newArrayList(), null, null,
-                errorManager);
+                errorManager, eventBus);
     }
 
     @Test
     public void testConstructorGood() {
         new ProgramError(ErrorLevel.HIGH, "moo", new UnsupportedOperationException(),
-                Lists.newArrayList(), null, new Date(), errorManager);
+                Lists.newArrayList(), null, new Date(), errorManager, eventBus);
     }
 
     @Test
     public void testGetLevel() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
                 new UnsupportedOperationException(), Lists.newArrayList(), null, new Date(),
-                errorManager);
+                errorManager, eventBus);
         assertEquals(ErrorLevel.HIGH, pe.getLevel());
     }
 
@@ -84,7 +87,7 @@ public class ProgramErrorTest {
     public void testGetMessage() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
                 new UnsupportedOperationException(), Lists.newArrayList(), null, new Date(),
-                errorManager);
+                errorManager, eventBus);
         assertEquals("moo", pe.getMessage());
     }
 
@@ -93,7 +96,7 @@ public class ProgramErrorTest {
         final Date date = new Date();
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
                 new UnsupportedOperationException(), Lists.newArrayList(), null, date,
-                errorManager);
+                errorManager, eventBus);
         assertEquals(date, pe.getDate());
     }
 
@@ -101,7 +104,7 @@ public class ProgramErrorTest {
     public void testReportStatus() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
                 new UnsupportedOperationException(), Lists.newArrayList(), null, new Date(),
-                errorManager);
+                errorManager, eventBus);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
         pe.setReportStatus(null);
         assertEquals(ErrorReportStatus.WAITING, pe.getReportStatus());
@@ -115,7 +118,7 @@ public class ProgramErrorTest {
     public void testToString() {
         final ProgramError pe = new ProgramError(ErrorLevel.HIGH, "moo",
                 new UnsupportedOperationException(), Lists.newArrayList(), null, new Date(),
-                errorManager);
+                errorManager, eventBus);
         assertTrue(pe.toString().contains("moo"));
     }
 
@@ -123,15 +126,15 @@ public class ProgramErrorTest {
     public void testEquals() {
         final Exception ex = new UnsupportedOperationException();
         final ProgramError pe1 = new ProgramError(ErrorLevel.LOW, "moo",
-                ex, Lists.newArrayList(), null, new Date(), errorManager);
+                ex, Lists.newArrayList(), null, new Date(), errorManager, eventBus);
         final ProgramError pe2 = new ProgramError(ErrorLevel.LOW, "moo",
-                ex, Lists.newArrayList(), null, new Date(), errorManager);
+                ex, Lists.newArrayList(), null, new Date(), errorManager, eventBus);
         final ProgramError pe3 = new ProgramError(ErrorLevel.MEDIUM, "moo",
-                ex, Lists.newArrayList(), null, new Date(), errorManager);
+                ex, Lists.newArrayList(), null, new Date(), errorManager, eventBus);
         final ProgramError pe4 = new ProgramError(ErrorLevel.LOW, "bar",
-                ex, Lists.newArrayList(), null, new Date(), errorManager);
+                ex, Lists.newArrayList(), null, new Date(), errorManager, eventBus);
         final ProgramError pe5 = new ProgramError(ErrorLevel.LOW, "moo",
-                null, Lists.newArrayList(), "Hello", new Date(), errorManager);
+                null, Lists.newArrayList(), "Hello", new Date(), errorManager, eventBus);
 
         assertFalse(pe1.equals(null)); // NOPMD
         assertFalse(pe1.equals("moo"));