Merge pull request #608 from csmith/tidying2

Minor tidying around displayable events.

src/com/dmdirc/events/DisplayableEvent.java

@@ -63,6 +63,20 @@ public interface DisplayableEvent {
      */
     <T> Optional<T> getDisplayProperty(DisplayProperty<T> property);
 
+    /**
+     * Determines whether this event has a display property.
+     *
+     * <p>Only use this method if the value of the property does not matter; otherwise use
+     * {@link #getDisplayProperty(DisplayProperty)} and use the appropriate {@link Optional}
+     * accessors.
+     *
+     * @param property The property to be checked.
+     * @return True if the property is present, false otherwise.
+     */
+    default boolean hasDisplayProperty(final DisplayProperty<?> property) {
+        return getDisplayProperty(property).isPresent();
+    }
+
     /**
      * Gets the map of all display properties.
      *

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

@@ -28,6 +28,8 @@ import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.EventUtils;
 
+import java.util.Arrays;
+
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -77,13 +79,9 @@ public class BackBuffer {
     @Handler(priority = EventUtils.PRIORITY_DISPLAYABLE_EVENT_HANDLER)
     private void handleDisplayableEvent(final DisplayableEvent event) {
         if (shouldDisplay(event)) {
-            formatter.format(event).map(s -> s.split("\n")).ifPresent(
-                    t -> {
-                        for (String line : t) {
-                            document.addText(event.getTimestamp(), event
-                                    .getDisplayProperties(), line);
-                        }
-                    });
+            formatter.format(event).map(s -> s.split("\n")).map(Arrays::stream).ifPresent(
+                    t -> t.forEach(line -> document.addText(
+                            event.getTimestamp(), event.getDisplayProperties(), line)));
         }
     }
 
@@ -95,7 +93,7 @@ public class BackBuffer {
      */
     private boolean shouldDisplay(final DisplayableEvent event) {
         return event.getSource().equals(owner)
-                && !event.getDisplayProperty(DisplayProperty.DO_NOT_DISPLAY).isPresent();
+                && !event.hasDisplayProperty(DisplayProperty.DO_NOT_DISPLAY);
     }
 
     public IRCDocument getDocument() {

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

@@ -60,7 +60,7 @@ public class EventFormatter {
     public Optional<String> format(final DisplayableEvent event) {
         final Optional<EventFormat> format = formatProvider.getFormat(event.getClass());
 
-        if (!event.getDisplayProperty(DisplayProperty.FOREGROUND_COLOUR).isPresent()) {
+        if (!event.hasDisplayProperty(DisplayProperty.FOREGROUND_COLOUR)) {
             format.flatMap(EventFormat::getDefaultForegroundColour)
                     .ifPresent(c -> event.setDisplayProperty(DisplayProperty.FOREGROUND_COLOUR, c));
         }