Browse Source

Re-introduce support for Channels.

I didn't think they were that important, really.

Change-Id: I3b9d2aa76702b764d95bce2cccc0e6a56856b4c9
Reviewed-on: http://gerrit.dmdirc.com/3468
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
pull/1/head
Chris Smith 10 years ago
parent
commit
cbd0bd52fb

+ 2
- 2
src/com/dmdirc/actions/CoreActionComponent.java View File

@@ -686,7 +686,7 @@ public enum CoreActionComponent implements ActionComponent {
686 686
         @Override
687 687
         public Object get(final Object arg) {
688 688
             // TODO: This should understand unset notifications
689
-            return ((Query) arg).getNotification().orNull();
689
+            return ((Query) arg).getNotification().or(Colour.BLACK);
690 690
         }
691 691
 
692 692
         @Override
@@ -734,7 +734,7 @@ public enum CoreActionComponent implements ActionComponent {
734 734
         @Override
735 735
         public Object get(final Object arg) {
736 736
             // TODO: This should understand unset notifications
737
-            return ((FrameContainer) arg).getNotification().orNull();
737
+            return ((FrameContainer) arg).getNotification().or(Colour.BLACK);
738 738
         }
739 739
 
740 740
         @Override

+ 0
- 1
src/com/dmdirc/ui/WindowManager.java View File

@@ -190,7 +190,6 @@ public class WindowManager {
190 190
         checkNotNull(parent);
191 191
         checkArgument(isInHierarchy(parent));
192 192
         checkNotNull(child);
193
-        checkArgument(!isInHierarchy(child));
194 193
 
195 194
         parent.addChild(child);
196 195
 

Loading…
Cancel
Save