Moves private editor kits to the text components package and makes them public

Change-Id: I398028d98b2bd1902ee8ec26d58f21a4ad87436a
Reviewed-on: http://gerrit.dmdirc.com/757
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -29,6 +29,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.NoNewlinesPasteAction;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
+import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.TopicChangeListener;
@@ -54,22 +55,10 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
-import javax.swing.text.AbstractDocument;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.BoxView;
-import javax.swing.text.ComponentView;
 import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.Element;
-import javax.swing.text.GlyphView;
-import javax.swing.text.IconView;
-import javax.swing.text.LabelView;
-import javax.swing.text.ParagraphView;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
-import javax.swing.text.StyledEditorKit;
-import javax.swing.text.View;
-import javax.swing.text.ViewFactory;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -528,137 +517,4 @@ public class TopicBar extends JComponent implements ActionListener,
         validateTopic();
     }
 }
-
-/**
- * @author Stanislav Lapitsky
- * @version 1.0
- */
-class WrapEditorKit extends StyledEditorKit {
-
-    private static final long serialVersionUID = 1;
-    private ViewFactory defaultFactory = new WrapColumnFactory();
-
-    /** {@inheritDoc} */
-    @Override
-    public ViewFactory getViewFactory() {
-        return defaultFactory;
-    }
-}
-
-/**
- * @author Stanislav Lapitsky
- * @version 1.0
- */
-class WrapColumnFactory implements ViewFactory {
-
-    /** {@inheritDoc} */
-    @Override
-    public View create(final Element elem) {
-        String kind = elem.getName();
-        if (kind != null) {
-            if (kind.equals(AbstractDocument.ContentElementName)) {
-                return new WrapLabelView(elem);
-            } else if (kind.equals(AbstractDocument.ParagraphElementName)) {
-                return new NoWrapParagraphView(elem);
-            } else if (kind.equals(AbstractDocument.SectionElementName)) {
-                return new BoxView(elem, View.Y_AXIS);
-            } else if (kind.equals(StyleConstants.ComponentElementName)) {
-                return new ComponentView(elem);
-            } else if (kind.equals(StyleConstants.IconElementName)) {
-                return new IconView(elem);
-            }
-        }
-
-        // default to text display
-        return new LabelView(elem);
-    }
-}
-
-/**
- * @author Stanislav Lapitsky
- * @version 1.0
- */
-class NoWrapParagraphView extends ParagraphView {
-
-    /**
-     * Creates a new no wrap paragraph view.
-     *
-     * @param elem Element to view
-     */
-    public NoWrapParagraphView(final Element elem) {
-        super(elem);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void layout(final int width, final int height) {
-        super.layout(Short.MAX_VALUE, height);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public float getMinimumSpan(final int axis) {
-        return super.getPreferredSpan(axis);
-    }
-}
-
-/**
- * @author Stanislav Lapitsky
- * @version 1.0
- */
-class WrapLabelView extends LabelView {
-
-    /**
-     * Creates a new wrap label view.
-     *
-     * @param elem Element to view
-     */
-    public WrapLabelView(final Element elem) {
-        super(elem);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public int getBreakWeight(final int axis, final float pos, final float len) {
-        if (axis == View.X_AXIS) {
-            checkPainter();
-            int p0 = getStartOffset();
-            int p1 = getGlyphPainter().getBoundedPosition(this, p0, pos, len);
-            if (p1 == p0) {
-                // can't even fit a single character
-                return View.BadBreakWeight;
-            }
-            try {
-                //if the view contains line break char return forced break
-                if (getDocument().getText(p0, p1 - p0).indexOf("\r") >= 0) {
-                    return View.ForcedBreakWeight;
-                }
-            } catch (BadLocationException ex) {
-                //should never happen
-            }
-        }
-        return super.getBreakWeight(axis, pos, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public View breakView(final int axis, final int p0, final float pos,
-            final float len) {
-        if (axis == View.X_AXIS) {
-            checkPainter();
-            int p1 = getGlyphPainter().getBoundedPosition(this, p0, pos, len);
-            try {
-                //if the view contains line break char break the view
-                int index = getDocument().getText(p0, p1 - p0).indexOf("\r");
-                if (index >= 0) {
-                    GlyphView v = (GlyphView) createFragment(p0, p0 + index + 1);
-                    return v;
-                }
-            } catch (BadLocationException ex) {
-                //should never happen
-            }
-        }
-        return super.breakView(axis, p0, pos, len);
-    }
-}
        

src/com/dmdirc/addons/ui_swing/components/text/DMDircHTMLEditorKit.java

@@ -0,0 +1,42 @@
+/*
+ * 
+ * Copyright (c) 2006-2010 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.components.text;
+
+import javax.swing.text.ViewFactory;
+import javax.swing.text.html.HTMLEditorKit;
+
+/**
+ * DMDirc html kit, extends HTMLEditor kit to use DMDircHTMLFactory.
+ */
+public class DMDircHTMLEditorKit extends HTMLEditorKit {
+
+    private static final long serialVersionUID = 1;
+    private ViewFactory defaultFactory = new DMDircHTMLFactory();
+
+    /** {@inheritDoc} */
+    @Override
+    public ViewFactory getViewFactory() {
+        return defaultFactory;
+    }
+}

src/com/dmdirc/addons/ui_swing/components/text/DMDircHTMLFactory.java

@@ -0,0 +1,45 @@
+/*
+ * 
+ * Copyright (c) 2006-2010 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.components.text;
+
+import javax.swing.text.Element;
+import javax.swing.text.View;
+import javax.swing.text.html.HTMLEditorKit.HTMLFactory;
+import javax.swing.text.html.ImageView;
+
+/**
+ * DMDircHTML factory extends HTMLFactory to use DMDircImageView.
+ */
+public class DMDircHTMLFactory extends HTMLFactory {
+
+    /** {@inheritDoc} */
+    @Override
+    public View create(Element elem) {
+        final View view = super.create(elem);
+        if (view instanceof ImageView) {
+            return new DMDircImageView(elem);
+        }
+        return view;
+    }
+}

src/com/dmdirc/addons/ui_swing/components/text/DMDircImageView.java

@@ -0,0 +1,60 @@
+/*
+ * 
+ * Copyright (c) 2006-2010 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.components.text;
+
+import com.dmdirc.util.URLBuilder;
+
+import java.net.URL;
+
+import javax.swing.text.Element;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.ImageView;
+
+/**
+ * DMDirc image view, extends default image view but uses DMDirc URLBuilder.
+ */
+public class DMDircImageView extends ImageView {
+
+    /**
+     * Creates a new DMDirc image view.
+     *
+     * @param elem element to view
+     */
+    public DMDircImageView(final Element elem) {
+        super(elem);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return URL to resource
+     */
+    @Override
+    public URL getImageURL() {
+        final String src = (String) getElement().getAttributes().
+                getAttribute(HTML.Attribute.SRC);
+
+        return src == null ? null : URLBuilder.buildURL(src);
+    }
+}

src/com/dmdirc/addons/ui_swing/components/text/NoWrapParagraphView.java

@@ -0,0 +1,37 @@
+/*
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+
+package com.dmdirc.addons.ui_swing.components.text;
+
+import javax.swing.text.Element;
+import javax.swing.text.ParagraphView;
+
+/**
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+public class NoWrapParagraphView extends ParagraphView {
+
+    /**
+     * Creates a new no wrap paragraph view.
+     *
+     * @param elem Element to view
+     */
+    public NoWrapParagraphView(final Element elem) {
+        super(elem);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void layout(final int width, final int height) {
+        super.layout(Short.MAX_VALUE, height);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public float getMinimumSpan(final int axis) {
+        return super.getPreferredSpan(axis);
+    }
+}

src/com/dmdirc/addons/ui_swing/components/text/TextLabel.java

@@ -22,28 +22,18 @@
 
 package com.dmdirc.addons.ui_swing.components.text;
 
-import com.dmdirc.util.URLBuilder;
-
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Insets;
-import java.net.URL;
 
 import javax.swing.JTextPane;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicTextPaneUI;
 import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.Element;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
-import javax.swing.text.View;
-import javax.swing.text.ViewFactory;
-import javax.swing.text.html.HTML;
 import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.HTMLEditorKit;
-import javax.swing.text.html.HTMLEditorKit.HTMLFactory;
-import javax.swing.text.html.ImageView;
 import javax.swing.text.html.StyleSheet;
 
 /**
@@ -126,62 +116,3 @@ public class TextLabel extends JTextPane {
         }
     }
 }
-
-/**
- * DMDirc html kit, extends HTMLEditor kit to use DMDircHTMLFactory.
- */
-class DMDircHTMLEditorKit extends HTMLEditorKit {
-
-    private static final long serialVersionUID = 1;
-    private ViewFactory defaultFactory = new DMDircHTMLFactory();
-
-    /** {@inheritDoc} */
-    @Override
-    public ViewFactory getViewFactory() {
-        return defaultFactory;
-    }
-}
-
-/**
- * DMDircHTML factory extends HTMLFactory to use DMDircImageView.
- */
-class DMDircHTMLFactory extends HTMLFactory {
-
-    /** {@inheritDoc} */
-    @Override
-    public View create(Element elem) {
-        final View view = super.create(elem);
-        if (view instanceof ImageView) {
-            return new DMDircImageView(elem);
-        }
-        return view;
-    }
-}
-
-/**
- * DMDirc image view, extends default image view but uses DMDirc URLBuilder.
- */
-class DMDircImageView extends ImageView {
-
-    /**
-     * Creates a new DMDirc image view.
-     *
-     * @param elem element to view
-     */
-    public DMDircImageView(final Element elem) {
-        super(elem);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return URL to resource
-     */
-    @Override
-    public URL getImageURL() {
-        final String src = (String) getElement().getAttributes().
-                getAttribute(HTML.Attribute.SRC);
-
-        return src == null ? null : URLBuilder.buildURL(src);
-    }
-}

src/com/dmdirc/addons/ui_swing/components/text/WrapColumnFactory.java

@@ -0,0 +1,45 @@
+/*
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+
+package com.dmdirc.addons.ui_swing.components.text;
+
+import javax.swing.text.AbstractDocument;
+import javax.swing.text.BoxView;
+import javax.swing.text.ComponentView;
+import javax.swing.text.Element;
+import javax.swing.text.IconView;
+import javax.swing.text.LabelView;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.View;
+import javax.swing.text.ViewFactory;
+
+/**
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+public class WrapColumnFactory implements ViewFactory {
+
+    /** {@inheritDoc} */
+    @Override
+    public View create(final Element elem) {
+        String kind = elem.getName();
+        if (kind != null) {
+            if (kind.equals(AbstractDocument.ContentElementName)) {
+                return new WrapLabelView(elem);
+            } else if (kind.equals(AbstractDocument.ParagraphElementName)) {
+                return new NoWrapParagraphView(elem);
+            } else if (kind.equals(AbstractDocument.SectionElementName)) {
+                return new BoxView(elem, View.Y_AXIS);
+            } else if (kind.equals(StyleConstants.ComponentElementName)) {
+                return new ComponentView(elem);
+            } else if (kind.equals(StyleConstants.IconElementName)) {
+                return new IconView(elem);
+            }
+        }
+
+        // default to text display
+        return new LabelView(elem);
+    }
+}

src/com/dmdirc/addons/ui_swing/components/text/WrapEditorKit.java

@@ -0,0 +1,25 @@
+/*
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+
+package com.dmdirc.addons.ui_swing.components.text;
+
+import javax.swing.text.StyledEditorKit;
+import javax.swing.text.ViewFactory;
+
+/**
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+public class WrapEditorKit extends StyledEditorKit {
+
+    private static final long serialVersionUID = 1;
+    private ViewFactory defaultFactory = new WrapColumnFactory();
+
+    /** {@inheritDoc} */
+    @Override
+    public ViewFactory getViewFactory() {
+        return defaultFactory;
+    }
+}

src/com/dmdirc/addons/ui_swing/components/text/WrapLabelView.java

@@ -0,0 +1,71 @@
+/*
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+package com.dmdirc.addons.ui_swing.components.text;
+
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Element;
+import javax.swing.text.GlyphView;
+import javax.swing.text.LabelView;
+import javax.swing.text.View;
+
+/**
+ * @author Stanislav Lapitsky
+ * @version 1.0
+ */
+public class WrapLabelView extends LabelView {
+
+    /**
+     * Creates a new wrap label view.
+     *
+     * @param elem Element to view
+     */
+    public WrapLabelView(final Element elem) {
+        super(elem);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getBreakWeight(final int axis, final float pos, final float len) {
+        if (axis == View.X_AXIS) {
+            checkPainter();
+            int p0 = getStartOffset();
+            int p1 = getGlyphPainter().getBoundedPosition(this, p0, pos, len);
+            if (p1 == p0) {
+                // can't even fit a single character
+                return View.BadBreakWeight;
+            }
+            try {
+                //if the view contains line break char return forced break
+                if (getDocument().getText(p0, p1 - p0).indexOf("\r") >= 0) {
+                    return View.ForcedBreakWeight;
+                }
+            } catch (BadLocationException ex) {
+                //should never happen
+            }
+        }
+        return super.getBreakWeight(axis, pos, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public View breakView(final int axis, final int p0, final float pos,
+            final float len) {
+        if (axis == View.X_AXIS) {
+            checkPainter();
+            int p1 = getGlyphPainter().getBoundedPosition(this, p0, pos, len);
+            try {
+                //if the view contains line break char break the view
+                int index = getDocument().getText(p0, p1 - p0).indexOf("\r");
+                if (index >= 0) {
+                    GlyphView v = (GlyphView) createFragment(p0, p0 + index + 1);
+                    return v;
+                }
+            } catch (BadLocationException ex) {
+                //should never happen
+            }
+        }
+        return super.breakView(axis, p0, pos, len);
+    }
+}