Removes use of deprecated methods, use new query methods.

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

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

@@ -38,6 +38,7 @@ import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
+import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 
 import java.awt.event.ActionEvent;
@@ -288,7 +289,8 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
                 /** {@inheritDoc} */
                 @Override
                 public boolean save() {
-                    WindowManager.getActiveServer().join(getText());
+                    WindowManager.getActiveServer().join(new ChannelJoinRequest(
+                            getText()));
                     return true;
                 }
 

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

@@ -33,6 +33,7 @@ import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.TopicChangeListener;
+import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -295,16 +296,11 @@ public class TopicBar extends JComponent implements ActionListener,
                 return;
             }
             if (url.startsWith("#")) {
-                channel.getServer().join(url);
+                channel.getServer().join(new ChannelJoinRequest(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();
-                }
+                channel.getServer().addQuery(url).activateFrame();
             }
         }
     }

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

@@ -53,6 +53,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -905,24 +906,21 @@ public abstract class TextFrame extends JInternalFrame implements Window,
                 if (type == MouseClickType.CLICKED) {
                     switch (clickType) {
                         case CHANNEL:
-                            ActionManager.processEvent(CoreActionType.LINK_CHANNEL_CLICKED, null, attribute);
-                            frameParent.getServer().join(attribute);
+                            ActionManager.processEvent(CoreActionType.
+                                    LINK_CHANNEL_CLICKED, null, attribute);
+                            frameParent.getServer().join(
+                                    new ChannelJoinRequest(attribute));
                             break;
                         case HYPERLINK:
-                            ActionManager.processEvent(CoreActionType.LINK_URL_CLICKED, null, attribute);
+                            ActionManager.processEvent(CoreActionType.
+                                    LINK_URL_CLICKED, null, attribute);
                             URLHandler.getURLHander().launchApp(attribute);
                             break;
                         case NICKNAME:
-                            ActionManager.processEvent(CoreActionType.LINK_NICKNAME_CLICKED, null, attribute);
-                            if (getContainer().getServer().hasQuery(attribute)) {
-                                getContainer().getServer().getQuery(attribute).
-                                        activateFrame();
-                            } else {
-                                getContainer().getServer().addQuery(attribute);
-                                getContainer().getServer().getQuery(attribute).
-                                        show();
-                            }
-
+                            ActionManager.processEvent(CoreActionType.
+                                    LINK_NICKNAME_CLICKED, null, attribute);
+                            getContainer().getServer().addQuery(attribute).
+                                    activateFrame();
                             break;
                         default:
                             break;

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_web;
 
+import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -30,6 +31,7 @@ import com.dmdirc.addons.ui_web.uicomponents.WebChannelWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputHandler;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
+import com.dmdirc.parser.common.ChannelJoinRequest;
 
 import java.io.IOException;
 import java.net.URI;
@@ -326,7 +328,8 @@ public class DynamicRequestHandler extends AbstractHandler {
             final HttpServletResponse response) throws IOException {
         final String windowID = request.getParameter("source");
         final WebWindow window = WebWindow.getWindow(windowID);
-        window.getContainer().getServer().join(request.getParameter("channel"));
+        window.getContainer().getServer().join(new ChannelJoinRequest(request.
+                getParameter("channel")));
     }
     
     private void doOpenQuery(final HttpServletRequest request,