Plugin support for core changes.

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/BasicTextLineRenderer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.ui.messages.IRCDocument;
+import com.dmdirc.ui.messages.CachingDocument;
 import com.dmdirc.ui.messages.LinePosition;
 
 import java.awt.Color;
@@ -56,7 +56,7 @@ public class BasicTextLineRenderer implements LineRenderer {
 
     private final TextPane textPane;
     private final TextPaneCanvas textPaneCanvas;
-    private final IRCDocument document;
+    private final CachingDocument<AttributedString> document;
 
     private final Color highlightForeground;
     private final Color highlightBackground;
@@ -65,7 +65,7 @@ public class BasicTextLineRenderer implements LineRenderer {
     private final List<TextLayout> wrappedLines = new ArrayList<>();
 
     public BasicTextLineRenderer(final TextPane textPane, final TextPaneCanvas textPaneCanvas,
-            final IRCDocument document) {
+            final CachingDocument<AttributedString> document) {
         this.textPane = textPane;
         this.textPaneCanvas = textPaneCanvas;
         this.document = document;
@@ -81,7 +81,7 @@ public class BasicTextLineRenderer implements LineRenderer {
         result.textLayouts.clear();
         result.totalHeight = 0;
 
-        final AttributedCharacterIterator iterator = document.getStyledLine(line);
+        final AttributedCharacterIterator iterator = document.getStyledLine(line).getIterator();
         final int paragraphStart = iterator.getBeginIndex();
         final int paragraphEnd = iterator.getEndIndex();
         final LineBreakMeasurer lineMeasurer = new LineBreakMeasurer(iterator,
@@ -195,7 +195,7 @@ public class BasicTextLineRenderer implements LineRenderer {
     private void doHighlight(final int line, final Shape logicalHighlightShape, final Graphics2D g,
             final float canvasWidth, final float drawPosY, final float drawPosX,
             final int firstChar, final int lastChar, final boolean isEndOfLine) {
-        final AttributedCharacterIterator iterator = document.getStyledLine(line);
+        final AttributedCharacterIterator iterator = document.getStyledLine(line).getIterator();
         final AttributedString as = new AttributedString(iterator, firstChar, lastChar);
 
         as.addAttribute(TextAttribute.FOREGROUND, highlightForeground);

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

@@ -26,6 +26,8 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.ui.messages.AttributedStringMessageMaker;
+import com.dmdirc.ui.messages.CachingDocument;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentListener;
 import com.dmdirc.ui.messages.LinePosition;
@@ -117,7 +119,8 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         backgroundPainter = new BackgroundPainter(frame.getContainer().getConfigManager(),
                 urlBuilder, eventBus, configDomain, "textpanebackground",
                 "textpanebackgroundoption");
-        canvas = new TextPaneCanvas(this, document);
+        canvas = new TextPaneCanvas(this,
+                new CachingDocument<>(document, new AttributedStringMessageMaker()));
         final JXLayer<JComponent> layer = new JXLayer<>(canvas);
         layer.setUI(backgroundPainter);
         add(layer, "dock center");

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.textpane.LineRenderer.RenderResult;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.ui.messages.IRCDocument;
+import com.dmdirc.ui.messages.CachingDocument;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 import com.dmdirc.ui.messages.LinePosition;
 import com.dmdirc.util.StringUtils;
@@ -48,6 +48,7 @@ import java.awt.font.TextHitInfo;
 import java.awt.font.TextLayout;
 import java.awt.geom.Rectangle2D;
 import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -69,7 +70,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     /** Both Side padding for textpane. */
     private static final int DOUBLE_SIDE_PADDING = SINGLE_SIDE_PADDING * 2;
     /** IRCDocument. */
-    private final IRCDocument document;
+    private final CachingDocument<AttributedString> document;
     /** parent textpane. */
     private final TextPane textPane;
     /** Position -> LineInfo. */
@@ -99,7 +100,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @param parent   parent text pane for the canvas
      * @param document IRCDocument to be displayed
      */
-    public TextPaneCanvas(final TextPane parent, final IRCDocument document) {
+    public TextPaneCanvas(final TextPane parent, final CachingDocument<AttributedString> document) {
         this.document = document;
         textPane = parent;
         this.manager = parent.getWindow().getContainer().getConfigManager();
@@ -260,7 +261,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     public ClickTypeValue getClickType(final LineInfo lineInfo) {
         if (lineInfo.getLine() != -1) {
             final AttributedCharacterIterator iterator = document.getStyledLine(
-                    lineInfo.getLine());
+                    lineInfo.getLine()).getIterator();
             final int index = lineInfo.getIndex();
             if (index >= iterator.getBeginIndex() && index <= iterator.getEndIndex()) {
                 iterator.setIndex(lineInfo.getIndex());
@@ -361,7 +362,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
 
         if (lineInfo.getLine() != -1
                 && document.getLine(lineInfo.getLine()) != null) {
-            final AttributedCharacterIterator iterator = document.getStyledLine(lineInfo.getLine());
+            final AttributedCharacterIterator iterator =
+                    document.getStyledLine(lineInfo.getLine()).getIterator();
 
             if (lineInfo.getIndex() < iterator.getBeginIndex()
                     || lineInfo.getIndex() > iterator.getEndIndex()) {