Fixes issue 3841

Add support for channels and nicknames to the URL handling capabilities
of the topic bar.

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

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

@@ -280,7 +280,22 @@ public class TopicBar extends JComponent implements ActionListener,
     @Override
     public void hyperlinkUpdate(final HyperlinkEvent e) {
         if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-            URLHandler.getURLHander().launchApp(e.getDescription());
+            final String url = e.getDescription();
+            if (url == null) {
+                return;
+            }
+            if (url.startsWith("#")) {
+                channel.getServer().join(url);
+            } else if (url.contains("://")) {
+                URLHandler.getURLHander().launchApp(e.getDescription());
+            } else {
+                if (channel.getServer().hasQuery(url)) {
+                    channel.getServer().getQuery(url).activateFrame();
+                } else {
+                    channel.getServer().addQuery(url);
+                    channel.getServer().getQuery(url).show();
+                }
+            }
         }
     }
 

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

@@ -74,9 +74,12 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener,
             return;
         }
         if (!editorPane.isEditable()) {
-            Object target = characterElementAt(e).getAttributes().getAttribute(
-                    IRCTextAttribute.HYPERLINK);
-            if (target != null) {
+            if (characterElementAt(e).getAttributes().getAttribute(
+                    IRCTextAttribute.HYPERLINK) != null
+                    || characterElementAt(e).getAttributes().getAttribute(
+                    IRCTextAttribute.CHANNEL) != null
+                    || characterElementAt(e).getAttributes().getAttribute(
+                    IRCTextAttribute.NICKNAME) != null) {
                 editorPane.setCursor(HAND_CURSOR);
                 return;
             }
@@ -102,6 +105,20 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener,
                     HyperlinkEvent.EventType.ACTIVATED, null,
                     (String) target));
             }
+            target = characterElementAt(e).getAttributes().getAttribute(
+                    IRCTextAttribute.CHANNEL);
+            if (target != null) {
+                editorPane.fireHyperlinkUpdate(new HyperlinkEvent(editorPane,
+                    HyperlinkEvent.EventType.ACTIVATED, null,
+                    (String) target));
+            }
+            target = characterElementAt(e).getAttributes().getAttribute(
+                    IRCTextAttribute.NICKNAME);
+            if (target != null) {
+                editorPane.fireHyperlinkUpdate(new HyperlinkEvent(editorPane,
+                    HyperlinkEvent.EventType.ACTIVATED, null,
+                    (String) target));
+            }
         }
     }