Merge pull request #724 from csmith/master

Extract an interface for Styliser.

src/main/java/com/dmdirc/ui/messages/StyleApplier.java

+/*
+ * Copyright (c) 2006-2016 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.messages;
+
+/**
+ * The styliser applies IRC styles to text. Styles are indicated by various control codes which are
+ * a de-facto IRC standard.
+ */
+public interface StyleApplier {
+
+    /** Character used to indicate hyperlinks. */
+    char CODE_HYPERLINK = 5;
+    /** Character used to indicate channel links. */
+    char CODE_CHANNEL = 6;
+    /** Character used to indicate smilies. */
+    char CODE_SMILIE = 7;
+    /** Character used to indicate nickname links. */
+    char CODE_NICKNAME = 16;
+    /** The character used for tooltips. */
+    char CODE_TOOLTIP = 19;
+
+    /**
+     * Stylises the specified strings and adds them to the specified maker.
+     *
+     * @param maker   The message maker to add styling to.
+     * @param strings The lines to be stylised
+     */
+    void addStyledString(StyledMessageMaker<?> maker, String... strings);
+
+    /**
+     * Applies the hyperlink styles and intelligent linking regexps to the target.
+     *
+     * @param string The string to be linked
+     *
+     * @return A copy of the string with hyperlinks marked up
+     */
+    String doLinks(String string);
+
+}

src/main/java/com/dmdirc/ui/messages/Styliser.java

  * The styliser applies IRC styles to text. Styles are indicated by various control codes which are
  * a de-facto IRC standard.
  */
-public class Styliser implements ConfigChangeListener {
-
-    /** Character used to indicate hyperlinks. */
-    public static final char CODE_HYPERLINK = 5;
-    /** Character used to indicate channel links. */
-    public static final char CODE_CHANNEL = 6;
-    /** Character used to indicate smilies. */
-    public static final char CODE_SMILIE = 7;
-    /** Character used to indicate nickname links. */
-    public static final char CODE_NICKNAME = 16;
-    /** The character used for tooltips. */
-    public static final char CODE_TOOLTIP = 19;
+public class Styliser implements ConfigChangeListener, StyleApplier {
+
     /** Internal chars. */
     private static final String INTERNAL_CHARS = String.valueOf(CODE_HYPERLINK)
             + CODE_NICKNAME + CODE_CHANNEL + CODE_SMILIE + CODE_TOOLTIP;
                 configManager.getOptionString("ui", "channelcolour"), null);
     }
 
-    /**
-     * Stylises the specified strings and adds them to the specified maker.
-     *
-     * @param maker   The message maker to add styling to.
-     * @param strings The lines to be stylised
-     */
+    @Override
     public void addStyledString(final StyledMessageMaker<?> maker, final String... strings) {
         maker.resetAllStyles();
 
         }
     }
 
-    /**
-     * Applies the hyperlink styles and intelligent linking regexps to the target.
-     *
-     * @param string The string to be linked
-     *
-     * @return A copy of the string with hyperlinks marked up
-     */
+    @Override
     public String doLinks(final String string) {
         String target = string;
         final String prefixes = connection == null ? null