Merge pull request #489 from csmith/master

Support for core changes.

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.SearchBar;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.ui.messages.IRCDocument;
+import com.dmdirc.ui.messages.Document;
 import com.dmdirc.ui.messages.IRCDocumentSearcher;
 import com.dmdirc.ui.messages.LinePosition;
 import com.dmdirc.util.collections.ListenerList;
         final boolean up = Direction.UP == direction;
 
         final TextPane textPane = parent.getTextPane();
-        final IRCDocument document = textPane.getDocument();
+        final Document document = textPane.getDocument();
         final IRCDocumentSearcher searcher = new IRCDocumentSearcher(text,
                 document,
                 caseSensitive);

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

 
 package com.dmdirc.addons.ui_swing.textpane;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.messages.CachingDocument;
-import com.dmdirc.ui.messages.IRCDocument;
-import com.dmdirc.ui.messages.IRCDocumentListener;
+import com.dmdirc.ui.messages.Document;
+import com.dmdirc.ui.messages.DocumentListener;
 import com.dmdirc.ui.messages.LinePosition;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.StringUtils;
 import com.dmdirc.util.URLBuilder;
-
 import java.awt.Adjustable;
 import java.awt.Color;
 import java.awt.Point;
 import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
-
 import javax.swing.BoundedRangeModel;
 import javax.swing.DefaultBoundedRangeModel;
 import javax.swing.JComponent;
 import javax.swing.JLayer;
 import javax.swing.JScrollBar;
 import javax.swing.SwingConstants;
-
 import net.miginfocom.swing.MigLayout;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 /**
  * Styled, scrollable text pane.
  */
 public final class TextPane extends JComponent implements MouseWheelListener,
-        AdjustmentListener, IRCDocumentListener, ConfigChangeListener {
+        AdjustmentListener, DocumentListener, ConfigChangeListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 5;
     /** Canvas object, used to draw text. */
     private final TextPaneCanvas canvas;
     /** IRCDocument. */
-    private final IRCDocument document;
+    private final Document document;
     /** Parent window. */
     private final WindowModel window;
     /** Indicator to show whether new lines have been added. */
      *
      * @return This TextPane's IRC document
      */
-    public IRCDocument getDocument() {
+    public Document getDocument() {
         return document;
     }
 

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/serialisers/BackBufferSerializer.java

 package com.dmdirc.addons.ui_web2.serialisers;
 
 import com.dmdirc.ui.messages.BackBuffer;
-import com.dmdirc.ui.messages.IRCDocument;
+import com.dmdirc.ui.messages.Document;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
     @Override
     public JsonElement serialize(final BackBuffer src, final Type typeOfSrc, final JsonSerializationContext context) {
         final JsonArray res = new JsonArray();
-        final IRCDocument document = src.getDocument();
+        final Document document = src.getDocument();
         for (int i = 0; i < document.getNumLines(); i++) {
             // TODO: Pass on foreground and background colours
             res.add(document.getLine(i).getText());