瀏覽代碼

getActiveWindow exodus

Change-Id: I88d3ff6e100df51b6128de4d503ff9c69b51b554
Reviewed-on: http://gerrit.dmdirc.com/378
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 年之前
父節點
當前提交
aaaf64f688
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3
    2
      src/com/dmdirc/addons/ui_swing/components/MenuBar.java

+ 3
- 2
src/com/dmdirc/addons/ui_swing/components/MenuBar.java 查看文件

38
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
38
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
39
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
39
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
40
 import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
40
 import com.dmdirc.addons.ui_swing.framemanager.windowmenu.WindowMenuFrameManager;
41
+import com.dmdirc.ui.WindowManager;
41
 
42
 
42
 import java.awt.event.ActionEvent;
43
 import java.awt.event.ActionEvent;
43
 import java.awt.event.ActionListener;
44
 import java.awt.event.ActionListener;
268
         } else if (e.getActionCommand().equals("feedback")) {
269
         } else if (e.getActionCommand().equals("feedback")) {
269
             FeedbackDialog.showFeedbackDialog(mainFrame);
270
             FeedbackDialog.showFeedbackDialog(mainFrame);
270
         } else if (e.getActionCommand().equals("ChannelSettings")) {
271
         } else if (e.getActionCommand().equals("ChannelSettings")) {
271
-            final Window activeWindow = controller.getActiveWindow();
272
+            final Window activeWindow = WindowManager.getActiveWindow();
272
             if (activeWindow instanceof ChannelFrame) {
273
             if (activeWindow instanceof ChannelFrame) {
273
                 controller.showChannelSettingsDialog(((ChannelFrame) activeWindow).
274
                 controller.showChannelSettingsDialog(((ChannelFrame) activeWindow).
274
                         getChannel());
275
                         getChannel());
303
     /** {@inheritDoc} */
304
     /** {@inheritDoc} */
304
     @Override
305
     @Override
305
     public void menuSelected(final MenuEvent e) {
306
     public void menuSelected(final MenuEvent e) {
306
-        final Window activeWindow = controller.getActiveWindow();
307
+        final Window activeWindow = WindowManager.getActiveWindow();
307
 
308
 
308
         ssd.setEnabled(activeWindow != null && activeWindow.getContainer().
309
         ssd.setEnabled(activeWindow != null && activeWindow.getContainer().
309
                 getServer() != null && activeWindow.getContainer().
310
                 getServer() != null && activeWindow.getContainer().

Loading…
取消
儲存