Store display properties in Line.

src/com/dmdirc/FrameContainer.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.ClientLineAddedEvent;
+import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.FrameComponentAddedEvent;
 import com.dmdirc.events.FrameComponentRemovedEvent;
@@ -493,7 +494,8 @@ public abstract class FrameContainer {
      */
     public void addLine(final String line, final Date timestamp) {
         for (final String myLine : line.split("\n")) {
-            getBackBuffer().getDocument().addText(timestamp.getTime(), myLine);
+            getBackBuffer().getDocument().addText(
+                    timestamp.getTime(), DisplayPropertyMap.EMPTY, myLine);
             eventBus.publishAsync(new ClientLineAddedEvent(this, myLine));
         }
     }

src/com/dmdirc/events/ChannelDisplayableEvent.java

@@ -65,4 +65,9 @@ public abstract class ChannelDisplayableEvent extends ChannelEvent implements Di
         return properties.get(property);
     }
 
+    @Override
+    public DisplayPropertyMap getDisplayProperties() {
+        return properties;
+    }
+
 }

src/com/dmdirc/events/DisplayPropertyMap.java

@@ -31,6 +31,8 @@ import java.util.concurrent.ConcurrentSkipListMap;
  */
 public class DisplayPropertyMap {
 
+    public static final DisplayPropertyMap EMPTY = new ReadOnlyDisplayPropertyMap();
+
     private final Map<DisplayProperty<?>, Object> properties = new ConcurrentSkipListMap<>();
 
     /**
@@ -56,4 +58,11 @@ public class DisplayPropertyMap {
         properties.put(property, value);
     }
 
+    private static class ReadOnlyDisplayPropertyMap extends DisplayPropertyMap {
+        @Override
+        public <T> void put(final DisplayProperty<T> property, final T value) {
+            throw new UnsupportedOperationException("Read only");
+        }
+    }
+
 }

src/com/dmdirc/events/DisplayableEvent.java

@@ -61,11 +61,17 @@ public interface DisplayableEvent {
      */
     <T> Optional<T> getDisplayProperty(DisplayProperty<T> property);
 
+    /**
+     * Gets the map of all display properties.
+     *
+     * @return The map of display properties.
+     */
+    DisplayPropertyMap getDisplayProperties();
+
     /**
      * Gets the timestamp at which the event occurred.
      *
      * @return The timestamp the event occurred at.
      */
     long getTimestamp();
-
 }

src/com/dmdirc/events/QueryDisplayableEvent.java

@@ -66,4 +66,8 @@ public abstract class QueryDisplayableEvent extends QueryEvent implements
         return properties.get(property);
     }
 
+    @Override
+    public DisplayPropertyMap getDisplayProperties() {
+        return properties;
+    }
 }

src/com/dmdirc/events/ServerDisplayableEvent.java

@@ -66,4 +66,9 @@ public abstract class ServerDisplayableEvent extends ServerEvent implements Disp
         return properties.get(property);
     }
 
+    @Override
+    public DisplayPropertyMap getDisplayProperties() {
+        return properties;
+    }
+
 }

src/com/dmdirc/events/UnknownCommandEvent.java

@@ -90,4 +90,9 @@ public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent
         return properties.get(property);
     }
 
+    @Override
+    public DisplayPropertyMap getDisplayProperties() {
+        return properties;
+    }
+
 }

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

@@ -84,7 +84,8 @@ public class BackBuffer {
     @Handler
     public void handleDisplayableEvent(final DisplayableEvent event) {
         if (enabled && !event.getDisplayProperty(DisplayProperty.HANDLED).isPresent()) {
-            formatter.format(event).ifPresent(t -> document.addText(event.getTimestamp(), t));
+            formatter.format(event).ifPresent(
+                    t -> document.addText(event.getTimestamp(), event.getDisplayProperties(), t));
             event.setDisplayProperty(DisplayProperty.HANDLED, Boolean.TRUE);
         }
     }

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

@@ -24,6 +24,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.AppErrorEvent;
+import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -117,13 +118,16 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * Adds the stylised string to the canvas.
      *
      * @param timestamp The timestamp to show along with the text.
+     * @param displayPropertyMap The display properties to use
      * @param text stylised string to add to the document
      */
-    public void addText(final long timestamp, final String text) {
+    public void addText(final long timestamp, final DisplayPropertyMap displayPropertyMap,
+            final String text) {
         final int start;
         synchronized (lines) {
             start = lines.size();
-            lines.add(new Line(styliser, formatTimestamp(timestamp), text, fontSize, fontName));
+            lines.add(new Line(styliser, formatTimestamp(timestamp), text, displayPropertyMap,
+                    fontSize, fontName));
         }
         fireLinesAdded(start, 1);
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.events.DisplayPropertyMap;
 import com.dmdirc.ui.core.util.ExtendedAttributedString;
 import com.dmdirc.ui.core.util.Utils;
 
@@ -38,6 +39,7 @@ public class Line {
     private final String timestamp;
     private final String text;
     private final Styliser styliser;
+    private final DisplayPropertyMap displayProperties;
     private int fontSize;
     private String fontName;
 
@@ -47,14 +49,16 @@ public class Line {
      * @param styliser  The styliser to use to style this line
      * @param timestamp The textual timestamp to use for the line
      * @param text      The textual content of the line
+     * @param displayProperties The properties to use when displaying the line.
      * @param fontSize  The height for this line
      * @param fontName  The name of the font to use for this line
      */
     public Line(final Styliser styliser, final String timestamp, final String text,
-            final int fontSize, final String fontName) {
+            final DisplayPropertyMap displayProperties, final int fontSize, final String fontName) {
         this.styliser = styliser;
         this.timestamp = timestamp; // TODO: Make this a long and convert further down the line
         this.text = text;
+        this.displayProperties = displayProperties;
         this.fontName = fontName;
         this.fontSize = fontSize;
     }