Merge branch 'textpane-fix'

nbproject/build-impl.xml

@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="DMDirc-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="DMDirc-impl">
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
     <!-- 
                 ======================
@@ -102,10 +102,16 @@ is divided into following sections:
         <property name="javadoc.encoding.used" value="${source.encoding}"/>
         <property name="includes" value="**"/>
         <property name="excludes" value=""/>
-        <property name="do.depend" value="true"/>
+        <property name="do.depend" value="false"/>
         <condition property="do.depend.true">
             <istrue value="${do.depend}"/>
         </condition>
+        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+            <and>
+                <isset property="jaxws.endorsed.dir"/>
+                <available file="nbproject/jaxws-build.xml"/>
+            </and>
+        </condition>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -140,7 +146,6 @@ is divided into following sections:
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="" name="javac.compilerargs.jaxws"/>
             <attribute default="" name="sourcepath"/>
             <element name="customize" optional="true"/>
             <sequential>
@@ -148,7 +153,7 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                    <compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/>
+                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
                     <customize/>
                 </javac>
             </sequential>
@@ -188,9 +193,6 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>
             <sequential>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <classpath>
-                        <pathelement path="${clover.jar}"/>
-                    </classpath>
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
@@ -210,13 +212,13 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-nbjpda">
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
             <attribute default="${debug.classpath}" name="classpath"/>
             <attribute default="" name="stopclassname"/>
             <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -227,7 +229,9 @@ is divided into following sections:
             <attribute default="${build.classes.dir}" name="dir"/>
             <sequential>
                 <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
                 </nbjpdareload>
             </sequential>
         </macrodef>
@@ -245,6 +249,12 @@ is divided into following sections:
         <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
             <istrue value="${have-jdk-older-than-1.4}"/>
         </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
@@ -254,7 +264,7 @@ is divided into following sections:
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
                     <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -290,7 +300,7 @@ is divided into following sections:
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
             <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.jar.excludes}"/>
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
             </jar>
         </presetdef>
     </target>
@@ -301,6 +311,13 @@ is divided into following sections:
                 ===================
             -->
     <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
     </target>
@@ -321,7 +338,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
     <target name="-pre-compile-single">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -335,7 +352,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
     <!--
                 ====================
                 JAR BUILDING SECTION
@@ -385,7 +402,7 @@ is divided into following sections:
         </pathconvert>
         <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
         <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}" excludes="${dist.jar.excludes}" />
+            <fileset dir="${build.classes.dir}"/>
             <manifest>
                 <attribute name="Main-Class" value="${main.class}"/>
                 <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -459,7 +476,7 @@ is divided into following sections:
             -->
     <target depends="init" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="${javadoc.encoding.used}" destdir="${dist.javadoc.dir}" docencoding="${javadoc.encoding.used}" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
@@ -468,41 +485,10 @@ is divided into following sections:
             </fileset>
         </javadoc>
     </target>
-
-    <target name="move-javadoc-check">
-        <condition property="move.javadoc">
-            <isset property="javadoc.moveto"/>
-        </condition>
-    </target>
-    <target name="move-javadoc" depends="move-javadoc-check" if="move.javadoc">
-        <delete dir="${javadoc.moveto}"/>
-        <move file="${dist.javadoc.dir}" tofile="${javadoc.moveto}"/>
-    </target>
-
-    <target depends="init,-doccheck-check" name="-doccheck-build" if="doccheck.run">
-        <mkdir dir="${doccheck.dir}"/>
-        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${src.dir}" useexternalfile="true" version="${javadoc.version}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-        </javadoc>
-    </target>
-
-    <target name="-doccheck-check">
-        <condition property="doccheck.run">
-            <and>
-                <isset property="doccheck.path"/>
-                <isset property="doccheck.dir"/>
-                <available file="${doccheck.path}"/>
-            </and>
-        </condition>
-    </target>
-
     <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
         <nbbrowse file="${dist.javadoc.dir}/index.html"/>
     </target>
-    <target depends="init,-javadoc-build,-javadoc-browse,move-javadoc,-doccheck-build" description="Build Javadoc." name="javadoc"/>
-    <target depends="-doccheck-build" description="Build Javadoc error report (doccheck)." name="doccheck"/>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
     <!--
                 =========================
                 JUNIT COMPILATION SECTION

nbproject/genfiles.properties

@@ -10,5 +10,5 @@ nbproject/profiler-build-impl.xml.data.CRC32=bd5a0d51
 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
 nbproject/profiler-build-impl.xml.stylesheet.CRC32=42cb6bcf
 nbproject/build-impl.xml.data.CRC32=bd5a0d51
-nbproject/build-impl.xml.script.CRC32=c389cfac
-nbproject/build-impl.xml.stylesheet.CRC32=487672f9
+nbproject/build-impl.xml.script.CRC32=a83a4152
+nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5

src/com/dmdirc/addons/ui_swing/ChannelFrame.java

@@ -24,17 +24,17 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.ServerState;
-import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.commandparser.parsers.ChannelCommandParser;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.addons.ui_swing.components.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.SnappingJSplitPane;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.renderers.NicklistRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
-import com.dmdirc.addons.ui_swing.textpane.TextPane.ClickType;
+import com.dmdirc.addons.ui_swing.textpane.ClickType;
+import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.commandparser.parsers.ChannelCommandParser;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.parser.irc.ChannelClientInfo;
+import com.dmdirc.ui.interfaces.ChannelWindow;
 
 import java.awt.Color;
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_swing/components/TextFrame.java

@@ -26,6 +26,15 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
+import com.dmdirc.addons.ui_swing.actions.CommandAction;
+import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
+import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
+import com.dmdirc.addons.ui_swing.actions.SearchAction;
+import com.dmdirc.addons.ui_swing.actions.TextPaneCopyAction;
+import com.dmdirc.addons.ui_swing.textpane.ClickType;
 import com.dmdirc.commandparser.PopupManager;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupMenuItem;
@@ -41,22 +50,13 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;
-import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
-import com.dmdirc.addons.ui_swing.actions.CommandAction;
-import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
-import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
-import com.dmdirc.addons.ui_swing.actions.SearchAction;
-import com.dmdirc.addons.ui_swing.actions.TextPaneCopyAction;
+import com.dmdirc.addons.ui_swing.textpane.Line;
 import com.dmdirc.addons.ui_swing.textpane.LineInfo;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
-import com.dmdirc.addons.ui_swing.textpane.TextPane.ClickType;
-import com.dmdirc.addons.ui_swing.textpane.TextPanePageUpAction;
 import com.dmdirc.addons.ui_swing.textpane.TextPanePageDownAction;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-
+import com.dmdirc.addons.ui_swing.textpane.TextPanePageUpAction;
 import com.dmdirc.util.URLHandler;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Point;
@@ -72,7 +72,6 @@ import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
-import java.text.AttributedString;
 import java.util.Date;
 
 import java.util.LinkedList;
@@ -239,24 +238,22 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final List<AttributedString> lines = new LinkedList<AttributedString>();
+                final List<Line> lines = new LinkedList<Line>();
                 for (String myLine : encodedLine.split("\n")) {
                     if (timestamp) {
-                        lines.add(TextPane.styledDocumentToAttributedString(
-                                Styliser.getStyledString(new String[]{
+                        lines.add(new Line(new String[]{
                             Formatter.formatMessage(getConfigManager(),
                             "timestamp", new Date()), myLine,
-                        })));
+                        }));
                     } else {
-                        lines.add(TextPane.styledDocumentToAttributedString(
-                                Styliser.getStyledString(new String[]{myLine,})));
+                        lines.add(new Line(new String[]{myLine,}));
                     }
 
                     ActionManager.processEvent(CoreActionType.CLIENT_LINE_ADDED,
                             null, getContainer(), myLine);
                 }
                 
-                textPane.addText(lines);
+                textPane.getDocument().addText(lines);
 
                 if (frameBufferSize > 0) {
                     textPane.trim(frameBufferSize);

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

@@ -0,0 +1,14 @@
+
+package com.dmdirc.addons.ui_swing.textpane;
+
+/**
+ * Click types.
+ */
+public enum ClickType {
+
+    /** Hyperlink. */
+    HYPERLINK, /** Channel. */
+    CHANNEL, /** Nickname. */
+    NICKNAME, /** Normal. */
+    NORMAL
+}

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

@@ -22,46 +22,54 @@
 
 package com.dmdirc.addons.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;
+
 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 stylised lines of text. */
-    private final List<AttributedString> iterators;
-    
+    /** 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() {
-        iterators = new ArrayList<AttributedString>();
+        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.
      *
      * @return Number of lines
      */
     public int getNumLines() {
-        return iterators.size();
+        return lines.size();
     }
-    
+
     /**
      * Returns the Line at the specified number.
      *
@@ -69,112 +77,59 @@ public final class IRCDocument implements Serializable {
      *
      * @return Line at the specified number or null
      */
-    public AttributedString getLine(final int lineNumber) {
-        return iterators.get(lineNumber);
+    public Line getLine(final int lineNumber) {
+        return lines.get(lineNumber);
     }
-    
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param lineNumber line to get text from
-     *
-     * @return Text in the range from the line
-     */
-    public String getLineText(final int lineNumber) {
-        final AttributedCharacterIterator iterator = getLine(lineNumber).getIterator();
-        return getLineText(iterator, iterator.getBeginIndex(), iterator.getEndIndex());
-    }
-    
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param lineNumber line to get text from
-     * @param start Start index in the iterator
-     * @param end End index in the iterator
-     *
-     * @return Text in the range from the line
-     */
-    public String getLineText(final int lineNumber, final int start, final int end) {
-        return getLineText(getLine(lineNumber).getIterator(), start, end);
-    }
-    
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param iterator iterator to get text from
-     * @param start Start index in the iterator
-     * @param end End index in the iterator
-     *
-     * @return Text in the range from the line
-     */
-    public String getLineText(final AttributedCharacterIterator iterator, final int start, final int end) {
-        final StringBuffer text = new StringBuffer();
-        for (iterator.setIndex(start); iterator.getIndex() < end; iterator.next()) {
-            text.append(iterator.current());
-        }
-        return text.toString();
-    }
-    
-    /**
-     * Returns the length of the specified line
-     * 
-     * @param lineNumber Line to query
-     * 
-     * @return Length of the line
-     */
-    public int getLineLength(final int lineNumber) {
-        return iterators.get(lineNumber).getIterator().getEndIndex();
-    }    
-    
+
     /**
      * Adds the stylised string to the canvas.
      * 
      * @param text stylised string to add to the text
      */
-    public void addText(final AttributedString text) {
-        synchronized (iterators) {
-            iterators.add(text);
-            fireLineAdded(iterators.indexOf(text));
+    public void addText(final Line text) {
+        synchronized (lines) {
+            lines.add(text);
+            fireLineAdded(lines.indexOf(text));
         }
     }
-    
+
     /**
      * Adds the stylised string to the canvas.
      * 
      * @param text stylised string to add to the text
      */
-    public void addText(final List<AttributedString> text) {
-        synchronized (iterators) {
-            final int start = iterators.size();
-            for (AttributedString string : text) {
-                iterators.add(string);
+    public void addText(final List<Line> text) {
+        synchronized (lines) {
+            final int start = lines.size();
+            for (Line string : text) {
+                lines.add(string);
             }
             fireLinesAdded(start, text.size());
         }
     }
-    
+
     /**
      * Trims the document to the specified number of lines.
      *
      * @param numLines Number of lines to trim the document to
      */
     public void trim(final int numLines) {
-        synchronized (iterators) {
-            while (iterators.size() > numLines) {
-                iterators.remove(0);
+        synchronized (lines) {
+            while (lines.size() > numLines) {
+                lines.remove(0);
             }
             fireTrimmed();
         }
     }
-    
+
     /** Clears all lines from the document. */
     protected void clear() {
-        synchronized (iterators) {
-            iterators.clear();
+        synchronized (lines) {
+            lines.clear();
             fireCleared();
         }
     }
-    
+
     /**
      * Adds a IRCDocumentListener to the listener list.
      *
@@ -188,7 +143,7 @@ public final class IRCDocument implements Serializable {
             listeners.add(IRCDocumentListener.class, listener);
         }
     }
-    
+
     /**
      * Removes a IRCDocumentListener from the listener list.
      *
@@ -197,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.
      *
@@ -207,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, iterators.size());
+                ((IRCDocumentListener) listenerList[i + 1]).lineAdded(index,
+                                                                      lines.size());
             }
         }
     }
-    
+
     /**
      * Fires the lines added method on all listeners.
      *
@@ -222,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, iterators.size());
+                ((IRCDocumentListener) listenerList[i + 1]).linesAdded(index,
+                                                                       size,
+                                                                       lines.
+                        size());
             }
         }
     }
-    
+
     /**
      * Fires the trimmed method on all listeners.
      */
@@ -234,11 +193,11 @@ 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]).trimmed(iterators.size());
+                ((IRCDocumentListener) listenerList[i + 1]).trimmed(lines.size());
             }
         }
     }
-    
+
     /**
      * fires the cleared method on all listeners.
      */
@@ -250,5 +209,41 @@ public final class IRCDocument implements Serializable {
             }
         }
     }
+
+    /**
+     * Returns an attributed character iterator for a particular line,
+     * utilising the document cache where possible.
+     *
+     * @param line Line to be styled
+     *
+     * @return Styled line
+     */
+    public AttributedCharacterIterator 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.getIterator();
+    }
+
+    /**
+     * 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 AttributedCharacterIterator getStyledLine(final int line) {
+        return getStyledLine(getLine(line));
+    }
 }
 

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

@@ -66,7 +66,7 @@ public class IRCDocumentSearcher {
      */
     private LinePosition getEndPosition() {
         final int documentSize = document.getNumLines() - 1;
-        final int lineLength = document.getLineLength(documentSize);
+        final int lineLength = document.getLine(documentSize).getLength();
 
         return new LinePosition(documentSize, lineLength, documentSize,
                 lineLength);
@@ -93,7 +93,7 @@ public class IRCDocumentSearcher {
         
         int line = position.getEndLine();        
         for (int remaining = document.getNumLines(); remaining > 0; remaining--) {
-            final String lineText = document.getLineText(line);
+            final String lineText = document.getLine(line).getText();
             
             final List<LinePosition> matches = searchLine(line, lineText);
             
@@ -126,7 +126,7 @@ public class IRCDocumentSearcher {
         
         int line = position.getStartLine();        
         for (int remaining = document.getNumLines(); remaining > 0; remaining--) {
-            final String lineText = document.getLineText(line);
+            final String lineText = document.getLine(line).getText();
                         
             final List<LinePosition> matches = searchLine(line, lineText);
             

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

@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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.addons.ui_swing.textpane;
+
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.messages.IRCTextAttribute;
+import com.dmdirc.ui.messages.Styliser;
+
+import java.awt.font.TextAttribute;
+import java.text.AttributedString;
+import java.util.Arrays;
+import java.util.Enumeration;
+
+import javax.swing.UIManager;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import javax.swing.text.StyleConstants.CharacterConstants;
+import javax.swing.text.StyleConstants.ColorConstants;
+import javax.swing.text.StyleConstants.FontConstants;
+import javax.swing.text.StyledDocument;
+
+/**
+ * Represents a line of text in IRC.
+ */
+public class Line {
+
+    private final String[] lineParts;
+
+    /**
+     * Creates a new line.
+     * @param lineParts Parts of the line
+     */
+    public Line(final String[] lineParts) {
+        this.lineParts = lineParts;
+    }
+
+    /**
+     * Returns the line parts of this line.
+     *
+     * @return Lines parts
+     */
+    public String[] getLineParts() {
+        return lineParts;
+    }
+
+    /**
+     * Returns the length of the specified line
+     * 
+     * @return Length of the line
+     */
+    public int getLength() {
+        int length = 0;
+        for (String linePart : lineParts) {
+            length += linePart.length();
+        }
+        return length;
+    }
+
+    /**
+     * Returns the Line text at the specified number.
+     *
+     * @return Line at the specified number or null
+     */
+    public String getText() {
+        StringBuilder lineText = new StringBuilder();
+        for (String linePart : lineParts) {
+            lineText.append(linePart);
+        }
+        return lineText.toString();
+    }
+
+    /**
+     * Converts a StyledDocument into an AttributedString.
+     *
+     * @return AttributedString representing the specified StyledDocument
+     */
+    public AttributedString getStyled() {
+        final StyledDocument doc = Styliser.getStyledString(lineParts);
+
+        AttributedString attString = null;
+        final Element line = doc.getParagraphElement(0);
+        try {
+            attString = new AttributedString(line.getDocument().getText(0,
+                                                                        line.
+                    getDocument().getLength()));
+        }
+        catch (BadLocationException ex) {
+            Logger.userError(ErrorLevel.MEDIUM,
+                             "Unable to insert styled string: " +
+                             ex.getMessage());
+        }
+
+        if (attString.getIterator().getEndIndex() != 0) {
+            attString.addAttribute(TextAttribute.SIZE,
+                                   UIManager.getFont("TextPane.font").getSize());
+            attString.addAttribute(TextAttribute.FAMILY,
+                                   UIManager.getFont("TextPane.font").getFamily());
+        }
+
+        for (int i = 0; i < line.getElementCount(); i++) {
+            final Element element = line.getElement(i);
+
+            final AttributeSet as = element.getAttributes();
+            final Enumeration<?> ae = as.getAttributeNames();
+
+            while (ae.hasMoreElements()) {
+                final Object attrib = ae.nextElement();
+
+                if (attrib == IRCTextAttribute.HYPERLINK) {
+                    //Hyperlink
+                    attString.addAttribute(IRCTextAttribute.HYPERLINK,
+                                           as.getAttribute(attrib), element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == IRCTextAttribute.NICKNAME) {
+                    //Nicknames
+                    attString.addAttribute(IRCTextAttribute.NICKNAME,
+                                           as.getAttribute(attrib), element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == IRCTextAttribute.CHANNEL) {
+                    //Channels
+                    attString.addAttribute(IRCTextAttribute.CHANNEL,
+                                           as.getAttribute(attrib), element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == ColorConstants.Foreground) {
+                    //Foreground
+                    attString.addAttribute(TextAttribute.FOREGROUND,
+                                           as.getAttribute(attrib), element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == ColorConstants.Background) {
+                    //Background
+                    attString.addAttribute(TextAttribute.BACKGROUND,
+                                           as.getAttribute(attrib), element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == FontConstants.Bold) {
+                    //Bold
+                    attString.addAttribute(TextAttribute.WEIGHT,
+                                           TextAttribute.WEIGHT_BOLD, element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == FontConstants.Family) {
+                    //Family
+                    attString.addAttribute(TextAttribute.FAMILY,
+                                           as.getAttribute(attrib), element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == FontConstants.Italic) {
+                    //italics
+                    attString.addAttribute(TextAttribute.POSTURE,
+                                           TextAttribute.POSTURE_OBLIQUE,
+                                           element.getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == CharacterConstants.Underline) {
+                    //Underline
+                    attString.addAttribute(TextAttribute.UNDERLINE,
+                                           TextAttribute.UNDERLINE_ON, element.
+                            getStartOffset(),
+                                           element.getEndOffset());
+                }
+                else if (attrib == IRCTextAttribute.SMILEY) {
+                    /* Lets avoid showing broken smileys shall we!
+                    final Image image = IconManager.getIconManager().getImage((String) as.getAttribute(attrib)).
+                    getScaledInstance(14, 14, Image.SCALE_DEFAULT);
+                    ImageGraphicAttribute iga = new ImageGraphicAttribute(image, 
+                    (int) BOTTOM_ALIGNMENT, 5, 5);
+                    attString.addAttribute(TextAttribute.CHAR_REPLACEMENT, iga,
+                    element.getStartOffset(), element.getEndOffset());
+                     */
+                }
+            }
+        }
+
+        if (attString.getIterator().getEndIndex() == 0) {
+            return new AttributedString("\n");
+        }
+
+        return attString;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof Line) {
+            return Arrays.equals(((Line) obj).getLineParts(), getLineParts());
+        }
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int hashCode() {
+        return getLineParts().hashCode();
+    }
+}

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.textpane;
 
 /**
- *
+ * Information about a position in a line.
  */
 public final class LineInfo {
 

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

@@ -52,6 +52,18 @@ public class LinePosition {
         this.endPos = endPos;
     }
 
+    /**
+     * Constructs a new line position.
+     *
+     * @param position Position to create position from
+     */
+    public LinePosition(final LinePosition position) {
+        this.startLine = position.getStartLine();
+        this.endLine = position.getEndLine();
+        this.startPos = position.getStartPos();
+        this.endPos = position.getEndPos();
+    }
+
     /**
      * Returns the end line for this position.
      * 

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

@@ -0,0 +1,13 @@
+
+package com.dmdirc.addons.ui_swing.textpane;
+
+/**
+ * Selection event types.
+ */
+enum MouseEventType {
+
+    /** Mouse clicked. */
+    CLICK, /** Mouse dragged. */
+    DRAG, /** Mouse released. */
+    RELEASE
+}

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

@@ -23,12 +23,7 @@
 package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.messages.IRCTextAttribute;
-import com.dmdirc.ui.messages.Styliser;
 
-import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.datatransfer.StringSelection;
@@ -39,24 +34,9 @@ import java.awt.event.MouseMotionAdapter;
 import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
-import java.awt.font.TextAttribute;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
-import java.util.Enumeration;
-import java.util.List;
 
 import javax.swing.JComponent;
 import javax.swing.JScrollBar;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Element;
-import javax.swing.text.StyleConstants.CharacterConstants;
-import javax.swing.text.StyleConstants.ColorConstants;
-import javax.swing.text.StyleConstants.FontConstants;
-import javax.swing.text.StyledDocument;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -81,19 +61,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
     /** Parent Frame. */
     private final FrameContainer frame;
 
-    /** Click types. */
-    public enum ClickType {
-
-        /** Hyperlink. */
-        HYPERLINK,
-        /** Channel. */
-        CHANNEL,
-        /** Nickname. */
-        NICKNAME,
-        /** Normal. */
-        NORMAL,
-    }
-
     /** 
      * Creates a new instance of TextPane. 
      *
@@ -101,27 +68,16 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      */
     public TextPane(final FrameContainer frame) {
         super();
-        
         setUI(new TextPaneUI());
 
         this.frame = frame;
-
         document = new IRCDocument();
 
-        setMinimumSize(new Dimension(0, 0));
-
         setLayout(new MigLayout("fill"));
-
         canvas = new TextPaneCanvas(this, document);
-
         add(canvas, "dock center");
-
-
         scrollBar = new JScrollBar(JScrollBar.VERTICAL);
         add(scrollBar, "dock east");
-
-        setAutoscrolls(true);
-
         scrollBar.setMaximum(document.getNumLines());
         scrollBar.setBlockIncrement(10);
         scrollBar.setUnitIncrement(1);
@@ -129,177 +85,36 @@ public final class TextPane extends JComponent implements AdjustmentListener,
 
         addMouseWheelListener(this);
         document.addIRCDocumentListener(this);
+        setAutoscrolls(true);
 
         MouseMotionListener doScrollRectToVisible = new MouseMotionAdapter() {
 
             /** {@inheritDoc} */
             @Override
             public void mouseDragged(MouseEvent e) {
-                if (e.getXOnScreen() > getLocationOnScreen().getX() && e.getXOnScreen() < (getLocationOnScreen().
+                if (e.getXOnScreen() > getLocationOnScreen().getX() && e.
+                        getXOnScreen() < (getLocationOnScreen().
                         getX() + getWidth()) && e.getModifiersEx() ==
-                        MouseEvent.BUTTON1_DOWN_MASK) {
+                                                MouseEvent.BUTTON1_DOWN_MASK) {
                     if (getLocationOnScreen().getY() > e.getYOnScreen()) {
                         setScrollBarPosition(scrollBar.getValue() - 1);
-                    } else if (getLocationOnScreen().getY() + getHeight() <
-                            e.getYOnScreen()) {
+                    }
+                    else if (getLocationOnScreen().getY() + getHeight() <
+                             e.getYOnScreen()) {
                         setScrollBarPosition(scrollBar.getValue() + 1);
                     }
-                    canvas.highlightEvent(TextPaneCanvas.MouseEventType.DRAG, e);
+                    canvas.highlightEvent(MouseEventType.DRAG, e);
                 }
             }
         };
         addMouseMotionListener(doScrollRectToVisible);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void updateUI() {
         setUI(new TextPaneUI());
     }
-    
-    /** {@inheritDoc} */
-    @Override
-    public void setUI(final ComponentUI ui) {
-        super.setUI(new TextPaneUI());
-    }
-
-    /**
-     * Adds styled text to the textpane.
-     * @param text styled text to add
-     */
-    public void addText(final AttributedString text) {
-        document.addText(text);
-    }
-
-    /**
-     * Adds styled text to the textpane.
-     * @param text styled text to add
-     */
-    public void addText(final List<AttributedString> text) {
-        document.addText(text);
-    }
-
-    /**
-     * Stylises the specified string and adds it to the passed TextPane.
-     *
-     * @param string The line to be stylised and added
-     */
-    public void addStyledString(final String string) {
-        addStyledString(new String[]{string,});
-    }
-
-    /**
-     * Stylises the specified string and adds it to the passed TextPane.
-     *
-     * @param strings The strings to be stylised and added to a line
-     */
-    public void addStyledString(final String[] strings) {
-        addText(styledDocumentToAttributedString(
-                Styliser.getStyledString(strings)));
-    }
-
-    /**
-     * Converts a StyledDocument into an AttributedString.
-     *
-     * @param doc StyledDocument to convert
-     *
-     * @return AttributedString representing the specified StyledDocument
-     */
-    public static AttributedString styledDocumentToAttributedString(
-            final StyledDocument doc) {
-        //Now lets get hacky, loop through the styled document and add all 
-        //styles to an attributedString
-        AttributedString attString = null;
-        final Element line = doc.getParagraphElement(0);
-        try {
-            attString = new AttributedString(line.getDocument().getText(0,
-                    line.getDocument().getLength()));
-        } catch (BadLocationException ex) {
-            Logger.userError(ErrorLevel.MEDIUM,
-                    "Unable to insert styled string: " + ex.getMessage());
-        }
-
-        if (attString.getIterator().getEndIndex() != 0) {
-            attString.addAttribute(TextAttribute.SIZE,
-                    UIManager.getFont("TextPane.font").getSize());
-            attString.addAttribute(TextAttribute.FAMILY,
-                    UIManager.getFont("TextPane.font").getFamily());
-        }
-
-        for (int i = 0; i < line.getElementCount(); i++) {
-            final Element element = line.getElement(i);
-
-            final AttributeSet as = element.getAttributes();
-            final Enumeration<?> ae = as.getAttributeNames();
-
-            while (ae.hasMoreElements()) {
-                final Object attrib = ae.nextElement();
-
-                if (attrib == IRCTextAttribute.HYPERLINK) {
-                    //Hyperlink
-                    attString.addAttribute(IRCTextAttribute.HYPERLINK,
-                            as.getAttribute(attrib), element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == IRCTextAttribute.NICKNAME) {
-                    //Nicknames
-                    attString.addAttribute(IRCTextAttribute.NICKNAME,
-                            as.getAttribute(attrib), element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == IRCTextAttribute.CHANNEL) {
-                    //Channels
-                    attString.addAttribute(IRCTextAttribute.CHANNEL,
-                            as.getAttribute(attrib), element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == ColorConstants.Foreground) {
-                    //Foreground
-                    attString.addAttribute(TextAttribute.FOREGROUND,
-                            as.getAttribute(attrib), element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == ColorConstants.Background) {
-                    //Background
-                    attString.addAttribute(TextAttribute.BACKGROUND,
-                            as.getAttribute(attrib), element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == FontConstants.Bold) {
-                    //Bold
-                    attString.addAttribute(TextAttribute.WEIGHT,
-                            TextAttribute.WEIGHT_BOLD, element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == FontConstants.Family) {
-                    //Family
-                    attString.addAttribute(TextAttribute.FAMILY,
-                            as.getAttribute(attrib), element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == FontConstants.Italic) {
-                    //italics
-                    attString.addAttribute(TextAttribute.POSTURE,
-                            TextAttribute.POSTURE_OBLIQUE,
-                            element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == CharacterConstants.Underline) {
-                    //Underline
-                    attString.addAttribute(TextAttribute.UNDERLINE,
-                            TextAttribute.UNDERLINE_ON, element.getStartOffset(),
-                            element.getEndOffset());
-                } else if (attrib == IRCTextAttribute.SMILEY) {
-                    /* Lets avoid showing broken smileys shall we!
-                    final Image image = IconManager.getIconManager().getImage((String) as.getAttribute(attrib)).
-                            getScaledInstance(14, 14, Image.SCALE_DEFAULT);
-                    ImageGraphicAttribute iga = new ImageGraphicAttribute(image, 
-                            (int) BOTTOM_ALIGNMENT, 5, 5);
-                    attString.addAttribute(TextAttribute.CHAR_REPLACEMENT, iga,
-                            element.getStartOffset(), element.getEndOffset());
-                    */
-                }
-            }
-        }
-
-        if (attString.getIterator().getEndIndex() == 0) {
-            return new AttributedString("\n");
-        }
-
-        return attString;
-    }
 
     /**
      * Sets the new position for the scrollbar and the associated position
@@ -311,21 +126,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         canvas.setScrollBarPosition(position);
     }
 
-    /**
-     * Enables or disabled the scrollbar for the textpane.
-     *
-     * @param enabled State for the scrollbar
-     */
-    public void setScrollEnabled(final boolean enabled) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                scrollBar.setEnabled(enabled);
-            }
-        });
-    }
-
     /**
      * Returns the last visible line in the textpane.
      *
@@ -335,26 +135,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         return scrollBar.getValue();
     }
 
-    /**
-     * Returns the line count in the textpane.
-     *
-     * @return Line count
-     */
-    public int getNumLines() {
-        return document.getNumLines();
-    }
-
-    /**
-     * Returns the specified line in the textpane.
-     *
-     * @param line Line to return
-     *
-     * @return AttributedString at the specified line
-     */
-    public AttributedString getLine(final int line) {
-        return document.getLine(line);
-    }
-
     /**
      * Sets the scrollbar's maximum position. If the current position is
      * within <code>linesAllowed</code> of the end of the document, the
@@ -372,8 +152,9 @@ public final class TextPane extends JComponent implements AdjustmentListener,
 
         scrollBar.setMaximum(lines);
 
-        if (!scrollBar.getValueIsAdjusting() && scrollBar.getValue() == lines -
-                linesAllowed) {
+        if (!scrollBar.getValueIsAdjusting() && scrollBar.getValue() ==
+                                                lines -
+                                                linesAllowed) {
             setScrollBarPosition(lines);
         }
     }
@@ -398,7 +179,8 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         if (scrollBar.isEnabled()) {
             if (e.getWheelRotation() > 0) {
                 setScrollBarPosition(scrollBar.getValue() + e.getScrollAmount());
-            } else {
+            }
+            else {
                 setScrollBarPosition(scrollBar.getValue() - e.getScrollAmount());
             }
         }
@@ -431,31 +213,32 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         final LinePosition selectedRange = canvas.getSelectedRange();
 
         for (int i = selectedRange.getStartLine(); i <=
-                selectedRange.getEndLine(); i++) {
+                                                   selectedRange.getEndLine();
+             i++) {
             if (i != selectedRange.getStartLine()) {
                 selectedText.append('\n');
             }
             if (document.getNumLines() <= i) {
                 return selectedText.toString();
             }
-            final AttributedCharacterIterator iterator = document.getLine(i).
-                    getIterator();
+            final String line = document.getLine(i).getText();
             if (selectedRange.getEndLine() == selectedRange.getStartLine()) {
                 //loop through range
-                selectedText.append(getTextFromLine(iterator,
-                        selectedRange.getStartPos(), selectedRange.getEndPos()));
-            } else if (i == selectedRange.getStartLine()) {
+                selectedText.append(line.substring(selectedRange.getStartPos(),
+                                                   selectedRange.getEndPos()));
+            }
+            else if (i == selectedRange.getStartLine()) {
                 //loop from start of range to the end
-                selectedText.append(getTextFromLine(iterator,
-                        selectedRange.getStartPos(), iterator.getEndIndex()));
-            } else if (i == selectedRange.getEndLine()) {
+                selectedText.append(line.substring(selectedRange.getStartPos(),
+                                                   line.length()));
+            }
+            else if (i == selectedRange.getEndLine()) {
                 //loop from start to end of range
-                selectedText.append(getTextFromLine(iterator, 0,
-                        selectedRange.getEndPos()));
-            } else {
+                selectedText.append(line.substring(0, selectedRange.getEndPos()));
+            }
+            else {
                 //loop the whole line
-                selectedText.append(getTextFromLine(iterator, 0,
-                        iterator.getEndIndex()));
+                selectedText.append(line);
             }
         }
 
@@ -479,7 +262,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
     public boolean hasSelectedRange() {
         final LinePosition selectedRange = canvas.getSelectedRange();
         return !(selectedRange.getStartLine() == selectedRange.getEndLine() &&
-                selectedRange.getStartPos() == selectedRange.getEndPos());
+                 selectedRange.getStartPos() == selectedRange.getEndPos());
     }
 
     /**
@@ -491,120 +274,6 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         canvas.setSelectedRange(position);
     }
 
-    /**
-     * Returns the entire text from the specified line.
-     *
-     * @param line line to retrieve text from
-     *
-     * @return Text from the line
-     */
-    public String getTextFromLine(final int line) {
-        final AttributedCharacterIterator iterator = document.getLine(line).
-                getIterator();
-        return getTextFromLine(iterator, 0, iterator.getEndIndex(), document);
-    }
-
-    /**
-     * Returns the entire text from the specified line.
-     *
-     * @param line line to retrieve text from
-     * @param document Document to retrieve text from
-     * 
-     * @return Text from the line
-     */
-    public static String getTextFromLine(final int line,
-            final IRCDocument document) {
-        final AttributedCharacterIterator iterator = document.getLine(line).
-                getIterator();
-        return getTextFromLine(iterator, 0, iterator.getEndIndex(), document);
-    }
-
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param line line to retrieve text from
-     * @param start Start index in the iterator
-     * @param end End index in the iterator
-     *
-     * @return Text in the range from the line
-     */
-    public String getTextFromLine(final int line, final int start,
-            final int end) {
-        return getTextFromLine(document.getLine(line).getIterator(), start, end,
-                document);
-    }
-
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param line line to retrieve text from
-     * @param start Start index in the iterator
-     * @param end End index in the iterator
-     * @param document Document to retrieve text from
-     *
-     * @return Text in the range from the line
-     */
-    public static String getTextFromLine(final int line, final int start,
-            final int end, final IRCDocument document) {
-        return getTextFromLine(document.getLine(line).getIterator(), start, end,
-                document);
-    }
-
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param iterator iterator to get text from
-     *
-     * @return Text in the range from the line
-     */
-    public String getTextFromLine(final AttributedCharacterIterator iterator) {
-        return getTextFromLine(iterator, iterator.getBeginIndex(),
-                iterator.getEndIndex(), document);
-    }
-
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param iterator iterator to get text from
-     * @param document Document to retrieve text from
-     *
-     * @return Text in the range from the line
-     */
-    public static String getTextFromLine(final AttributedCharacterIterator iterator,
-            final IRCDocument document) {
-        return getTextFromLine(iterator, iterator.getBeginIndex(),
-                iterator.getEndIndex(), document);
-    }
-
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param iterator iterator to get text from
-     * @param start Start index in the iterator
-     * @param end End index in the iterator
-     *
-     * @return Text in the range from the line
-     */
-    public String getTextFromLine(final AttributedCharacterIterator iterator,
-            final int start, final int end) {
-        return getTextFromLine(iterator, start, end, document);
-    }
-
-    /**
-     * Returns the range of text from the specified iterator.
-     *
-     * @param iterator iterator to get text from
-     * @param start Start index in the iterator
-     * @param end End index in the iterator
-     * @param document Document to retrieve text from
-     *
-     * @return Text in the range from the line
-     */
-    public static String getTextFromLine(final AttributedCharacterIterator iterator,
-            final int start, final int end, final IRCDocument document) {
-        return document.getLineText(iterator, start, end);
-    }
-
     /**
      * Returns the type of text this click represents.
      * 
@@ -629,9 +298,11 @@ public final class TextPane extends JComponent implements AdjustmentListener,
             return "";
         }
         final int[] indexes =
-                canvas.getSurroundingWordIndexes(getTextFromLine(lineNumber),
-                index);
-        return getTextFromLine(lineNumber, indexes[0], indexes[1]);
+                    canvas.getSurroundingWordIndexes(document.getLine(lineNumber).
+                getText(),
+                                                     index);
+        return document.getLine(lineNumber).getText().substring(indexes[0],
+                                                                indexes[1]);
     }
 
     /**

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.ui.messages.IRCTextAttribute;
-import com.dmdirc.addons.ui_swing.textpane.TextPane.ClickType;
 
 import java.awt.Cursor;
 import java.awt.Graphics;
@@ -70,28 +69,10 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     private final Map<TextLayout, LineInfo> textLayouts;
     /** Line height. */
     private final int lineHeight;
-
-    /** Selection event types. */
-    protected enum MouseEventType {
-
-        /** Mouse clicked. */
-        CLICK,
-        /** Mouse dragged. */
-        DRAG,
-        /** Mouse released. */
-        RELEASE,
-    }
-
     /** position of the scrollbar. */
     private int scrollBarPosition;
-    /** Start line of the selection. */
-    private int selStartLine;
-    /** Start character of the selection. */
-    private int selStartChar;
-    /** End line of the selection. */
-    private int selEndLine;
-    /** End character of the selection. */
-    private int selEndChar;
+    /** Selection. */
+    private LinePosition selection;
     /** First visible line. */
     private int firstVisibleLine;
     /** Last visible line. */
@@ -116,6 +97,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         textLayouts = new HashMap<TextLayout, LineInfo>();
         positions = new HashMap<Rectangle, TextLayout>();
         lineWrap = new HashMap<Integer, Integer>();
+        selection = new LinePosition(-1, -1, -1, -1);
         addMouseListener(this);
         addMouseMotionListener(this);
         addComponentListener(this);
@@ -141,10 +123,6 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         float drawPosY = formatHeight;
         int startLine = scrollBarPosition;
 
-        int useStartLine;
-        int useStartChar;
-        int useEndLine;
-        int useEndChar;
         int paragraphStart;
         int paragraphEnd;
         LineBreakMeasurer lineMeasurer;
@@ -155,14 +133,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         textLayouts.clear();
         positions.clear();
 
-        //check theres something to draw
-        if (document.getNumLines() == 0) {
-            setCursor(Cursor.getDefaultCursor());
-            return;
-        }
-
-        //check there is some space to draw in
-        if (formatWidth < 1) {
+        //check theres something to draw and theres some space to draw in
+        if (document.getNumLines() == 0 || formatWidth < 1) {
             setCursor(Cursor.getDefaultCursor());
             return;
         }
@@ -180,35 +152,14 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         lastVisibleLine = startLine;
         firstVisibleLine = startLine;
 
-        if (selStartLine > selEndLine) {
-            // Swap both
-            useStartLine = selEndLine;
-            useStartChar = selEndChar;
-            useEndLine = selStartLine;
-            useEndChar = selStartChar;
-        } else if (selStartLine == selEndLine && selStartChar > selEndChar) {
-            // Just swap the chars
-            useStartLine = selStartLine;
-            useStartChar = selEndChar;
-            useEndLine = selEndLine;
-            useEndChar = selStartChar;
-        } else {
-            // Swap nothing
-            useStartLine = selStartLine;
-            useStartChar = selStartChar;
-            useEndLine = selEndLine;
-            useEndChar = selEndChar;
-        }
-
         // Iterate through the lines
         for (int i = startLine; i >= 0; i--) {
             float drawPosX;
-            final AttributedCharacterIterator iterator = document.getLine(i).
-                    getIterator();
+            final AttributedCharacterIterator iterator = document.getStyledLine(i);
             paragraphStart = iterator.getBeginIndex();
             paragraphEnd = iterator.getEndIndex();
             lineMeasurer = new LineBreakMeasurer(iterator,
-                    g.getFontRenderContext());
+                                                 g.getFontRenderContext());
             lineMeasurer.setPosition(paragraphStart);
 
             final int wrappedLine;
@@ -220,7 +171,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
             } else {
                 //get it and populate the cache
                 wrappedLine = getNumWrappedLines(lineMeasurer,
-                        paragraphStart, paragraphEnd, formatWidth);
+                                                 paragraphStart, paragraphEnd,
+                                                 formatWidth);
                 lineWrap.put(i, wrappedLine);
             }
 
@@ -254,12 +206,12 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                     g.setColor(textPane.getForeground());
 
                     layout.draw(g, drawPosX, drawPosY + lineHeight / 2f);
-                    doHighlight(i, useStartLine, useEndLine, useStartChar,
-                            useEndChar, chars, layout, g, drawPosY, drawPosX);
+                    doHighlight(i, chars, layout, g, drawPosY, drawPosX);
                     firstVisibleLine = i;
                     textLayouts.put(layout, new LineInfo(i, j));
                     positions.put(new Rectangle(0, (int) drawPosY,
-                            (int) formatWidth + 6, lineHeight), layout);
+                                                (int) formatWidth + 6,
+                                                lineHeight), layout);
                 }
 
                 j++;
@@ -286,8 +238,9 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @return Number of times the line wraps
      */
     private int getNumWrappedLines(final LineBreakMeasurer lineMeasurer,
-            final int paragraphStart, final int paragraphEnd,
-            final float formatWidth) {
+                                   final int paragraphStart,
+                                   final int paragraphEnd,
+                                   final float formatWidth) {
         int wrappedLine = 0;
 
         while (lineMeasurer.getPosition() < paragraphEnd) {
@@ -305,20 +258,41 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * Redraws the text that has been highlighted.
      *
      * @param line Line number
-     * @param startLine Selection start line
-     * @param endLine Selection end line
-     * @param startChar Selection start char
-     * @param endChar Selection end char
      * @param chars Number of characters so far in the line
      * @param layout Current line textlayout
      * @param g Graphics surface to draw highlight on
      * @param drawPosY current y location of the line
      * @param drawPosX current x location of the line
      */
-    private void doHighlight(final int line, final int startLine,
-            final int endLine, final int startChar, final int endChar,
-            final int chars, final TextLayout layout, final Graphics2D g,
-            final float drawPosY, final float drawPosX) {
+    private void doHighlight(final int line, final int chars,
+                             final TextLayout layout, final Graphics2D g,
+                             final float drawPosY, final float drawPosX) {
+        int startLine;
+        int startChar;
+        int endLine;
+        int endChar;
+
+        if (selection.getStartLine() > selection.getEndLine()) {
+            // Swap both
+            startLine = selection.getEndLine();
+            startChar = selection.getEndPos();
+            endLine = selection.getStartLine();
+            endChar = selection.getStartPos();
+        } else if (selection.getStartLine() == selection.getEndLine() &&
+                   selection.getStartPos() > selection.getEndPos()) {
+            // Just swap the chars
+            startLine = selection.getStartLine();
+            startChar = selection.getEndPos();
+            endLine = selection.getEndLine();
+            endChar = selection.getStartPos();
+        } else {
+            // Swap nothing
+            startLine = selection.getStartLine();
+            startChar = selection.getStartPos();
+            endLine = selection.getEndLine();
+            endChar = selection.getEndPos();
+        }
+
         //Does this line need highlighting?
         if (startLine <= line && endLine >= line) {
             int firstChar;
@@ -340,9 +314,10 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
 
             // If the selection includes the chars we're showing
             if (lastChar > chars && firstChar < chars +
-                    layout.getCharacterCount()) {
+                                                layout.getCharacterCount()) {
                 final String text =
-                        textPane.getTextFromLine(line).substring(firstChar,
+                             document.getLine(line).getText().substring(
+                        firstChar,
                         lastChar);
 
                 if (text.isEmpty()) {
@@ -350,17 +325,22 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                 }
 
                 final int trans = (int) (lineHeight / 2f + drawPosY);
-                final AttributedString as = new AttributedString(
-                        textPane.getLine(line).getIterator(), firstChar,
-                        lastChar);
+                final AttributedCharacterIterator iterator = document.
+                        getStyledLine(line);
+                final AttributedString as = new AttributedString(iterator,
+                                                                 firstChar,
+                                                                 lastChar);
                 as.addAttribute(TextAttribute.FOREGROUND,
-                        textPane.getBackground());
+                                textPane.getBackground());
                 as.addAttribute(TextAttribute.BACKGROUND,
-                        textPane.getForeground());
+                                textPane.getForeground());
                 final TextLayout newLayout = new TextLayout(as.getIterator(),
-                        g.getFontRenderContext());
+                                                            g.
+                        getFontRenderContext());
                 final Shape shape = layout.getLogicalHighlightShape(firstChar -
-                        chars, lastChar - chars);
+                                                                    chars,
+                                                                    lastChar -
+                                                                    chars);
 
                 if (firstChar != 0) {
                     g.translate(shape.getBounds().getX(), 0);
@@ -387,7 +367,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
             }
         }
     }
-    
+
     /**
      * Returns the current scroll bar position.
      * 
@@ -411,28 +391,29 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
         final LineInfo lineInfo = getClickPosition(getMousePosition());
 
         if (lineInfo.getLine() != -1) {
-            clickedText = textPane.getTextFromLine(lineInfo.getLine());
+            clickedText = document.getLine(lineInfo.getLine()).getText();
 
             if (lineInfo.getIndex() == -1) {
                 start = -1;
                 end = -1;
             } else {
-                final int[] extent = getSurroundingWordIndexes(clickedText,
-                        lineInfo.getIndex());
+                final int[] extent =
+                            getSurroundingWordIndexes(clickedText,
+                                                      lineInfo.getIndex());
                 start = extent[0];
                 end = extent[1];
             }
 
             if (e.getClickCount() == 2) {
-                selStartLine = lineInfo.getLine();
-                selEndLine = lineInfo.getLine();
-                selStartChar = start;
-                selEndChar = end;
+                selection.setStartLine(lineInfo.getLine());
+                selection.setEndLine(lineInfo.getLine());
+                selection.setStartPos(start);
+                selection.setEndPos(end);
             } else if (e.getClickCount() == 3) {
-                selStartLine = lineInfo.getLine();
-                selEndLine = lineInfo.getLine();
-                selStartChar = 0;
-                selEndChar = clickedText.length();
+                selection.setStartLine(lineInfo.getLine());
+                selection.setEndLine(lineInfo.getLine());
+                selection.setStartPos(0);
+                selection.setEndPos(clickedText.length());
             }
         }
 
@@ -449,26 +430,23 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     public ClickType getClickType(final LineInfo lineInfo) {
         if (lineInfo.getLine() != -1) {
-            final AttributedCharacterIterator iterator = document.getLine(lineInfo.getLine()).
-                    getIterator();
-            if (lineInfo.getIndex() <= iterator.getEndIndex()) {
-                iterator.setIndex(lineInfo.getIndex());
-                Object linkattr =
-                        iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
-                if (linkattr instanceof String) {
-                    return ClickType.HYPERLINK;
-                }
-                linkattr = iterator.getAttributes().get(IRCTextAttribute.CHANNEL);
-                if (linkattr instanceof String) {
-                    return ClickType.CHANNEL;
-                }
-                linkattr = iterator.getAttributes().get(IRCTextAttribute.NICKNAME);
-                if (linkattr instanceof String) {
-                    return ClickType.NICKNAME;
-                }
+            final AttributedCharacterIterator iterator = document.getStyledLine(
+                    lineInfo.getLine());
+            iterator.setIndex(lineInfo.getIndex());
+            Object linkattr =
+                   iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
+            if (linkattr instanceof String) {
+                return ClickType.HYPERLINK;
+            }
+            linkattr = iterator.getAttributes().get(IRCTextAttribute.CHANNEL);
+            if (linkattr instanceof String) {
+                return ClickType.CHANNEL;
+            }
+            linkattr = iterator.getAttributes().get(IRCTextAttribute.NICKNAME);
+            if (linkattr instanceof String) {
+                return ClickType.NICKNAME;
             }
         }
-
         return ClickType.NORMAL;
     }
 
@@ -481,11 +459,11 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     public Object getAttributeValueAtPoint(LineInfo lineInfo) {
         if (lineInfo.getLine() != -1) {
-            final AttributedCharacterIterator iterator = document.getLine(lineInfo.getLine()).
-                    getIterator();
+            final AttributedCharacterIterator iterator = document.getStyledLine(
+                    lineInfo.getLine());
             iterator.setIndex(lineInfo.getIndex());
             Object linkattr =
-                    iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
+                   iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
             if (linkattr instanceof String) {
                 return linkattr;
             }
@@ -511,7 +489,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @return Indexes of the word surrounding the index (start, end)
      */
     protected int[] getSurroundingWordIndexes(final String text,
-            final int index) {
+                                              final int index) {
         final int start = getSurroundingWordStart(text, index);
         final int end = getSurroundingWordEnd(text, index);
 
@@ -616,7 +594,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void mouseEntered(final MouseEvent e) {
-    //Ignore
+        //Ignore
     }
 
     /** 
@@ -626,7 +604,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void mouseExited(final MouseEvent e) {
-    //Ignore
+        //Ignore
     }
 
     /** 
@@ -641,18 +619,19 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
 
     /** Checks for a link under the cursor and sets appropriately. */
     private void checkForLink() {
-        final LineInfo info = getClickPosition(getMousePosition());
+        final LineInfo lineInfo = getClickPosition(getMousePosition());
 
-        if (info.getLine() != -1 && document.getLine(info.getLine()) != null) {
-            final AttributedCharacterIterator iterator = document.getLine(info.getLine()).
-                    getIterator();
-            if (info.getIndex() < iterator.getBeginIndex() || info.getIndex() >
-                    iterator.getEndIndex()) {
+        if (lineInfo.getLine() != -1 && document.getLine(lineInfo.getLine()) !=
+                                        null) {
+            final AttributedCharacterIterator iterator = document.getStyledLine(
+                    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);
+                   iterator.getAttributes().get(IRCTextAttribute.HYPERLINK);
             if (linkattr instanceof String) {
                 setCursor(HAND_CURSOR);
                 return;
@@ -680,7 +659,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @param e responsible mouse event
      */
     protected void highlightEvent(final MouseEventType type,
-            final MouseEvent e) {
+                                  final MouseEvent e) {
         if (isVisible()) {
             Point point = e.getLocationOnScreen();
             SwingUtilities.convertPointFromScreen(point, this);
@@ -691,17 +670,18 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                     point.setLocation(bounds.getX() + 3, point.getY());
                 } else if (mousePos.getX() > (bounds.getX() + bounds.getWidth())) {
                     point.setLocation(bounds.getX() + bounds.getWidth() - 3,
-                            point.getY());
+                                      point.getY());
                 }
                 if (mousePos.getY() < bounds.getY()) {
                     point.setLocation(point.getX(), bounds.getY() + 6);
                 } else if (mousePos.getY() >
-                        (bounds.getY() + bounds.getHeight())) {
+                           (bounds.getY() + bounds.getHeight())) {
                     //Nice text selection behaviour
                     //point.setLocation(point.getX(), bounds.getY() +
                     //        bounds.getHeight() - 6);
-                    point.setLocation(bounds.getX() + bounds.getWidth() - 3, bounds.getY() +
-                            bounds.getHeight() - 6);
+                    point.setLocation(bounds.getX() + bounds.getWidth() - 3,
+                                      bounds.getY() +
+                                      bounds.getHeight() - 6);
                 }
             }
             final LineInfo info = getClickPosition(point);
@@ -715,11 +695,11 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
             }
             if (info.getLine() != -1 && info.getPart() != -1) {
                 if (type == MouseEventType.CLICK) {
-                    selStartLine = info.getLine();
-                    selStartChar = info.getIndex();
+                    selection.setStartLine(info.getLine());
+                    selection.setStartPos(info.getIndex());
                 }
-                selEndLine = info.getLine();
-                selEndChar = info.getIndex();
+                selection.setEndLine(info.getLine());
+                selection.setEndPos(info.getIndex());
 
                 repaint();
             }
@@ -748,7 +728,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
             }
 
             pos = getHitPosition(lineNumber, linePart, (int) point.getX(),
-                    (int) point.getY());
+                                 (int) point.getY());
         }
 
         return new LineInfo(lineNumber, linePart, pos);
@@ -765,7 +745,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @return Hit position
      */
     private int getHitPosition(final int lineNumber, final int linePart,
-            final int x, final int y) {
+                               final int x, final int y) {
         int pos = 0;
 
         for (Map.Entry<Rectangle, TextLayout> entry : positions.entrySet()) {
@@ -773,9 +753,9 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
                 if (textLayouts.get(entry.getValue()).getPart() < linePart) {
                     pos += entry.getValue().getCharacterCount();
                 } else if (textLayouts.get(entry.getValue()).getPart() ==
-                        linePart) {
+                           linePart) {
                     final TextHitInfo hit = entry.getValue().hitTestChar(x - 6,
-                            y);
+                                                                         y);
                     pos += hit.getInsertionIndex();
                 }
             }
@@ -790,25 +770,30 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @return Selected range info
      */
     protected LinePosition getSelectedRange() {
-        if (selStartLine > selEndLine) {
+        if (selection.getStartLine() > selection.getEndLine()) {
             // Swap both
-            return new LinePosition(selEndLine, selEndChar, selStartLine,
-                    selStartChar);
-        } else if (selStartLine == selEndLine && selStartChar > selEndChar) {
+            return new LinePosition(selection.getEndLine(),
+                                    selection.getEndPos(), selection.
+                    getStartLine(),
+                                    selection.getStartPos());
+        } else if (selection.getStartLine() == selection.getEndLine() &&
+                   selection.getStartPos() > selection.getEndPos()) {
             // Just swap the chars
-            return new LinePosition(selStartLine, selEndChar, selEndLine,
-                    selStartChar);
+            return new LinePosition(selection.getStartLine(), selection.
+                    getEndPos(), selection.getEndLine(),
+                                    selection.getStartPos());
         } else {
             // Swap nothing
-            return new LinePosition(selStartLine, selStartChar, selEndLine,
-                    selEndChar);
+            return new LinePosition(selection.getStartLine(), selection.
+                    getStartPos(), selection.getEndLine(),
+                                    selection.getEndPos());
         }
     }
 
     /** Clears the selection. */
     protected void clearSelection() {
-        selEndLine = selStartLine;
-        selEndChar = selStartChar;
+        selection.setEndLine(selection.getStartLine());
+        selection.setEndPos(selection.getStartPos());
         if (isVisible()) {
             repaint();
         }
@@ -820,10 +805,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      * @param position Line position
      */
     public void setSelectedRange(final LinePosition position) {
-        selStartLine = position.getStartLine();
-        selStartChar = position.getStartPos();
-        selEndLine = position.getEndLine();
-        selEndChar = position.getEndPos();
+        selection = new LinePosition(position);
         if (isVisible()) {
             repaint();
         }
@@ -868,7 +850,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void componentMoved(final ComponentEvent e) {
-    //Ignore
+        //Ignore
     }
 
     /** 
@@ -878,7 +860,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void componentShown(final ComponentEvent e) {
-    //Ignore
+        //Ignore
     }
 
     /** 
@@ -888,7 +870,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
      */
     @Override
     public void componentHidden(final ComponentEvent e) {
-    //Ignore
+        //Ignore
     }
 
     /** Clears the line wrapping cache. */

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

@@ -22,10 +22,16 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
 import javax.swing.JComponent;
 import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
+/**
+ * TextPane UI
+ */
 public class TextPaneUI extends ComponentUI {
 
     /** {@inheritDoc} */
@@ -33,5 +39,27 @@ public class TextPaneUI extends ComponentUI {
     public void installUI(final JComponent c) {
         c.setBorder(UIManager.getBorder("TextField.border"));
     }
-    
+
+    /** {@inheritDoc} */
+    /*@Override
+    public void paint(final Graphics g, final JComponent c) {
+        if (c.isOpaque()) {
+            g.setColor(c.getBackground());
+            g.fillRect(0, 0, c.getWidth(), c.getHeight());
+        }
+        paint(g, c);
+    }*/
+
+    /** {@inheritDoc} */
+    /*@Override
+    public void update(final Graphics g, final JComponent c) {
+        if (c.isOpaque()) {
+            g.setColor(c.getBackground());
+            g.fillRect(0, 0, c.getWidth(), c.getHeight());
+        }
+        paint(g, c);
+    }*/
+
+    protected void paintTextPane(final Graphics2D g, final TextPane c) {
+    }
 }

src/com/dmdirc/addons/ui_swing/textpane2/DocumentContent.java

@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.addons.ui_swing.textpane2;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.text.AbstractDocument;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Position;
-import javax.swing.text.Segment;
-import javax.swing.undo.UndoableEdit;
-
-/**
- * An AbstractDocument.Content implementation that uses linked lists to enable
- * rapid addition of text to the end of the document.
- * 
- * @author chris
- */
-public class DocumentContent implements AbstractDocument.Content {
-
-    /**
-     * The number of characters we should index the offset after. Smaller numbers
-     * mean more memory usage and more CPU time when adding lines, but shorter
-     * lookup times. Larger numbers mean less memory usage and CPU time when
-     * adding, but longer lookup timesb.
-     */
-    private static final int OFFSET_INDEX = 5000;
-
-    /** The current end offset. */
-    private int endOffset = 0;
-
-    /**
-     * The data belonging to this content. Generally each entry will be a single
-     * line (ending in LF), but there is no reason why this always has to be the
-     * case.
-     */
-    private final List<String> data = new LinkedList<String>();
-
-    /** The end offset of each line. */
-    private final List<Integer> endOffsets = new LinkedList<Integer>();
-
-    /**
-     * A cache of offsets to their corresponding index in the data/endOffsets
-     * list. A key of n references the (n*OFFSET_INDEX)th character, and the
-     * corresponding value will reference the line where that character
-     * occurs, or the line immediately before it.
-     */
-    private final Map<Integer, Integer> offsetCache = new HashMap<Integer, Integer>();
-
-    /**
-     * Creates a new instance of DocumentContent.
-     */
-    public DocumentContent() {
-        try {
-            offsetCache.put(0, 0);
-
-            insertString(0, "");
-        } catch (BadLocationException ex) {
-            // Something's fucked. Oh well.
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Position createPosition(final int offset) throws BadLocationException {
-        return new Position() {
-
-            private final int meo = endOffset;
-            private final boolean move = offset == endOffset + 1
-                    || (offset != 0 && offset == endOffset);
-
-            @Override
-            public int getOffset() {
-                int myOffset = move ? 
-                    ((offset != 0 && offset == meo) ? endOffset : endOffset + 1) : offset;
-                
-                return myOffset;
-            }
-        };
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public int length() {
-        return endOffset + 1; // The extra 1 is for our phantom LF
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public UndoableEdit insertString(final int where, final String str)
-            throws BadLocationException {
-        if (where == endOffset) {
-            int offset = endOffset / OFFSET_INDEX;
-            endOffset += str.length();
-
-            data.add(str);
-            endOffsets.add(endOffset);
-
-            while (endOffset / OFFSET_INDEX > offset) {
-                offsetCache.put(++offset, data.size() - 1);
-            }
-        } else {
-            throw new BadLocationException("Inserting strings at any offset" +
-                    " except the end of the document is not supported.", where);
-        }
-
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public UndoableEdit remove(final int where, final int nitems) throws BadLocationException {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getString(final int where, final int len) throws BadLocationException {
-        if (where + len > endOffset + 1 || where < 0 || len < 0) {
-            throw new BadLocationException("Invalid location/length",
-                    where < 0 ? where : where + len);
-        }
-
-        final StringBuilder res = new StringBuilder(len);
-        int offset = findOffset(where);
-        int loc = where;
-
-        do {
-            String part = data.get(offset);
-            
-            int start = endOffsets.get(offset) - part.length();
-            
-            if (offset == data.size() - 1) {
-                // Last line - add our phantom LF
-                part = part + "\n";
-                start++;
-            }
-
-            int beginning = Math.max(loc - start, 0);
-            int end = Math.min(part.length(), beginning + len - res.length());
-
-            if (beginning < part.length()) {
-                res.append(part.substring(beginning, end));
-            }
-
-            offset++;
-        } while (res.length() < len && offset < data.size());
-
-        return res.toString();
-    }
-
-    /**
-     * Looks up the offset of the specified location. Given a character index,
-     * returns the location of the specified character in the data list.
-     * 
-     * @param where The character index to lookup
-     * @return The location of the specified character in the data list
-     */
-    private int findOffset(final int where) {
-        int res = offsetCache.get(where / OFFSET_INDEX);
-
-        while (endOffsets.get(res) < where) {
-            res++;
-        }
-        
-        return res;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void getChars(final int where, final int len, final Segment txt)
-            throws BadLocationException {
-        txt.array = getString(where, len).toCharArray();
-        txt.offset = 0;
-        txt.count = txt.array.length;
-    }
-}

src/com/dmdirc/addons/ui_swing/textpane2/DocumentContentTest.java

@@ -1,48 +0,0 @@
-package com.dmdirc.addons.ui_swing.textpane2;
-
-import java.awt.Dimension;
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTextPane;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.StyleContext;
-
-public class DocumentContentTest {
-
-    public static void main(String[] args) throws BadLocationException {
-
-        final JFrame frame = new JFrame();
-        final JTextPane tp = new JTextPane();
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        frame.setPreferredSize(new Dimension(800, 600));
-        tp.setEditable(false);
-        tp.setDocument(new IRCDocument(new DocumentContent(), new StyleContext()));
-
-        frame.add(new JScrollPane(tp));
-
-        frame.pack();
-        
-        frame.setVisible(true);
-        
-        for (int i = 0; i <= 1000; i++) {
-        tp.getDocument().insertString(tp.getDocument().getLength(), "RAR.... RAR!!!! RARRRR\n", null);
-        Thread.yield();
-        }
-
-        try {
-            Thread.sleep(500);
-        } catch (InterruptedException ex) {
-            //Ignore
-        }
-        
-        tp.getDocument().insertString(tp.getDocument().getLength(), "RAR1\n", null);
-        
-        try {
-            Thread.sleep(500);
-        } catch (InterruptedException ex) {
-            //Ignore
-        }
-        
-        tp.getDocument().insertString(tp.getDocument().getLength(), "RAR2\n", null);
-    }
-}

src/com/dmdirc/addons/ui_swing/textpane2/IRCDocument.java

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.addons.ui_swing.textpane2;
-
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.Segment;
-import javax.swing.text.StyleContext;
-
-/** Stylised document. */
-public class IRCDocument extends DefaultStyledDocument {
-
-    /**
-     * 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 = 1;
-
-    /** Instantiates a new IRCDocument. */
-    public IRCDocument() {
-        this(new StyleContext());
-    }
-
-    /**
-     * Instantiates a new IRCDocument using the specified StyleContext.
-     *
-     * @param styles StyleContext to use
-     */
-    public IRCDocument(final StyleContext styles) {
-        super(new DocumentContent(), styles);
-    }
-
-    public IRCDocument(Content c, StyleContext styles) {
-        super(c, styles);
-    }
-    
-    public String getText(int offset, int length) throws BadLocationException {
-	if (length < 0) {
-	    throw new BadLocationException("Length must be positive. Length = "+length, 0);
-	}
-	
-	return super.getText(offset, length);
-    }    
-    
-    public void getText(int offset, int length, Segment txt) throws BadLocationException {
-	if (length < 0) {
-	    throw new BadLocationException("Length must be positive. Length = "+length, 0);
-	}
-	
-        super.getText(offset, length, txt);
-    }    
-}

src/com/dmdirc/addons/ui_swing/textpane2/IRCTextPane.java

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.addons.ui_swing.textpane2;
-
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-
-import javax.swing.JTextPane;
-import javax.swing.text.BadLocationException;
-
-/** Text pane designed for IRC. */
-public class IRCTextPane extends JTextPane {
-
-    /**
-     * 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 = 1;
-
-    /** Instantiates a new IRCTextPane. */
-    public IRCTextPane() {
-        this(new IRCDocument());
-    }
-
-    /**
-     * Instantiates a new IRCTextPane with the specified document.
-     *
-     * @param doc
-     */
-    public IRCTextPane(final IRCDocument doc) {
-        super(doc);
-        super.setEditable(false);
-    }
-
-    /**
-     * Adds an array of unparsed styled strings to the textpane.
-     *
-     * @param strings Unstyled lines to add
-     */
-    public void addStyledString(final String[] strings) {
-        //Styliser.addStyledString((StyledDocument) getDocument(), string);
-        for (String str : strings) {
-            try {
-                getDocument().insertString(getDocument().getLength(), str, null);
-            } catch (BadLocationException ex) {
-                Logger.appError(ErrorLevel.HIGH, "Adding a line to the document failed.", ex);
-            }
-        }
-    }
-
-    /**
-     * Adds an unparsed styled string to the textpane.
-     *
-     * @param string Unstyled line to add
-     */
-    public void addStyledString(final String string) {
-        addStyledString(new String[]{string});
-    }
-
-    /** Clears the textpane. */
-    public void clear() {
-        setDocument(new IRCDocument());
-    }
-
-    /** Clears the selection in the textpane. */
-    public void clearSelection() {
-        setSelectionStart(0);
-        setSelectionEnd(0);
-    }
-
-    /**
-     * Trims the textpane to the specified size.
-     *
-     * @param frameBufferSize Size to trim the textpane to
-     */
-    public void trim(final int frameBufferSize) {
-        //trim
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setEditable(final boolean b) {
-        //Ignore
-    }
-}

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.messages;
 
+import com.dmdirc.addons.ui_swing.textpane.Line;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.addons.ui_swing.textpane.TextPane;
 import java.awt.Color;
 import java.awt.font.TextAttribute;
 import java.text.AttributedCharacterIterator;
@@ -57,8 +57,8 @@ public class StyliserStylesTest {
         final DefaultStyledDocument doc = new DefaultStyledDocument();
         final StringBuilder builder = new StringBuilder();
         Styliser.addStyledString(doc, new String[]{input});
-        final AttributedCharacterIterator aci = 
-                TextPane.styledDocumentToAttributedString(doc).getIterator();        
+        final AttributedCharacterIterator aci = new Line(
+                new String[]{input, }).getStyled().getIterator();
          
         Map<AttributedCharacterIterator.Attribute, Object> map = null;
         char chr = aci.current();

testing

@@ -1 +0,0 @@
-MoO1