|
@@ -23,6 +23,7 @@
|
23
|
23
|
package com.dmdirc.addons.ui_swing.dialogs;
|
24
|
24
|
|
25
|
25
|
import com.dmdirc.Server;
|
|
26
|
+import com.dmdirc.ServerManager;
|
26
|
27
|
import com.dmdirc.addons.ui_swing.SwingController;
|
27
|
28
|
import com.dmdirc.addons.ui_swing.UIUtilities;
|
28
|
29
|
import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
|
|
@@ -68,6 +69,8 @@ public final class NewServerDialog extends StandardDialog implements
|
68
|
69
|
private static final long serialVersionUID = 8;
|
69
|
70
|
/** Identity Manager. */
|
70
|
71
|
private final IdentityManager identityManager;
|
|
72
|
+ /** Server manager. */
|
|
73
|
+ private final ServerManager serverManager;
|
71
|
74
|
/** checkbox. */
|
72
|
75
|
private JCheckBox newServerWindowCheck;
|
73
|
76
|
/** checkbox. */
|
|
@@ -93,6 +96,7 @@ public final class NewServerDialog extends StandardDialog implements
|
93
|
96
|
public NewServerDialog(final SwingController controller) {
|
94
|
97
|
super(controller, controller.getMainFrame(), ModalityType.MODELESS);
|
95
|
98
|
identityManager = controller.getIdentityManager();
|
|
99
|
+ serverManager = controller.getMain().getServerManager();
|
96
|
100
|
|
97
|
101
|
initComponents();
|
98
|
102
|
layoutComponents();
|
|
@@ -125,7 +129,7 @@ public final class NewServerDialog extends StandardDialog implements
|
125
|
129
|
|
126
|
130
|
serverField.requestFocusInWindow();
|
127
|
131
|
|
128
|
|
- if (getController().getMain().getServerManager().numServers() == 0 ||
|
|
132
|
+ if (serverManager.numServers() == 0 ||
|
129
|
133
|
getController().getMainFrame().getActiveFrame() == null) {
|
130
|
134
|
newServerWindowCheck.setSelected(true);
|
131
|
135
|
newServerWindowCheck.setEnabled(false);
|
|
@@ -247,14 +251,13 @@ public final class NewServerDialog extends StandardDialog implements
|
247
|
251
|
|
248
|
252
|
// Open in a new window?
|
249
|
253
|
if (newServerWindowCheck.isSelected()
|
250
|
|
- || getController().getMain().getServerManager().numServers() == 0
|
|
254
|
+ || serverManager.numServers() == 0
|
251
|
255
|
|| getController().getMainFrame().getActiveFrame() == null) {
|
252
|
256
|
|
253
|
257
|
new LoggingSwingWorker<Void, Void>() {
|
254
|
258
|
@Override
|
255
|
259
|
protected Void doInBackground() {
|
256
|
|
- final Server server = new Server(getController().getMain().getServerManager(), address, profile);
|
257
|
|
- server.connect();
|
|
260
|
+ serverManager.connectToAddress(address, profile);
|
258
|
261
|
return null;
|
259
|
262
|
}
|
260
|
263
|
}.executeInExecutor();
|
|
@@ -268,8 +271,7 @@ public final class NewServerDialog extends StandardDialog implements
|
268
|
271
|
@Override
|
269
|
272
|
protected Void doInBackground() {
|
270
|
273
|
if (server == null) {
|
271
|
|
- final Server newServer = new Server(getController().getMain().getServerManager(), address, profile);
|
272
|
|
- newServer.connect();
|
|
274
|
+ serverManager.connectToAddress(address, profile);
|
273
|
275
|
} else {
|
274
|
276
|
server.connect(address, profile);
|
275
|
277
|
}
|