Colour events.

src/com/dmdirc/events/DisplayPropertyMap.java

@@ -24,7 +24,7 @@ package com.dmdirc.events;
 
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Provides a map of {@link DisplayProperty}s to values, maintaining type safety.
@@ -33,7 +33,7 @@ public class DisplayPropertyMap {
 
     public static final DisplayPropertyMap EMPTY = new ReadOnlyDisplayPropertyMap();
 
-    private final Map<DisplayProperty<?>, Object> properties = new ConcurrentSkipListMap<>();
+    private final Map<DisplayProperty<?>, Object> properties = new ConcurrentHashMap<>();
 
     /**
      * Gets the value of the specified property, if present.

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

@@ -22,7 +22,11 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.util.collections.RollingList;
+import com.dmdirc.util.colours.Colour;
+
+import java.util.Optional;
 
 /**
  * Wraps an {@link IRCDocument} and caches recent lines.
@@ -63,6 +67,9 @@ public class CachingDocument<T> {
         }
 
         if (styledLine == null) {
+            final Optional<Colour> foregroundColour =
+                    line.getDisplayableProperty(DisplayProperty.FOREGROUND_COLOUR);
+            foregroundColour.ifPresent(maker::setDefaultForeground);
             styledLine = line.getStyled(maker);
             cachedLines.add(line);
             cachedStrings.add(styledLine);

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

@@ -22,9 +22,11 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayPropertyMap;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 /**
  * Represents a line of text in IRC.
@@ -129,10 +131,10 @@ public class Line {
      * @return AttributedString representing the specified StyledDocument
      */
     public <T> T getStyled(final StyledMessageMaker<T> maker) {
-        maker.clear();
         maker.setDefaultFont(fontName, fontSize);
         final T styledString = styliser.getStyledString(getLineParts(), maker);
         fontSize = maker.getMaximumFontSize();
+        maker.clear();
         return styledString;
     }
 
@@ -146,4 +148,8 @@ public class Line {
         return Arrays.hashCode(getLineParts());
     }
 
+    public <T> Optional<T> getDisplayableProperty(final DisplayProperty<T> property) {
+        return displayProperties.get(property);
+    }
+
 }