Remove some deprecated methods usages

Change-Id: I0a9ffdb11dfcf13e88c2bce63ca8d68b4d9feed9
Reviewed-on: http://gerrit.dmdirc.com/3290
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -37,11 +37,10 @@ import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.annotations.factory.Factory;
@@ -62,8 +61,6 @@ import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
@@ -75,9 +72,8 @@ import net.miginfocom.swing.MigLayout;
  * Component to show and edit topics for a channel.
  */
 @Factory(inject = true, singleton = true)
-public class TopicBar extends JComponent implements ActionListener,
-        ConfigChangeListener, HyperlinkListener, MouseListener,
-        DocumentListener, TopicChangeListener {
+public class TopicBar extends JComponent implements ActionListener, ConfigChangeListener,
+        MouseListener, DocumentListener, TopicChangeListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
@@ -91,10 +87,8 @@ public class TopicBar extends JComponent implements ActionListener,
     private final SwingWindowFactory windowFactory;
     /** Manager to use to resolve colours. */
     private final ColourManager colourManager;
-    /** The URL handler to use to launch URLs. */
-    private final URLHandler urlHandler;
-    /** The controller to use to manage window focus. */
-    private final SwingController swingController;
+    /** The window this topic bar is for. */
+    private final Window window;
     /** Associated channel. */
     private final Channel channel;
     /** the maximum length allowed for a topic. */
@@ -128,6 +122,7 @@ public class TopicBar extends JComponent implements ActionListener,
      * @param urlHandler      The URL handler to use to open URLs.
      * @param swingController The controller to use to manage window focus.
      * @param channel         The channel that this topic bar is for.
+     * @param window          The window this topic bar is for.
      * @param iconManager     The icon manager to use for this bar's icons.
      */
     public TopicBar(
@@ -137,23 +132,19 @@ public class TopicBar extends JComponent implements ActionListener,
             final ColourManager colourManager,
             final PluginManager pluginManager,
             final SwingWindowFactory windowFactory,
-            final URLHandler urlHandler,
-            final SwingController swingController,
             @Unbound final Channel channel,
+            @Unbound final Window window,
             @Unbound final IconManager iconManager) {
-        super();
-
         this.channel = channel;
         this.domain = domain;
         this.windowFactory = windowFactory;
-        this.urlHandler = urlHandler;
         this.colourManager = colourManager;
-        this.swingController = swingController;
+        this.window = window;
         topicText = new TextPaneInputField(parentWindow, globalConfig, colourManager, iconManager);
         topicLengthMax = channel.getMaxTopicLength();
         updateOptions();
         errorIcon = new JLabel(iconManager.getIcon("input-error"));
-        topicText.setEditorKit(new WrapEditorKit(showFull));
+        topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window));
         ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
                 new NewlinesDocumentFilter());
 
@@ -189,34 +180,26 @@ public class TopicBar extends JComponent implements ActionListener,
         topicText.addActionListener(this);
         topicEdit.addActionListener(this);
         topicCancel.addActionListener(this);
-        topicText.getInputMap().put(KeyStroke.getKeyStroke("ENTER"),
-                "enterButton");
-        topicText.getActionMap().put("enterButton", new AbstractAction(
-                "enterButton") {
-                    /**
-                     * 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;
-
-                    @Override
-                    public void actionPerformed(final ActionEvent e) {
-                        commitTopicEdit();
-                    }
-                });
-        topicText.getInputMap().put(KeyStroke.getKeyStroke("ESCAPE"),
-                "escapeButton");
-        topicText.getActionMap().put("escapeButton", new AbstractAction(
-                "escapeButton") {
-                    private static final long serialVersionUID = 1;
-
-                    @Override
-                    public void actionPerformed(final ActionEvent e) {
-                        cancelTopicEdit();
-                    }
-                });
-        topicText.addHyperlinkListener(this);
+        topicText.getInputMap().put(KeyStroke.getKeyStroke("ENTER"), "enterButton");
+        topicText.getActionMap().put("enterButton", new AbstractAction("enterButton") {
+            /** A version number for this class. */
+            private static final long serialVersionUID = 1;
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                commitTopicEdit();
+            }
+        });
+        topicText.getInputMap().put(KeyStroke.getKeyStroke("ESCAPE"), "escapeButton");
+        topicText.getActionMap().put("escapeButton", new AbstractAction("escapeButton") {
+            /** A version number for this class. */
+            private static final long serialVersionUID = 1;
+
+            @Override
+            public void actionPerformed(final ActionEvent e) {
+                cancelTopicEdit();
+            }
+        });
         topicText.addMouseListener(this);
         topicText.getDocument().addDocumentListener(this);
 
@@ -351,24 +334,6 @@ public class TopicBar extends JComponent implements ActionListener,
         topicChanged(channel, null);
     }
 
-    @Override
-    public void hyperlinkUpdate(final HyperlinkEvent e) {
-        if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-            final String url = e.getDescription();
-            if (url == null) {
-                return;
-            }
-            if (url.charAt(0) == '#') {
-                channel.getConnection().join(new ChannelJoinRequest(url));
-            } else if (url.contains("://")) {
-                urlHandler.launchApp(e.getDescription());
-            } else {
-                swingController.requestWindowFocus(
-                        windowFactory.getSwingWindow(channel.getConnection().getQuery(url)));
-            }
-        }
-    }
-
     /**
      * Load and set colours.
      */
@@ -496,7 +461,7 @@ public class TopicBar extends JComponent implements ActionListener,
         setVisible(showBar);
         cancelTopicEdit();
         if ("showfulltopic".equals(key)) {
-            topicText.setEditorKit(new WrapEditorKit(showFull));
+            topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window));
             ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
                     new NewlinesDocumentFilter());
             topicChanged(channel, null);

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -32,11 +32,14 @@ import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
 import com.dmdirc.addons.ui_swing.components.TopicBarFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
+import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.events.ClientClosingEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -60,11 +63,7 @@ import net.miginfocom.swing.MigLayout;
 @Factory(inject = true, singleton = true, providers = true)
 public final class ChannelFrame extends InputTextFrame implements ActionListener {
 
-    /**
-     * 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).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 10;
     /** Identity. */
     private final ConfigProvider identity;
@@ -76,12 +75,14 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     private NickList nicklist;
     /** Topic bar. */
     private TopicBar topicBar;
-    /** UI controller. */
-    private final SwingController controller;
     /** Event bus to despatch events on. */
     private final EventBus eventBus;
     /** Config to read settings from. */
     private final AggregateConfigProvider globalConfig;
+    /** The domain to read settings from. */
+    private final String domain;
+    /** Channel settings dialog provider. */
+    private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
 
     /**
      * Creates a new instance of ChannelFrame. Sets up callbacks and handlers, and default options
@@ -92,23 +93,28 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * @param identityFactory    The factory to use to create a channel identity.
      * @param topicBarFactory    The factory to use to create topic bars.
      * @param owner              The Channel object that owns this frame
+     * @param domain             The domain to read settings from
+     * @param dialogProvider     The dialog provider to get the channel settings dialog from.
      */
     public ChannelFrame(
+            @SuppressWarnings("qualifiers") @PluginDomain(SwingController.class) final String domain,
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final IdentityFactory identityFactory,
+            final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
             final TopicBarFactory topicBarFactory,
             @Unbound final Channel owner) {
         super(deps, inputFieldProvider, owner);
 
-        this.controller = deps.controller;
         this.eventBus = deps.eventBus;
         this.globalConfig = deps.globalConfig;
+        this.domain = domain;
+        this.dialogProvider = dialogProvider;
 
         initComponents(topicBarFactory);
 
         globalConfig.addChangeListener("ui", "channelSplitPanePosition", this);
-        globalConfig.addChangeListener(controller.getDomain(), "shownicklist", this);
+        globalConfig.addChangeListener(domain, "shownicklist", this);
         eventBus.register(this);
 
         identity = identityFactory.createChannelConfig(owner.getConnection().getNetwork(),
@@ -139,7 +145,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * @param topicBarFactory The factory to use to produce topic bars.
      */
     private void initComponents(final TopicBarFactory topicBarFactory) {
-        topicBar = topicBarFactory.getTopicBar((Channel) getContainer(),
+        topicBar = topicBarFactory.getTopicBar((Channel) getContainer(), this,
                 getContainer().getIconManager());
 
         nicklist = new NickList(this, getContainer().getConfigManager());
@@ -156,8 +162,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         add(inputPanel, "growx");
 
         splitPane.setLeftComponent(getTextPane());
-        if (getContainer().getConfigManager().getOptionBool(
-                controller.getDomain(), "shownicklist")) {
+        if (getContainer().getConfigManager().getOptionBool(domain, "shownicklist")) {
             splitPane.setRightComponent(nicklist);
         } else {
             splitPane.setRightComponent(null);
@@ -174,7 +179,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            controller.showChannelSettingsDialog((Channel) getContainer());
+            dialogProvider.displayOrRequestFocus((Channel) getContainer());
         }
     }
 
@@ -206,8 +211,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
             });
         }
         if ("shownicklist".equals(key)) {
-            if (getContainer().getConfigManager()
-                    .getOptionBool(controller.getDomain(), "shownicklist")) {
+            if (getContainer().getConfigManager().getOptionBool(domain, "shownicklist")) {
                 splitPane.setRightComponent(nicklist);
             } else {
                 splitPane.setRightComponent(null);
@@ -227,8 +231,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
             public void run() {
                 if (getContainer().getConfigManager().getOptionInt("ui",
                         "channelSplitPanePosition") != nicklist.getWidth()) {
-                    identity.setOption("ui", "channelSplitPanePosition",
-                            nicklist.getWidth());
+                    identity.setOption("ui", "channelSplitPanePosition", nicklist.getWidth());
                 }
             }
         });

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

@@ -7,8 +7,14 @@
 
 package com.dmdirc.addons.ui_swing.components.text;
 
+import com.dmdirc.events.LinkChannelClickedEvent;
+import com.dmdirc.events.LinkNicknameClickedEvent;
+import com.dmdirc.events.LinkUrlClickedEvent;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 
+import com.google.common.eventbus.EventBus;
+
 import java.awt.Cursor;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -16,7 +22,6 @@ import java.awt.event.MouseMotionListener;
 
 import javax.swing.JEditorPane;
 import javax.swing.SwingUtilities;
-import javax.swing.event.HyperlinkEvent;
 import javax.swing.text.Element;
 import javax.swing.text.StyledDocument;
 import javax.swing.text.StyledEditorKit;
@@ -28,14 +33,9 @@ import javax.swing.text.ViewFactory;
  *
  * Extended for Hyperlink events
  */
-public class WrapEditorKit extends StyledEditorKit implements MouseListener,
-        MouseMotionListener {
+public class WrapEditorKit extends StyledEditorKit implements MouseListener, MouseMotionListener {
 
-    /**
-     * 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).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Wrap column factory. */
     private final ViewFactory defaultFactory = new WrapColumnFactory();
@@ -45,15 +45,21 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener,
     private final boolean wrap;
     /** Associated Component. */
     private JEditorPane editorPane;
+    /** Event bus to fire link click events on. */
+    private final EventBus eventBus;
+    /** The window this editor kit is used in. */
+    private final Window window;
 
     /**
      * Initialises a new wrapping editor kit.
      *
      * @param wrapping true iif the text needs to wrap
+     * @param eventBus Event bus to raise hyperlink events on
+     * @param window   Window as source for hyperlink events
      */
-    public WrapEditorKit(final boolean wrapping) {
-        super();
-
+    public WrapEditorKit(final boolean wrapping, final EventBus eventBus, final Window window) {
+        this.window = window;
+        this.eventBus = eventBus;
         wrap = wrapping;
     }
 
@@ -118,23 +124,15 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener,
             Object target = characterElementAt(e).getAttributes().getAttribute(
                     IRCTextAttribute.HYPERLINK);
             if (target != null) {
-                editorPane.fireHyperlinkUpdate(new HyperlinkEvent(editorPane,
-                        HyperlinkEvent.EventType.ACTIVATED, null,
-                        (String) target));
+                eventBus.post(new LinkUrlClickedEvent(window, (String) target));
             }
-            target = characterElementAt(e).getAttributes().getAttribute(
-                    IRCTextAttribute.CHANNEL);
+            target = characterElementAt(e).getAttributes().getAttribute(IRCTextAttribute.CHANNEL);
             if (target != null) {
-                editorPane.fireHyperlinkUpdate(new HyperlinkEvent(editorPane,
-                        HyperlinkEvent.EventType.ACTIVATED, null,
-                        (String) target));
+                eventBus.post(new LinkChannelClickedEvent(window, (String) target));
             }
-            target = characterElementAt(e).getAttributes().getAttribute(
-                    IRCTextAttribute.NICKNAME);
+            target = characterElementAt(e).getAttributes().getAttribute(IRCTextAttribute.NICKNAME);
             if (target != null) {
-                editorPane.fireHyperlinkUpdate(new HyperlinkEvent(editorPane,
-                        HyperlinkEvent.EventType.ACTIVATED, null,
-                        (String) target));
+                eventBus.post(new LinkNicknameClickedEvent(window, (String) target));
             }
         }
     }