Styliser tidying.

Remove ctor that was only used in tests.

Use Connection interface rather than requiring a Server.

Change-Id: Id7fa18cab27302045f60c32b478173de99a5df4d
Reviewed-on: http://gerrit.dmdirc.com/2925
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -22,8 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -139,31 +138,24 @@ public class Styliser implements ConfigChangeListener {
     /** Colours to use for URI and channel links. */
     private Colour uriColour, channelColour;
 
-    /** Server to get channel prefixes from, or null if not applicable. */
-    private final Server server;
+    /** Connection to get channel prefixes from, or null if not applicable. */
+    private final Connection connection;
+
     /** Config manager to retrieve settings from. */
     private final AggregateConfigProvider configManager;
+
     /** Colour manager to use to parse colours. */
     private final ColourManager colourManager;
 
     /**
      * Creates a new instance of Styliser.
      *
-     * @param owner The {@link FrameContainer} that owns this styliser.
-     */
-    public Styliser(final FrameContainer owner) {
-        this(owner.getServer(), owner.getConfigManager());
-    }
-
-    /**
-     * Creates a new instance of Styliser.
-     *
-     * @param server The {@link Server} that owns this styliser or null if n/a.
+     * @param connection The {@link Connection} that this styliser is for. May be {@code null}.
      * @param configManager the {@link AggregateConfigProvider} to get settings from.
      * @since 0.6.3
      */
-    public Styliser(final Server server, final AggregateConfigProvider configManager) {
-        this.server = server;
+    public Styliser(final Connection connection, final AggregateConfigProvider configManager) {
+        this.connection = connection;
         this.configManager = configManager;
 
         // TODO: This should probably be passed in, not created here.
@@ -303,8 +295,8 @@ public class Styliser implements ConfigChangeListener {
      */
     public String doLinks(final String string) {
         String target = string;
-        final String prefixes = server == null ? null
-                : server.getChannelPrefixes();
+        final String prefixes = connection == null ? null
+                : connection.getChannelPrefixes();
 
         String target2 = target;
         target = target.replaceAll(URL_REGEXP, CODE_HYPERLINK + "$0" + CODE_HYPERLINK);

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -45,14 +44,11 @@ public class IntelligentLinkingTest {
         this.input = input;
         this.expected = expected;
 
-        final FrameContainer container = mock(FrameContainer.class);
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         final Server server = mock(Server.class);
         when(server.getChannelPrefixes()).thenReturn("#&+");
-        when(container.getServer()).thenReturn(server);
-        when(container.getConfigManager()).thenReturn(manager);
 
-        styliser = new Styliser(container);
+        styliser = new Styliser(server, manager);
     }
 
     @Test

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.util.Utils;
 
@@ -63,11 +62,9 @@ public class StyliserStylesTest {
         final DefaultStyledDocument doc = new DefaultStyledDocument();
         final StringBuilder builder = new StringBuilder();
 
-        final FrameContainer container = mock(FrameContainer.class);
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
-        when(container.getConfigManager()).thenReturn(manager);
 
-        final Styliser styliser = new Styliser(container);
+        final Styliser styliser = new Styliser(null, manager);
         styliser.addStyledString(doc, new String[]{input});
         final AttributedCharacterIterator aci = Utils.getAttributedString(styliser,
                 new String[]{input, }, "dialog", 12).

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Enumeration;
@@ -83,11 +82,8 @@ public class StyliserTest {
         final String input1 = ((char) 18) + "abc" + ((char) 2) + "def" + ((char) 31) + "ghi";
         final String input2 = "abcdefghi";
 
-        final FrameContainer container = mock(FrameContainer.class);
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
-        when(container.getConfigManager()).thenReturn(manager);
-
-        final Styliser styliser = new Styliser(container);
+        final Styliser styliser = new Styliser(null, manager);
 
         for (int i = 0; i < input2.length(); i++) {
             final Enumeration<?> res1 = styliser.getStyledString(new String[]{input1})