Browse Source

Remove deprecated methods

Change-Id: Ia0c437dbb8b4e0cda23f87c8ed908ee1ec629125
Reviewed-on: http://gerrit.dmdirc.com/485
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <devs-public@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 years ago
parent
commit
b780852757

+ 6
- 1
src/com/dmdirc/addons/ui_dummy/DummyController.java View File

@@ -151,8 +151,13 @@ public final class DummyController extends Plugin implements UIController {
151 151
         return null;
152 152
     }
153 153
 
154
-    /** {@inheritDoc} */
154
+    /**
155
+     * {@inheritDoc}
156
+     * 
157
+     * @deprecated 
158
+     */
155 159
     @Override
160
+    @Deprecated
156 161
     public Server getActiveServer() {
157 162
         throw new UnsupportedOperationException("Not supported yet.");
158 163
     }

+ 3
- 3
src/com/dmdirc/addons/ui_swing/components/MenuBar.java View File

@@ -275,9 +275,9 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
275 275
                         getChannel());
276 276
             }
277 277
         } else if (e.getActionCommand().equals("ServerSettings")) {
278
-            controller.showServerSettingsDialog(controller.getActiveServer());
278
+            controller.showServerSettingsDialog(WindowManager.getActiveServer());
279 279
         } else if (e.getActionCommand().equals("Disconnect")) {
280
-            controller.getActiveServer().disconnect();
280
+            WindowManager.getActiveServer().disconnect();
281 281
         } else if (e.getActionCommand().equals("JoinChannel")) {
282 282
             new StandardInputDialog(mainFrame, ModalityType.MODELESS,
283 283
                     "Join channel", "Enter the name of the channel to join.") {
@@ -288,7 +288,7 @@ public class MenuBar extends JMenuBar implements ActionListener, MenuListener {
288 288
                 /** {@inheritDoc} */
289 289
                 @Override
290 290
                 public boolean save() {
291
-                    controller.getActiveServer().join(getText());
291
+                    WindowManager.getActiveServer().join(getText());
292 292
                     return true;
293 293
                 }
294 294
 

Loading…
Cancel
Save