Unsetting colours now reverts them (+ unit test)

Fixes issue 1136, issue 1106

git-svn-id: http://svn.dmdirc.com/trunk@3900 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/config/ConfigManager.java

@@ -28,7 +28,6 @@ import com.dmdirc.util.MapList;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

src/com/dmdirc/ui/messages/ColourManager.java

@@ -50,7 +50,7 @@ public final class ColourManager {
     };
     
     /** Actual colours we're using for the 16 IRC colours. */
-    private static Color[] IRC_COLOURS = DEFAULT_COLOURS;
+    private static Color[] IRC_COLOURS = DEFAULT_COLOURS.clone();
        
     /** Creates a new instance of ColourManager. */
     private ColourManager() {
@@ -59,15 +59,16 @@ public final class ColourManager {
     /**
      * Initialises the IRC_COLOURS array.
      */
-    private static void initColours() {
-        IRC_COLOURS = DEFAULT_COLOURS;
-        
+    private static void initColours() {        
         for (int i = 0; i < 16; i++) {
             if (IdentityManager.getGlobalConfig().hasOption("colour", String.valueOf(i))) {
                 IRC_COLOURS[i] = getColour(IdentityManager.getGlobalConfig()
                         .getOption("colour", String.valueOf(i)));
-            }
-            COLOUR_CACHE.remove(String.valueOf(i));
+                COLOUR_CACHE.remove(String.valueOf(i));
+            } else if (!IRC_COLOURS[i].equals(DEFAULT_COLOURS[i])) {
+                IRC_COLOURS[i] = DEFAULT_COLOURS[i];
+                COLOUR_CACHE.remove(String.valueOf(i));
+            } 
         }
     }
     

test/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -129,6 +129,13 @@ public class ColourManagerTest {
         IdentityManager.getConfigIdentity().unsetOption("colour", "4");
     }
     
+    @Test
+    public void testCustomColours2() {
+        IdentityManager.getConfigIdentity().setOption("colour", "4", "000000");        
+        IdentityManager.getConfigIdentity().unsetOption("colour", "4");
+        assertEquals("ff0000", ColourManager.getHex(ColourManager.getColour(4)).toLowerCase());
+    }    
+    
     public static junit.framework.Test suite() {
         return new junit.framework.JUnit4TestAdapter(ColourManagerTest.class);
     }