Use new core class for static styliser methods

freedesktop_notifications/src/main/java/com/dmdirc/addons/freedesktop_notifications/FDManager.java

@@ -36,7 +36,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.PluginFilesHelper;
-import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.StyledMessageUtils;
 import com.dmdirc.util.io.StreamUtils;
 import com.google.common.base.Strings;
 import com.google.common.html.HtmlEscapers;
@@ -140,7 +140,7 @@ public class FDManager implements ConfigChangeListener {
     public String prepareString(final String input) {
         String output = input;
         if (stripcodes) {
-            output = Styliser.stipControlCodes(output);
+            output = new StyledMessageUtils().stripControlCodes(output);
         }
         if (escapehtml) {
             output = HtmlEscapers.htmlEscaper().escape(output);

logging/src/main/java/com/dmdirc/addons/logging/LoggingManager.java

@@ -60,6 +60,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.IRCControlCodes;
+import com.dmdirc.ui.messages.StyledMessageUtils;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
@@ -118,6 +119,7 @@ public class LoggingManager implements ConfigChangeListener {
     private final Provider<String> directoryProvider;
     private final BackBufferFactory backBufferFactory;
     private final LogFileLocator locator;
+    private final StyledMessageUtils styleUtils;
     /** Timer used to close idle files. */
     private Timer idleFileTimer;
     /** Cached boolean settings. */
@@ -131,13 +133,15 @@ public class LoggingManager implements ConfigChangeListener {
     private int backbufferLines;
 
     @Inject
-    public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
+    public LoggingManager(
+            @PluginDomain(LoggingPlugin.class) final String domain,
             @PluginDomain(LoggingPlugin.class) final PluginInfo pluginInfo,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager, final EventBus eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
             final BackBufferFactory backBufferFactory,
-            final LogFileLocator locator) {
+            final LogFileLocator locator,
+            final StyledMessageUtils styleUtils) {
         this.domain = domain;
         this.pluginInfo = pluginInfo;
         this.config = globalConfig;
@@ -146,6 +150,7 @@ public class LoggingManager implements ConfigChangeListener {
         this.directoryProvider = directoryProvider;
         this.backBufferFactory = backBufferFactory;
         this.locator = locator;
+        this.styleUtils = styleUtils;
     }
 
     public void load() {
@@ -490,7 +495,7 @@ public class LoggingManager implements ConfigChangeListener {
         }
 
         if (stripcodes) {
-            finalLine.append(Styliser.stipControlCodes(line));
+            finalLine.append(styleUtils.stripControlCodes(line));
         } else {
             finalLine.append(line);
         }
@@ -514,7 +519,7 @@ public class LoggingManager implements ConfigChangeListener {
              * Do Nothing
              *
              * Makes no sense to keep adding errors to the logger when we can't write to the file,
-             * as chances are it will happen on every incomming line.
+             * as chances are it will happen on every incoming line.
              */
         }
         return false;

osd/src/main/java/com/dmdirc/addons/osd/OsdCommand.java

@@ -31,8 +31,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.messages.Styliser;
-
+import com.dmdirc.ui.messages.StyledMessageUtils;
 import javax.annotation.Nonnull;
 
 /**
@@ -71,9 +70,8 @@ public class OsdCommand extends Command implements IntelligentCommand {
      *
      * @return True if the notification was shown.
      */
-    public boolean showOSD(final int timeout, final String title,
-            final String message) {
-        osdManager.showWindow(timeout, Styliser.stipControlCodes(message));
+    public boolean showOSD(final int timeout, final String title, final String message) {
+        osdManager.showWindow(timeout, new StyledMessageUtils().stripControlCodes(message));
         return true;
     }
 

systray/src/main/java/com/dmdirc/addons/systray/SystrayManager.java

@@ -37,7 +37,7 @@ import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.StyledMessageUtils;
 import java.awt.AWTException;
 import java.awt.Frame;
 import java.awt.MenuItem;
@@ -62,6 +62,7 @@ public class SystrayManager implements ActionListener, MouseListener {
     private final AggregateConfigProvider globalConfig;
     /** Icon manager to get images from. */
     private final IconManager iconManager;
+    private final StyledMessageUtils styleUtils;
     /** The event bus to listen to events on. */
     private final EventBus eventBus;
     /** The tray icon we're currently using. */
@@ -74,12 +75,14 @@ public class SystrayManager implements ActionListener, MouseListener {
             @PluginDomain(SystrayPlugin.class) final PluginInfo pluginInfo,
             final MainFrame mainFrame,
             final IconManager iconManager,
+            final StyledMessageUtils styleUtils,
             final EventBus eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.pluginInfo = pluginInfo;
         this.mainFrame = mainFrame;
         this.iconManager = iconManager;
+        this.styleUtils = styleUtils;
         this.eventBus = eventBus;
     }
 
@@ -119,9 +122,8 @@ public class SystrayManager implements ActionListener, MouseListener {
      * @param message The contents of the notification
      * @param type    The type of notification
      */
-    public void notify(final String title, final String message,
-            final TrayIcon.MessageType type) {
-        icon.displayMessage(title, Styliser.stipControlCodes(message), type);
+    public void notify(final String title, final String message, final TrayIcon.MessageType type) {
+        icon.displayMessage(title, styleUtils.stripControlCodes(message), type);
     }
 
     /**

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -31,6 +29,7 @@ import com.dmdirc.ui.messages.CachingDocument;
 import com.dmdirc.ui.messages.Document;
 import com.dmdirc.ui.messages.DocumentListener;
 import com.dmdirc.ui.messages.LinePosition;
+import com.dmdirc.ui.messages.StyledMessageUtils;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.StringUtils;
 import com.dmdirc.util.URLBuilder;
@@ -56,6 +55,8 @@ import javax.swing.JScrollBar;
 import javax.swing.SwingConstants;
 import net.miginfocom.swing.MigLayout;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 /**
  * Styled, scrollable text pane.
  */
@@ -80,6 +81,8 @@ public final class TextPane extends JComponent implements MouseWheelListener,
     private final String configDomain;
     /** Clipboard to handle copy and paste cations. */
     private final Clipboard clipboard;
+    /** Style utilities class. */
+    private final StyledMessageUtils styleUtils;
     /** Last seen line. */
     private int lastSeenLine;
     /** Show new line notifications. */
@@ -100,6 +103,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         this.window = window;
         this.configDomain = configDomain;
         this.clipboard = clipboard;
+        styleUtils = new StyledMessageUtils(); // TODO: inject this
 
         setUI(new TextPaneUI());
         document = window.getBackBuffer().getDocument();
@@ -282,7 +286,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
                     }
                 } else if (i == selectedRange.getStartLine()) {
                     //loop from start of range to the end
-                    final int length = Styliser.stipControlCodes(line).length();
+                    final int length = styleUtils.stripControlCodes(line).length();
                     if (selectedRange.getStartPos() != -1 && selectedRange.getStartPos() < length) {
                         // Ensure that we're actually selecting some text on this line
                         selectedText.append(getText(line, selectedRange.getStartPos(), length,
@@ -295,7 +299,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
                     }
                 } else {
                     //loop the whole line
-                    final int length = Styliser.stipControlCodes(line).length();
+                    final int length = styleUtils.stripControlCodes(line).length();
                     selectedText.append(getText(line, 0, length, styled));
                 }
             }
@@ -320,7 +324,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         checkArgument(start >= 0, "'start' (" + start + ") must be non-negative");
 
         if (styled) {
-            return Styliser.getStyledText(text, start, end);
+            return styleUtils.getStyledText(text, start, end);
         } else {
             return text.substring(start, end);
         }

windowstatus/src/main/java/com/dmdirc/addons/windowstatus/WindowStatusPanel.java

@@ -24,12 +24,10 @@ package com.dmdirc.addons.windowstatus;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
-import com.dmdirc.ui.messages.Styliser;
-
+import com.dmdirc.ui.messages.StyledMessageUtils;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-
 import net.miginfocom.swing.MigLayout;
 
 public class WindowStatusPanel extends JPanel implements StatusBarComponent {
@@ -52,7 +50,7 @@ public class WindowStatusPanel extends JPanel implements StatusBarComponent {
      * @param text New text
      */
     public void setText(final String text) {
-        UIUtilities.invokeLater(() -> label.setText(Styliser.stipControlCodes(text)));
+        UIUtilities.invokeLater(() -> label.setText(new StyledMessageUtils().stripControlCodes(text)));
     }
 
 }