Don't expose servers.

Change-Id: I58e485b06887b1215b4d4cba7f2244404a7b81aa
Reviewed-on: http://gerrit.dmdirc.com/3869
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

identd/test/com/dmdirc/addons/identd/IdentClientTest.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.identd;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
@@ -53,7 +54,7 @@ public class IdentClientTest {
     @Mock private DMDircMBassador eventBus;
 
     protected IdentClient getClient() {
-        final List<Server> servers = new ArrayList<>();
+        final List<Connection> servers = new ArrayList<>();
         servers.add(server);
 
         when(sm.getServers()).thenReturn(servers);

lagdisplay/src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
+import com.dmdirc.interfaces.Connection;
 
 import java.util.List;
 
@@ -72,9 +72,9 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
 
     @Override
     protected void initContent(final JPanel panel) {
-        final List<Server> servers = serverManager.getServers();
+        final List<Connection> connections = serverManager.getServers();
 
-        if (servers.isEmpty()) {
+        if (connections.isEmpty()) {
             panel.add(new JLabel("No open servers."));
         } else {
             if (manager.shouldShowGraph()) {
@@ -82,12 +82,14 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
                 panel.add(new JSeparator(), "span, grow, wrap");
             }
 
-            for (final Server server : servers) {
-                panel.add(new JLabel(server.getName()));
-                panel.add(new JLabel(server.getState() == ServerState.CONNECTED
-                        ? server.getNetwork() : "---", SwingConstants.CENTER), "grow");
-                panel.add(new JLabel(server.getState() == ServerState.CONNECTED
-                        ? manager.getTime(server) : "---", SwingConstants.RIGHT), "grow, wrap");
+            for (Connection connection : connections) {
+                panel.add(new JLabel(connection.getAddress()));
+                panel.add(new JLabel(
+                        connection.getState() == ServerState.CONNECTED
+                                ? connection.getNetwork() : "---",
+                        SwingConstants.CENTER), "grow");
+                panel.add(new JLabel(connection.getState() == ServerState.CONNECTED
+                        ? manager.getTime(connection) : "---", SwingConstants.RIGHT), "grow, wrap");
             }
         }
     }