Re add the code to enable the topic bar to show tne entire topic wrapped onto a multiline topic bar

Fixes issue 3251: make showfulltopic work

Change-Id: I036e36ae88eed2281fa1ef6086440f927767a751
Reviewed-on: http://gerrit.dmdirc.com/854
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -794,11 +794,10 @@ public final class SwingController extends Plugin implements Serializable,
                 getDomain(),
                 "shownicklist", "Show nicklist?",
                 "Do you want the nicklist visible"));
-        //TODO issue 3251
-        //advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(),
-        //       "showfulltopic", "Show full topic in topic bar?",
-        //       "Do you want to show the full topic in the topic bar or just" +
-        //       "first line?"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(),
+               "showfulltopic", "Show full topic in topic bar?",
+               "Do you want to show the full topic in the topic bar or just" +
+               "first line?"));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "hideEmptyTopicBar", "Hide empty topic bar?",
                 "Do you want to hide the topic bar when there is no topic"));

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

@@ -59,6 +59,7 @@ import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
+import javax.swing.text.StyledEditorKit;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -108,13 +109,12 @@ public class TopicBar extends JComponent implements ActionListener,
         topicLengthMax = channel.getMaxTopicLength();
         errorIcon =
                 new JLabel(IconManager.getIconManager().getIcon("input-error"));
-        //TODO issue 3251
-        //if (channelFrame.getConfigManager().getOptionBool(controller.
-        //        getDomain(), "showfulltopic")) {
-        //    topicText.setEditorKit(new StyledEditorKit());
-        //} else {
-        topicText.setEditorKit(new WrapEditorKit());
-        //}
+        if (channelFrame.getConfigManager().getOptionBool(controller.
+                getDomain(), "showfulltopic")) {
+            topicText.setEditorKit(new StyledEditorKit());
+        } else {
+            topicText.setEditorKit(new WrapEditorKit());
+        }
         ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
                 new NewlinesDocumentFilter());
 
@@ -215,6 +215,8 @@ public class TopicBar extends JComponent implements ActionListener,
         }
         topicText.setCaretPosition(0);
         validateTopic();
+        setVisible(false);
+        setVisible(true);
     }
 
     /**
@@ -383,17 +385,17 @@ public class TopicBar extends JComponent implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void configChanged(String domain, String key) {
-        //TODO issue 3251
-        //if ("showfulltopic".equals(key)) {
-        //    if (channel.getConfigManager().getOptionBool(controller.getDomain(),
-        //            "showfulltopic")) {
-        //        topicText.setEditorKit(new StyledEditorKit());
-        //    } else {
-        //        topicText.setEditorKit(new WrapEditorKit());
-        //    }
-        //    ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
-        //            new NewlinesDocumentFilter());
-        //}
+        if ("showfulltopic".equals(key)) {
+            if (channel.getConfigManager().getOptionBool(controller.getDomain(),
+                    "showfulltopic")) {
+                topicText.setEditorKit(new StyledEditorKit());
+            } else {
+                topicText.setEditorKit(new WrapEditorKit());
+            }
+            ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
+                    new NewlinesDocumentFilter());
+            topicChanged(channel, null);
+        }
         setColours();
         if ("hideEmptyTopicBar".equals(key)) {
             setVisible(true);