Remove ErrorFixedStatus

Change-Id: I84546c0da3ff10421178a7a39b92471dc06ee980
Depends-On: Ib80c1852cb5e9a627e793ff468723e932dda500d
Reviewed-on: http://gerrit.dmdirc.com/3331
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/logger/ErrorFixedStatus.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.logger;
-
-/**
- * Error fixed status.
- */
-public enum ErrorFixedStatus {
-
-    /** Not applicable. */
-    NEW("New bug"),
-    /** Finished state. */
-    KNOWN("Known bug"),
-    /** Sending state. */
-    FIXED("Fixed"),
-    /** Waiting state. */
-    INVALID("Invalid bug"),
-    /** Unreported. */
-    UNREPORTED("Unreported"),
-    /** Client too old. */
-    TOOOLD("Client too old - please update"),
-    /** Duplicate bug exists in list.
-     *
-     * @since 0.6.3m2 */
-    DUPLICATE("Duplicate bug exists in list"),
-    /** Unknown state. */
-    UNKNOWN("Unknown status");
-    /** toString value of the item. */
-    private String value;
-
-    /**
-     * Instantiates the enum.
-     *
-     * @param value toString value
-     */
-    ErrorFixedStatus(final String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-
-}

src/com/dmdirc/logger/ErrorManager.java

@@ -195,17 +195,13 @@ public class ErrorManager implements ConfigChangeListener {
         if (error.getLevel().equals(ErrorLevel.FATAL)) {
             if (dupe) {
                 error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
-                error.setFixedStatus(ErrorFixedStatus.DUPLICATE);
             }
         } else if (!canReport || (appError && !error.isValidSource())) {
             error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
-            error.setFixedStatus(ErrorFixedStatus.INVALID);
         } else if (!appError) {
             error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
-            error.setFixedStatus(ErrorFixedStatus.UNREPORTED);
         } else if (dupe) {
             error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
-            error.setFixedStatus(ErrorFixedStatus.DUPLICATE);
         } else if (sendReports) {
             sendError(error);
         }

src/com/dmdirc/logger/ProgramError.java

@@ -81,8 +81,6 @@ public final class ProgramError implements Serializable {
     private AtomicInteger count;
     /** Error report Status. */
     private ErrorReportStatus reportStatus;
-    /** Error fixed Status. */
-    private ErrorFixedStatus fixedStatus;
 
     /**
      * Creates a new instance of ProgramError.
@@ -124,7 +122,6 @@ public final class ProgramError implements Serializable {
         this.lastDate = (Date) date.clone();
         this.count = new AtomicInteger(1);
         this.reportStatus = ErrorReportStatus.WAITING;
-        this.fixedStatus = ErrorFixedStatus.UNKNOWN;
     }
 
     /**
@@ -191,15 +188,6 @@ public final class ProgramError implements Serializable {
         return reportStatus;
     }
 
-    /**
-     * Returns the fixed status of this error.
-     *
-     * @return Error fixed status
-     */
-    public ErrorFixedStatus getFixedStatus() {
-        return fixedStatus;
-    }
-
     /**
      * Sets the report Status of this error.
      *
@@ -216,22 +204,6 @@ public final class ProgramError implements Serializable {
         }
     }
 
-    /**
-     * Sets the fixed status of this error.
-     *
-     * @param newStatus new ErrorFixedStatus for the error
-     */
-    public void setFixedStatus(final ErrorFixedStatus newStatus) {
-        if (newStatus != null && !fixedStatus.equals(newStatus)) {
-            fixedStatus = newStatus;
-            ErrorManager.getErrorManager().fireErrorStatusChanged(this);
-
-            synchronized (this) {
-                notifyAll();
-            }
-        }
-    }
-
     /**
      * Returns the ID of this error.
      *
@@ -337,7 +309,6 @@ public final class ProgramError implements Serializable {
         raven.sendEvent(eventBuilder.build());
 
         setReportStatus(ErrorReportStatus.FINISHED);
-        setFixedStatus(ErrorFixedStatus.NEW);
     }
 
     /**

test/com/dmdirc/logger/ErrorFixedStatusTest.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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.logger;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ErrorFixedStatusTest {
-
-    @Test
-    public void testToString() {
-        assertTrue(ErrorFixedStatus.NEW.toString().toLowerCase().indexOf("new") > -1);
-        assertTrue(ErrorFixedStatus.KNOWN.toString().toLowerCase().indexOf("known") > -1);
-        assertTrue(ErrorFixedStatus.FIXED.toString().toLowerCase().indexOf("fixed") > -1);
-        assertTrue(ErrorFixedStatus.INVALID.toString().toLowerCase().indexOf("invalid") > -1);
-        assertTrue(ErrorFixedStatus.UNREPORTED.toString().toLowerCase().indexOf("unreported") > -1);
-        assertTrue(ErrorFixedStatus.UNKNOWN.toString().toLowerCase().indexOf("unknown") > -1);
-    }
-
-}

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -19,10 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.logger;
 
+package com.dmdirc.logger;
 
-import java.util.Arrays;
 import java.util.Date;
 
 import org.junit.Before;
@@ -31,7 +30,9 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ProgramErrorTest {
@@ -108,19 +109,6 @@ public class ProgramErrorTest {
         assertEquals(ErrorReportStatus.ERROR, pe.getReportStatus());
     }
 
-    @Test
-    public void testFixedStatus() {
-        final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
-                new Exception(), null, new Date());
-        assertEquals(ErrorFixedStatus.UNKNOWN, pe.getFixedStatus());
-        pe.setFixedStatus(null);
-        assertEquals(ErrorFixedStatus.UNKNOWN, pe.getFixedStatus());
-        pe.setFixedStatus(ErrorFixedStatus.UNKNOWN);
-        assertEquals(ErrorFixedStatus.UNKNOWN, pe.getFixedStatus());
-        pe.setFixedStatus(ErrorFixedStatus.INVALID);
-        assertEquals(ErrorFixedStatus.INVALID, pe.getFixedStatus());
-    }
-
     @Test
     public void testToString() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
@@ -159,4 +147,4 @@ public class ProgramErrorTest {
         assertEquals(pe1.hashCode(), pe1.hashCode());
     }
 
-}
+}