Quellcode durchsuchen

Update plugins after core Server changes.

Change-Id: I3fff818d6e6694163660a36f47d60271d8f0e68e
Depends-On: I9842c20b4e4ff846c9bbf4858da794a843c3b053
Reviewed-on: http://gerrit.dmdirc.com/2658
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.8
Chris Smith vor 10 Jahren
Ursprung
Commit
74402de369

+ 2
- 4
src/com/dmdirc/addons/serverlists/ServerEntry.java Datei anzeigen

22
 
22
 
23
 package com.dmdirc.addons.serverlists;
23
 package com.dmdirc.addons.serverlists;
24
 
24
 
25
-import com.dmdirc.Server;
26
-
27
 import com.dmdirc.ServerManager;
25
 import com.dmdirc.ServerManager;
26
+
28
 import java.net.URI;
27
 import java.net.URI;
29
 
28
 
30
 /**
29
 /**
97
     /** {@inheritDoc} */
96
     /** {@inheritDoc} */
98
     @Override
97
     @Override
99
     public void connect() {
98
     public void connect() {
100
-        final Server server = new Server(serverManager, address, getProfileIdentity());
101
-        server.connect();
99
+        serverManager.connectToAddress(address, getProfileIdentity());
102
     }
100
     }
103
 
101
 
104
     /** {@inheritDoc} */
102
     /** {@inheritDoc} */

+ 8
- 6
src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java Datei anzeigen

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

+ 4
- 5
src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java Datei anzeigen

23
 package com.dmdirc.addons.ui_web;
23
 package com.dmdirc.addons.ui_web;
24
 
24
 
25
 import com.dmdirc.Channel;
25
 import com.dmdirc.Channel;
26
-import com.dmdirc.Server;
27
 import com.dmdirc.addons.ui_web.uicomponents.WebInputHandler;
26
 import com.dmdirc.addons.ui_web.uicomponents.WebInputHandler;
28
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
27
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
29
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
28
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
278
     private void doNewServer(final HttpServletRequest request)
277
     private void doNewServer(final HttpServletRequest request)
279
             throws IOException {
278
             throws IOException {
280
         try {
279
         try {
281
-            new Server(controller.getMain().getServerManager(),
280
+            controller.getMain().getServerManager().connectToAddress(
282
                     new URI("irc://" + request.getParameter("password") + "@"
281
                     new URI("irc://" + request.getParameter("password") + "@"
283
-                    + request.getParameter("server") + ":"
284
-                    + request.getParameter("port")),
285
-                    findProfile(request.getParameter("profile"))).connect();
282
+                        + request.getParameter("server") + ":"
283
+                        + request.getParameter("port")),
284
+                    findProfile(request.getParameter("profile")));
286
         } catch (URISyntaxException ex) {
285
         } catch (URISyntaxException ex) {
287
             // Ugh.
286
             // Ugh.
288
         }
287
         }

Laden…
Abbrechen
Speichern