Browse Source

Merge pull request #689 from greboid/nightlyupdater

Use Connection not Server in ServerManager.
pull/691/head
Chris Smith 8 years ago
parent
commit
01bdb9a1f7
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      src/com/dmdirc/ServerManager.java

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

65
 
65
 
66
     private static final Logger LOG = LoggerFactory.getLogger(ServerManager.class);
66
     private static final Logger LOG = LoggerFactory.getLogger(ServerManager.class);
67
     /** All servers that currently exist. */
67
     /** All servers that currently exist. */
68
-    private final Set<Server> servers = new CopyOnWriteArraySet<>();
68
+    private final Set<Connection> servers = new CopyOnWriteArraySet<>();
69
     /** The manager to use to find profiles. */
69
     /** The manager to use to find profiles. */
70
     private final ProfileManager profileManager;
70
     private final ProfileManager profileManager;
71
     /** The identity factory to give to servers. */
71
     /** The identity factory to give to servers. */
102
     }
102
     }
103
 
103
 
104
     @Override
104
     @Override
105
-    public Server createServer(final URI uri, final Profile profile) {
105
+    public Connection createServer(final URI uri, final Profile profile) {
106
         final ConfigProviderMigrator configProvider = identityFactory.createMigratableConfig(uri.
106
         final ConfigProviderMigrator configProvider = identityFactory.createMigratableConfig(uri.
107
                 getScheme(), "", "", uri.getHost());
107
                 getScheme(), "", "", uri.getHost());
108
 
108
 
109
-        final Server server = serverFactoryImpl.getServer(
109
+        final Connection server = serverFactoryImpl.getServer(
110
                 configProvider,
110
                 configProvider,
111
                 Executors.newScheduledThreadPool(1,
111
                 Executors.newScheduledThreadPool(1,
112
                         new ThreadFactoryBuilder().setNameFormat("server-timer-%d").build()),
112
                         new ThreadFactoryBuilder().setNameFormat("server-timer-%d").build()),
122
      *
122
      *
123
      * @param server The server to be registered
123
      * @param server The server to be registered
124
      */
124
      */
125
-    void registerServer(final Server server) {
125
+    void registerServer(final Connection server) {
126
         servers.add(server);
126
         servers.add(server);
127
     }
127
     }
128
 
128
 
143
 
143
 
144
     @Override
144
     @Override
145
     public void disconnectAll(final String message) {
145
     public void disconnectAll(final String message) {
146
-        for (Server server : servers) {
146
+        for (Connection server : servers) {
147
             server.disconnect(message);
147
             server.disconnect(message);
148
         }
148
         }
149
     }
149
     }
150
 
150
 
151
     @Override
151
     @Override
152
     public void closeAll(final String message) {
152
     public void closeAll(final String message) {
153
-        for (Server server : servers) {
153
+        for (Connection server : servers) {
154
             server.disconnect(message);
154
             server.disconnect(message);
155
             server.getWindowModel().close();
155
             server.getWindowModel().close();
156
         }
156
         }
175
 
175
 
176
     @Override
176
     @Override
177
     public Connection connectToAddress(final URI uri, final Profile profile) {
177
     public Connection connectToAddress(final URI uri, final Profile profile) {
178
-        final Server server = servers.stream()
178
+        final Connection server = servers.stream()
179
                 .filter(s -> s.compareURI(uri)).findAny()
179
                 .filter(s -> s.compareURI(uri)).findAny()
180
                 .orElse(createServer(uri, profile));
180
                 .orElse(createServer(uri, profile));
181
 
181
 

Loading…
Cancel
Save