Plugin support for optional colours.

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

src/com/dmdirc/addons/debug/commands/Notify.java

@@ -27,6 +27,9 @@ import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.ui.Colour;
+
+import com.google.common.base.Optional;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -59,8 +62,14 @@ public class Notify extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
-                "Current notification colour is: " + origin.getNotification());
+        final Optional<Colour> colour = origin.getNotification();
+        if (colour.isPresent()) {
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                    "Current notification colour is: " + colour.get());
+        } else {
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                    "No current notification colour");
+        }
     }
 
 }

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -436,7 +436,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
 
             @Override
             public void run() {
-                notificationSet(window, window.getNotification());
+                // TODO: Should this colour be configurable?
+                notificationSet(window, window.getNotification().or(Colour.BLACK));
             }
         });
     }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -241,7 +241,8 @@ public class TreeFrameManager implements FrameManager,
                 window.addFrameInfoListener(TreeFrameManager.this);
                 window.addNotificationListener(TreeFrameManager.this);
 
-                node.getLabel().notificationSet(window, window.getNotification());
+                // TODO: Should this colour be configurable?
+                node.getLabel().notificationSet(window, window.getNotification().or(Colour.BLACK));
                 node.getLabel().iconChanged(window, window.getIcon());
             }
         });