Browse Source

Replace servers with connections.

Change-Id: I11efabb2757d8e62127b6487cbeb62d240cbd891
Reviewed-on: http://gerrit.dmdirc.com/3874
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
changes/74/3874/2
Chris Smith 9 years ago
parent
commit
70d1876877

+ 1
- 1
dcc/src/com/dmdirc/addons/dcc/DCCCommand.java View File

@@ -124,7 +124,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
124 124
             final CommandArguments args, final CommandContext context) {
125 125
         if (args.getArguments().length > 1) {
126 126
             final String target = args.getArguments()[1];
127
-            final Connection connection = ((ServerCommandContext) context).getServer();
127
+            final Connection connection = ((ServerCommandContext) context).getConnection();
128 128
             final Parser parser = connection.getParser();
129 129
             final String myNickname = parser.getLocalClient().getNickname();
130 130
 

+ 3
- 4
identd/test/com/dmdirc/addons/identd/IdentClientTest.java View File

@@ -23,7 +23,6 @@
23 23
 package com.dmdirc.addons.identd;
24 24
 
25 25
 import com.dmdirc.DMDircMBassador;
26
-import com.dmdirc.Server;
27 26
 import com.dmdirc.interfaces.Connection;
28 27
 import com.dmdirc.interfaces.ConnectionManager;
29 28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -47,7 +46,7 @@ public class IdentClientTest {
47 46
 
48 47
     @Mock private AggregateConfigProvider acp;
49 48
     @Mock private ConnectionManager sm;
50
-    @Mock private Server server;
49
+    @Mock private Connection connection;
51 50
     @Mock private IRCParser parser;
52 51
     @Mock private IRCClientInfo client;
53 52
     @Mock private AggregateConfigProvider config;
@@ -55,10 +54,10 @@ public class IdentClientTest {
55 54
 
56 55
     protected IdentClient getClient() {
57 56
         final List<Connection> servers = new ArrayList<>();
58
-        servers.add(server);
57
+        servers.add(connection);
59 58
 
60 59
         when(sm.getConnections()).thenReturn(servers);
61
-        when(server.getParser()).thenReturn(parser);
60
+        when(connection.getParser()).thenReturn(parser);
62 61
         when(parser.getLocalPort()).thenReturn(60);
63 62
         when(parser.getLocalClient()).thenReturn(client);
64 63
         when(client.getNickname()).thenReturn("nickname");

+ 1
- 1
parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java View File

@@ -76,7 +76,7 @@ public final class ParserDebugCommand extends Command {
76 76
             final CommandContext context) {
77 77
         final boolean isSilent = commandArgs.isSilent();
78 78
 
79
-        final Parser parser = ((ServerCommandContext) context).getServer().getParser();
79
+        final Parser parser = ((ServerCommandContext) context).getConnection().getParser();
80 80
 
81 81
         if (parser == null) {
82 82
             sendLine(origin, isSilent, FORMAT_ERROR, "Unable to get a parser for this window.");

Loading…
Cancel
Save