Remove stupid textlabel classes, work around introduced bugs

Update miglayout

Fixes issue 4254

Change-Id: I942553c146edfc4b078433bf2ddc6e93fc41a193
Reviewed-on: http://gerrit.dmdirc.com/1463
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -1,80 +0,0 @@
-/*
- * 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 java.awt.Color;
-import java.awt.Font;
-
-import javax.swing.JEditorPane;
-import javax.swing.UIManager;
-import javax.swing.plaf.basic.BasicTextPaneUI;
-import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.html.StyleSheet;
-
-/**
- * Dyamnic text label with hyperlink support.
- */
-public class HTMLLabel extends JEditorPane {
-
-    /**
-     * 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;
-
-    /**
-     * Creates a new instance of TextLabel.
-     */
-    public HTMLLabel() {
-        this(null);
-    }
-
-    /**
-     * Creates a new instance of TextLabel.
-     *
-     * @param text Text to display
-     */
-    public HTMLLabel(final String text) {
-        super("text/html", text);
-
-        final StyleSheet styleSheet = ((HTMLDocument) getDocument()).getStyleSheet();
-        final Font font = UIManager.getFont("Label.font");
-        final Color colour = UIManager.getColor("Label.foreground");
-        styleSheet.addRule("body { font-family: " + font.getFamily()
-                + "; " + "font-size: " + font.getSize() + "pt; color: rgb("
-                + colour.getRed() + ", " + colour.getGreen() + ", "
-                + colour.getBlue()+"); }");
-
-        init();
-    }
-
-    /** Initialiases the component. */
-    private void init() {
-        setUI(new BasicTextPaneUI());
-        setOpaque(false);
-        setEditable(false);
-        setHighlighter(null);
-        setFont(UIManager.getFont("TextField.font"));
-    }
-}

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

@@ -1,108 +0,0 @@
-/*
- * 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 java.awt.Insets;
-
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.plaf.basic.BasicTextPaneUI;
-import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-
-/**
- * Dyamnic text label.
- */
-public class OldTextLabel 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;
-    /** Simple attribute set. */
-    private SimpleAttributeSet sas;
-
-    /**
-     * Creates a new instance of TextLabel.
-     */
-    public OldTextLabel() {
-        this(null, true);
-    }
-
-    /**
-     * Creates a new instance of TextLabel.
-     *
-     * @param text Text to display
-     */
-    public OldTextLabel(final String text) {
-        this(text, true);
-    }
-
-    /**
-     * Creates a new instance of TextLabel.
-     *
-     * @param text Text to display
-     * @param justified Justify the text?
-     */
-    public OldTextLabel(final String text, final boolean justified) {
-        super(new DefaultStyledDocument());
-        setUI(new BasicTextPaneUI());
-
-        setOpaque(false);
-        setEditable(false);
-        setHighlighter(null);
-        setMargin(new Insets(0, 0, 0, 0));
-
-        sas = new SimpleAttributeSet();
-        if (justified) {
-            StyleConstants.setAlignment(sas, StyleConstants.ALIGN_JUSTIFIED);
-        }
-
-        StyleConstants.setForeground(sas, UIManager.getColor("Label.foreground"));
-        StyleConstants.setFontFamily(sas, getFont().getFamily());
-        StyleConstants.setFontSize(sas, getFont().getSize());
-        StyleConstants.setBold(sas, getFont().isBold());
-        StyleConstants.setItalic(sas, getFont().isItalic());
-
-        setText(text);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public StyledDocument getDocument() {
-        return (StyledDocument) super.getDocument();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setText(final String t) {
-        super.setText(t);
-        if (t != null && !t.isEmpty()) {
-            getDocument().setParagraphAttributes(0, t.length(), sas, true);
-        }
-    }
-}

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

@@ -37,7 +37,7 @@ import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.StyleSheet;
 
 /**
- * Dyamnic text label.
+ * Dynamic text label.
  */
 public class TextLabel extends JTextPane {
 
@@ -86,7 +86,6 @@ public class TextLabel extends JTextPane {
                 + "font-size: " + font.getSize() + "pt; "
                 + "color: rgb(" + colour.getRed() + ", " + colour.getGreen()
                 + ", " + colour.getBlue() + "); }");
-        styleSheet.addRule("p { margin: 0; }");
 
         setOpaque(false);
         setEditable(false);

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutPanel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import javax.swing.JPanel;
@@ -55,12 +55,12 @@ public final class AboutPanel extends JPanel implements HyperlinkListener {
     
     /** Initialises the components. */
     private void initComponents() {
-        final HTMLLabel about = new HTMLLabel("<html><center>"
+        final TextLabel about = new TextLabel("<html><center>"
                 + "<h1 style=\"margin-bottom: 0px;\">DMDirc</h1>"
                 + "<span style=\"font-style: italic;\">The intelligent IRC client.</span>"
                 + "<p>Easy to use, cross-platform IRC client.</p>"
                 + "<p><a href=\"http://www.dmdirc.com\">www.dmdirc.com</a></p>"
-                + "</center></html>");
+                + "</center></html>", false);
         about.addHyperlinkListener(this);
         
         setLayout(new MigLayout("ins rel, fill"));

src/com/dmdirc/addons/ui_swing/dialogs/about/CreditsPanel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import javax.swing.JPanel;
@@ -47,7 +47,7 @@ public final class CreditsPanel extends JPanel implements HyperlinkListener {
     private static final long serialVersionUID = 2;
 
     /** HTML label we're using. */
-    private HTMLLabel about;
+    private TextLabel about;
     
     /** Creates a new instance of CreditsPanel. */
     public CreditsPanel() {
@@ -65,7 +65,7 @@ public final class CreditsPanel extends JPanel implements HyperlinkListener {
     
     /** Initialises the components. */
     private void initComponents() {
-        about = new HTMLLabel("<html>"
+        about = new TextLabel("<html>"
                 + "<h3 style='margin: 3px; padding: 0px 0px 5px 0px;'>Main developers:</h3>"
                 + "<ul style='list-style-type: circle; margin-top: 0px;'>"
                 + "<li><a href=\"http://www.md87.co.uk\">Chris 'MD87' Smith</a></li>"

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionGroupInformationPanel.java

@@ -23,7 +23,8 @@ package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
 import com.dmdirc.actions.ActionGroup;
 
-import com.dmdirc.addons.ui_swing.components.text.OldTextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import javax.swing.Box;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
@@ -43,7 +44,7 @@ public final class ActionGroupInformationPanel extends JPanel {
     /** Action group. */
     private ActionGroup group;
     /** Description field. */
-    private OldTextLabel infoLabel;
+    private TextLabel infoLabel;
     /** Version label label. */
     private JLabel versionLabel;
     /** Version label. */
@@ -72,7 +73,7 @@ public final class ActionGroupInformationPanel extends JPanel {
      * Initialises the components.
      */
     private void initComponents() {
-        infoLabel = new OldTextLabel();
+        infoLabel = new TextLabel("");
         versionLabel = new JLabel("Version: ");
         version = new JLabel();
         authorLabel = new JLabel("Author: ");
@@ -92,9 +93,9 @@ public final class ActionGroupInformationPanel extends JPanel {
      * Lays out the components.
      */
     private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 2, hidemode 3"));
+        setLayout(new MigLayout("fill, wrap 2, hidemode 2"));
 
-        add(infoLabel, "span 2, growx, pushx");
+        add(infoLabel, "spanx 2, grow, push");
         add(authorLabel, "");
         add(author, "growx, pushx");
         add(versionLabel, "");
@@ -110,7 +111,9 @@ public final class ActionGroupInformationPanel extends JPanel {
         this.group = group;
 
         if (shouldDisplay()) {
-            infoLabel.setText(group.getDescription());
+            //Prevent HTML text displaying, replace newlines with <br>
+            infoLabel.setText(group.getDescription().replace("<", "&lt;")
+                    .replace("\n", "<br>"));
             author.setText(group.getAuthor());
             version.setText(group.getVersion() == null ? "" : group.getVersion().toString());
 
@@ -119,7 +122,8 @@ public final class ActionGroupInformationPanel extends JPanel {
             authorLabel.setVisible(group.getAuthor() != null);
             versionLabel.setVisible(group.getVersion() != null);
         } else {
-            infoLabel.setText("");
+            //Value require for mig/swing layouting bug
+            infoLabel.setText("Non empty string");
             author.setText("");
             version.setText("");
         }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicLabel.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
-import com.dmdirc.addons.ui_swing.components.text.OldTextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Color;
 import java.util.Date;
@@ -122,15 +122,15 @@ public class TopicLabel extends JPanel {
             add(pane, "wmax 450, grow, push, wrap, gapleft 5, gapleft 5");
         }
 
-        OldTextLabel label;
+        TextLabel label;
         if (topic.getTopic().isEmpty()) {
-            label = new OldTextLabel("Topic unset by " + topic.getClient());
+            label = new TextLabel("Topic unset by " + topic.getClient());
         } else {
-            label = new OldTextLabel("Topic set by " + topic.getClient());
+            label = new TextLabel("Topic set by " + topic.getClient());
         }
         add(label, "wmax 450, grow, push, wrap, gapleft 5, pad 0");
 
-        label = new OldTextLabel("on " + new Date(topic.getTime() * 1000).
+        label = new TextLabel("on " + new Date(topic.getTime() * 1000).
                 toString());
         add(label, "wmax 450, grow, push, wrap, gapleft 5, pad 0");
 

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/Info.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing.dialogs.serverlist;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.net.URI;
@@ -51,9 +51,9 @@ public class Info extends JPanel implements HyperlinkListener,
      */
     private static final long serialVersionUID = 2;
     /** Info pane. */
-    private final HTMLLabel infoLabel;
+    private final TextLabel infoLabel;
     /** Link label. */
-    private final HTMLLabel linkLabel;
+    private final TextLabel linkLabel;
     /** Server list model. */
     private final ServerListModel model;
     /** Info scroll panel. */
@@ -69,8 +69,8 @@ public class Info extends JPanel implements HyperlinkListener,
 
         this.model = model;
 
-        infoLabel = new HTMLLabel();
-        linkLabel = new HTMLLabel();
+        infoLabel = new TextLabel();
+        linkLabel = new TextLabel();
         sp = new JScrollPane(infoLabel);
 
         setLayout(new MigLayout("fill, ins 0"));