More refactoring

src/com/dmdirc/ui/swing/components/TextFrame.java

@@ -253,7 +253,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                             null, getContainer(), myLine);
                 }
                 
-                textPane.addText(lines);
+                textPane.getDocument().addText(lines);
 
                 if (frameBufferSize > 0) {
                     textPane.trim(frameBufferSize);

src/com/dmdirc/ui/swing/textpane/IRCDocument.java

@@ -22,7 +22,11 @@
 
 package com.dmdirc.ui.swing.textpane;
 
+import com.dmdirc.util.RollingList;
+
 import java.io.Serializable;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,26 +36,31 @@ import javax.swing.event.EventListenerList;
  * Data contained in a TextPane.
  */
 public final class IRCDocument implements Serializable {
-    
+
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 4;
-    
     /** List of lines of text. */
     private final List<Line> lines;
-    
     /** Listener list. */
     private final EventListenerList listeners;
-    
+    /** Cached lines. */
+    private RollingList<Line> cachedLines;
+    /** Cached attributed strings. */
+    private RollingList<AttributedString> cachedStrings;
+
     /** Creates a new instance of IRCDocument. */
     public IRCDocument() {
         lines = new ArrayList<Line>();
         listeners = new EventListenerList();
+
+        cachedLines = new RollingList<Line>(50);
+        cachedStrings = new RollingList<AttributedString>(50);
     }
-    
+
     /**
      * Returns the number of lines in this document.
      *
@@ -60,7 +69,7 @@ public final class IRCDocument implements Serializable {
     public int getNumLines() {
         return lines.size();
     }
-    
+
     /**
      * Returns the Line at the specified number.
      *
@@ -70,8 +79,8 @@ public final class IRCDocument implements Serializable {
      */
     public Line getLine(final int lineNumber) {
         return lines.get(lineNumber);
-    }  
-    
+    }
+
     /**
      * Adds the stylised string to the canvas.
      * 
@@ -83,7 +92,7 @@ public final class IRCDocument implements Serializable {
             fireLineAdded(lines.indexOf(text));
         }
     }
-    
+
     /**
      * Adds the stylised string to the canvas.
      * 
@@ -98,7 +107,7 @@ public final class IRCDocument implements Serializable {
             fireLinesAdded(start, text.size());
         }
     }
-    
+
     /**
      * Trims the document to the specified number of lines.
      *
@@ -112,7 +121,7 @@ public final class IRCDocument implements Serializable {
             fireTrimmed();
         }
     }
-    
+
     /** Clears all lines from the document. */
     protected void clear() {
         synchronized (lines) {
@@ -120,7 +129,7 @@ public final class IRCDocument implements Serializable {
             fireCleared();
         }
     }
-    
+
     /**
      * Adds a IRCDocumentListener to the listener list.
      *
@@ -134,7 +143,7 @@ public final class IRCDocument implements Serializable {
             listeners.add(IRCDocumentListener.class, listener);
         }
     }
-    
+
     /**
      * Removes a IRCDocumentListener from the listener list.
      *
@@ -143,7 +152,7 @@ public final class IRCDocument implements Serializable {
     public void removeIRCDocumentListener(final IRCDocumentListener listener) {
         listeners.remove(IRCDocumentListener.class, listener);
     }
-    
+
     /**
      * Fires the line added method on all listeners.
      *
@@ -153,11 +162,12 @@ public final class IRCDocument implements Serializable {
         final Object[] listenerList = listeners.getListenerList();
         for (int i = 0; i < listenerList.length; i += 2) {
             if (listenerList[i] == IRCDocumentListener.class) {
-                ((IRCDocumentListener) listenerList[i + 1]).lineAdded(index, lines.size());
+                ((IRCDocumentListener) listenerList[i + 1]).lineAdded(index,
+                                                                      lines.size());
             }
         }
     }
-    
+
     /**
      * Fires the lines added method on all listeners.
      *
@@ -168,11 +178,14 @@ public final class IRCDocument implements Serializable {
         final Object[] listenerList = listeners.getListenerList();
         for (int i = 0; i < listenerList.length; i += 2) {
             if (listenerList[i] == IRCDocumentListener.class) {
-                ((IRCDocumentListener) listenerList[i + 1]).linesAdded(index, size, lines.size());
+                ((IRCDocumentListener) listenerList[i + 1]).linesAdded(index,
+                                                                       size,
+                                                                       lines.
+                        size());
             }
         }
     }
-    
+
     /**
      * Fires the trimmed method on all listeners.
      */
@@ -184,7 +197,7 @@ public final class IRCDocument implements Serializable {
             }
         }
     }
-    
+
     /**
      * fires the cleared method on all listeners.
      */
@@ -196,5 +209,65 @@ public final class IRCDocument implements Serializable {
             }
         }
     }
+
+    /**
+     * Returns an attributed string for a particular line, utilising the
+     * document cache where possible.
+     *
+     * @param line Line to be styled
+     *
+     * @return Styled line
+     */
+    public AttributedString getStyledString(final Line line) {
+        AttributedString styledLine = null;
+        if (cachedLines.contains(line)) {
+            final int index = cachedLines.getList().indexOf(line);
+            styledLine = cachedStrings.get(index);
+        }
+
+        if (styledLine == null) {
+            styledLine = line.getStyled();
+            cachedLines.add(line);
+            cachedStrings.add(styledLine);
+        }
+
+        return styledLine;
+    }
+
+    /**
+     * Returns an attributed string for a particular line, utilising the
+     * document cache where possible.
+     *
+     * @param line Line number to be styled
+     *
+     * @return Styled line
+     */
+    public AttributedString getStyledString(final int line) {
+        return getStyledString(getLine(line));
+    }
+
+    /**
+     * Returns an attributed character iterator for a particular line,
+     * utilising the document cache where possible.
+     *
+     * @param line Line to be styled
+     *
+     * @return Styled line iterator
+     */
+    public AttributedCharacterIterator getStyledIterator(final Line line) {
+        return getStyledString(line).getIterator();
+    }
+
+    /**
+     * Returns an attributed character iterator for a particular line,
+     * utilising the document cache where possible.
+     *
+     * @param line Line number to be styled
+     *
+     * @return Styled line iterator
+     */
+    public AttributedCharacterIterator getStyledIterator(final int line) {
+        return getStyledString(line).getIterator();
+    }
 }
 

src/com/dmdirc/ui/swing/textpane/TextPane.java

@@ -77,8 +77,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
 
         document = new IRCDocument();
 
-        setMinimumSize(new Dimension(0, 0));
-
         setLayout(new MigLayout("fill"));
 
         canvas = new TextPaneCanvas(this, document);
@@ -89,8 +87,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         scrollBar = new JScrollBar(JScrollBar.VERTICAL);
         add(scrollBar, "dock east");
 
-        setAutoscrolls(true);
-
         scrollBar.setMaximum(document.getNumLines());
         scrollBar.setBlockIncrement(10);
         scrollBar.setUnitIncrement(1);
@@ -128,14 +124,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         setUI(new TextPaneUI());
     }
 
-    /**
-     * Adds styled text to the textpane.
-     * @param text styled text to add
-     */
-    public void addText(final List<Line> text) {
-        document.addText(text);
-    }
-
     /**
      * Sets the new position for the scrollbar and the associated position
      * to render the text from.

src/com/dmdirc/ui/swing/textpane/TextPaneCanvas.java

@@ -23,9 +23,7 @@
 package com.dmdirc.ui.swing.textpane;
 
 import com.dmdirc.ui.messages.IRCTextAttribute;
-import com.dmdirc.ui.swing.textpane.ClickType;
-
-import com.dmdirc.util.RollingList;
+    
 import java.awt.Cursor;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -87,10 +85,6 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     private int lastVisibleLine;
     /** Line wrapping cache. */
     private final Map<Integer, Integer> lineWrap;
-    /** Cached lines. */
-    private RollingList<Line> cachedLines;
-    /** Cached attributed strings. */
-    private RollingList<AttributedString> cachedStrings;
 
     /**
      * Creates a new text pane canvas.
@@ -112,9 +106,6 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         addMouseListener(this);
         addMouseMotionListener(this);
         addComponentListener(this);
-
-        cachedLines = new RollingList<Line>(50);
-        cachedStrings = new RollingList<AttributedString>(50);
     }
 
     /**
@@ -201,8 +192,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         // Iterate through the lines
         for (int i = startLine; i >= 0; i--) {
             float drawPosX;
-            final AttributedCharacterIterator iterator = getStyledLine(document.
-                    getLine(i)).getIterator();
+            final AttributedCharacterIterator iterator = document.
+                    getStyledIterator(i);
             paragraphStart = iterator.getBeginIndex();
             paragraphEnd = iterator.getEndIndex();
             lineMeasurer = new LineBreakMeasurer(iterator,
@@ -278,22 +269,6 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         checkForLink();
     }
 
-    private AttributedString getStyledLine(final Line line) {
-        AttributedString styledLine = null;
-        if (cachedLines.contains(line)) {
-            final int index = cachedLines.getList().indexOf(line);
-            styledLine = cachedStrings.get(index);
-        }
-
-        if (styledLine == null) {
-            styledLine = line.getStyled();
-            cachedLines.add(line);
-            cachedStrings.add(styledLine);
-        }
-
-        return styledLine;
-    }
-
     /**
      * Returns the number of timesa line will wrap.
      *
@@ -375,8 +350,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                 }
 
                 final int trans = (int) (lineHeight / 2f + drawPosY);
-                final AttributedCharacterIterator iterator = getStyledLine(
-                        document.getLine(line)).getIterator();
+                final AttributedCharacterIterator iterator = document.
+                        getStyledIterator(line);
                 final AttributedString as = new AttributedString(iterator,
                                                                  firstChar,
                                                                  lastChar);
@@ -482,8 +457,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     public ClickType getClickType(final LineInfo lineInfo) {
         if (lineInfo.getLine() != -1) {
-            final AttributedCharacterIterator iterator = getStyledLine(
-                    document.getLine(lineInfo.getLine())).getIterator();
+            final AttributedCharacterIterator iterator = document.
+                    getStyledIterator(lineInfo.getLine());
             iterator.setIndex(lineInfo.getIndex());
             Object linkattr =
                    iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
@@ -511,8 +486,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     public Object getAttributeValueAtPoint(LineInfo lineInfo) {
         if (lineInfo.getLine() != -1) {
-            final AttributedCharacterIterator iterator = getStyledLine(
-                    document.getLine(lineInfo.getLine())).getIterator();
+            final AttributedCharacterIterator iterator = document.
+                    getStyledIterator(lineInfo.getLine());
             iterator.setIndex(lineInfo.getIndex());
             Object linkattr =
                    iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
@@ -671,17 +646,17 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
 
     /** Checks for a link under the cursor and sets appropriately. */
     private void checkForLink() {
-        final LineInfo info = getClickPosition(getMousePosition());
-
-        if (info.getLine() != -1 && document.getLine(info.getLine()) != null) {
-            final AttributedCharacterIterator iterator = getStyledLine(
-                    document.getLine(info.getLine())).getIterator();
-            if (info.getIndex() < iterator.getBeginIndex() || info.getIndex() >
-                                                              iterator.
-                    getEndIndex()) {
+        final LineInfo lineInfo = getClickPosition(getMousePosition());
+
+        if (lineInfo.getLine() != -1 && document.getLine(lineInfo.getLine()) !=
+                                        null) {
+            final AttributedCharacterIterator iterator = document.
+                    getStyledIterator(lineInfo.getLine());
+            if (lineInfo.getIndex() < iterator.getBeginIndex() ||
+                    lineInfo.getIndex() > iterator.getEndIndex()) {
                 return;
             }
-            iterator.setIndex(info.getIndex());
+            iterator.setIndex(lineInfo.getIndex());
             Object linkattr =
                    iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
             if (linkattr instanceof String) {