Browse Source

Fix some deprecated method calls

Change-Id: I7a145d7ca3dc30dc996c802ac680914ea3899f11
Reviewed-on: http://gerrit.dmdirc.com/1041
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Chris Smith <chris@dmdirc.com>
tags/0.6.4rc1
Chris Smith 14 years ago
parent
commit
85361a47ec

+ 0
- 10
src/com/dmdirc/ServerEventHandler.java View File

@@ -96,7 +96,6 @@ public final class ServerEventHandler extends EventHandler implements
96 96
         checkParser(tParser);
97 97
 
98 98
         if (!owner.hasQuery(sHost)) {
99
-            owner.addQuery(sHost);
100 99
             owner.getQuery(sHost).onPrivateMessage(tParser, sMessage, sHost);
101 100
         }
102 101
     }
@@ -108,7 +107,6 @@ public final class ServerEventHandler extends EventHandler implements
108 107
         checkParser(tParser);
109 108
 
110 109
         if (!owner.hasQuery(sHost)) {
111
-            owner.addQuery(sHost);
112 110
             owner.getQuery(sHost).onPrivateAction(tParser, sMessage, sHost);
113 111
         }
114 112
     }
@@ -321,10 +319,6 @@ public final class ServerEventHandler extends EventHandler implements
321 319
 
322 320
         if (tParser.getLocalClient().equals(tParser.getClient(sHost))) {
323 321
             // Local client
324
-            if (!owner.hasQuery(sTarget)) {
325
-                owner.addQuery(sTarget);
326
-            }
327
-
328 322
             owner.getQuery(sTarget).doNotification("querySelfExternalMessage",
329 323
                     CoreActionType.QUERY_SELF_MESSAGE, tParser.getLocalClient(), sMessage);
330 324
         } else {
@@ -341,10 +335,6 @@ public final class ServerEventHandler extends EventHandler implements
341 335
 
342 336
         if (tParser.getLocalClient().equals(tParser.getClient(sHost))) {
343 337
             // Local client
344
-            if (!owner.hasQuery(sTarget)) {
345
-                owner.addQuery(sTarget);
346
-            }
347
-
348 338
             owner.getQuery(sTarget).doNotification("querySelfExternalAction",
349 339
                     CoreActionType.QUERY_SELF_ACTION, tParser.getLocalClient(), sMessage);
350 340
         } else {

+ 2
- 2
src/com/dmdirc/ServerManager.java View File

@@ -272,7 +272,7 @@ public final class ServerManager {
272 272
                 connectedServer = server;
273 273
 
274 274
                 if (server.hasChannel("#DMDirc")) {
275
-                    server.join("#DMDirc");
275
+                    server.join(new ChannelJoinRequest("#DMDirc"));
276 276
                     return;
277 277
                 }
278 278
             }
@@ -287,7 +287,7 @@ public final class ServerManager {
287 287
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to construct new server", ex);
288 288
             }
289 289
         } else {
290
-            connectedServer.join("#DMDirc");
290
+            connectedServer.join(new ChannelJoinRequest("#DMDirc"));
291 291
         }
292 292
     }
293 293
 

+ 0
- 1
src/com/dmdirc/commandparser/commands/server/OpenQuery.java View File

@@ -71,7 +71,6 @@ public final class OpenQuery extends ServerCommand implements
71 71
         if (server.hasQuery(args.getArguments()[0])) {
72 72
             server.getQuery(args.getArguments()[0]).activateFrame();
73 73
         } else {
74
-            server.addQuery(args.getArguments()[0]);
75 74
             server.getQuery(args.getArguments()[0]).show();
76 75
         }
77 76
 

Loading…
Cancel
Save