Bläddra i källkod

Stop using Main.getUI() in swing subplugins

Change-Id: I704fb691582b58777e184bdafa9a5266cfb7b358
Reviewed-on: http://gerrit.dmdirc.com/1249
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
tags/0.6.4
Chris Smith 14 år sedan
förälder
incheckning
05fcdd81ab

+ 5
- 3
src/com/dmdirc/addons/dcc/DCCCommand.java Visa fil

@@ -26,24 +26,24 @@ import com.dmdirc.addons.dcc.io.DCCTransfer;
26 26
 import com.dmdirc.addons.dcc.io.DCC;
27 27
 import com.dmdirc.addons.dcc.io.DCCChat;
28 28
 import com.dmdirc.FrameContainer;
29
-import com.dmdirc.Main;
30 29
 import com.dmdirc.Server;
31 30
 import com.dmdirc.actions.ActionManager;
32 31
 import com.dmdirc.addons.dcc.actions.DCCActions;
33 32
 import com.dmdirc.addons.dcc.kde.KFileChooser;
33
+import com.dmdirc.addons.ui_swing.SwingController;
34 34
 import com.dmdirc.commandparser.CommandArguments;
35 35
 import com.dmdirc.commandparser.CommandManager;
36 36
 import com.dmdirc.commandparser.commands.IntelligentCommand;
37 37
 import com.dmdirc.commandparser.commands.ServerCommand;
38 38
 import com.dmdirc.config.IdentityManager;
39 39
 import com.dmdirc.parser.interfaces.Parser;
40
+import com.dmdirc.plugins.PluginManager;
40 41
 import com.dmdirc.ui.input.AdditionalTabTargets;
41 42
 import com.dmdirc.ui.input.TabCompletionType;
42 43
 
43 44
 import java.io.File;
44 45
 
45 46
 import javax.swing.JFileChooser;
46
-import javax.swing.JFrame;
47 47
 import javax.swing.JOptionPane;
48 48
 
49 49
 /**
@@ -156,7 +156,9 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
156 156
                     jc.setDialogTitle("Send file to " + target + " - DMDirc ");
157 157
                     jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
158 158
                     jc.setMultiSelectionEnabled(false);
159
-                    result = jc.showOpenDialog((JFrame) Main.getUI().getMainWindow());
159
+                    result = jc.showOpenDialog(((SwingController) PluginManager
160
+                            .getPluginManager().getPluginInfoByName("ui_swing")
161
+                            .getPlugin()).getMainFrame());
160 162
                 } else {
161 163
                     jc.setSelectedFile(givenFile);
162 164
                     result = JFileChooser.APPROVE_OPTION;

+ 13
- 4
src/com/dmdirc/addons/dcc/DCCPlugin.java Visa fil

@@ -32,6 +32,7 @@ import com.dmdirc.actions.CoreActionType;
32 32
 import com.dmdirc.actions.interfaces.ActionType;
33 33
 import com.dmdirc.addons.dcc.kde.KFileChooser;
34 34
 import com.dmdirc.addons.dcc.actions.DCCActions;
35
+import com.dmdirc.addons.ui_swing.SwingController;
35 36
 import com.dmdirc.commandparser.CommandManager;
36 37
 import com.dmdirc.config.Identity;
37 38
 import com.dmdirc.config.IdentityManager;
@@ -46,6 +47,7 @@ import com.dmdirc.logger.Logger;
46 47
 import com.dmdirc.parser.interfaces.ClientInfo;
47 48
 import com.dmdirc.parser.interfaces.Parser;
48 49
 import com.dmdirc.plugins.Plugin;
50
+import com.dmdirc.plugins.PluginManager;
49 51
 import com.dmdirc.ui.WindowManager;
50 52
 
51 53
 import java.io.File;
@@ -54,7 +56,6 @@ import java.net.InetAddress;
54 56
 import java.net.UnknownHostException;
55 57
 
56 58
 import javax.swing.JFileChooser;
57
-import javax.swing.JFrame;
58 59
 import javax.swing.JOptionPane;
59 60
 
60 61
 /**
@@ -131,7 +132,9 @@ public final class DCCPlugin extends Plugin implements ActionListener {
131 132
                 if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
132 133
                     result = JFileChooser.APPROVE_OPTION;
133 134
                 } else {
134
-                    result = jc.showSaveDialog((JFrame) Main.getUI().getMainWindow());
135
+                    result = jc.showSaveDialog(((SwingController) PluginManager
136
+                            .getPluginManager().getPluginInfoByName("ui_swing")
137
+                            .getPlugin()).getMainFrame());
135 138
                 }
136 139
                 if (result == JFileChooser.APPROVE_OPTION) {
137 140
                     send.setFileName(jc.getSelectedFile().getPath());
@@ -141,7 +144,10 @@ public final class DCCPlugin extends Plugin implements ActionListener {
141 144
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
142 145
                                 return;
143 146
                             } else {
144
-                                JOptionPane.showMessageDialog((JFrame) Main.getUI().getMainWindow(), "This file has already been completed, or is longer than the file you are receiving.\nPlease choose a different file.", "Problem with selected file", JOptionPane.ERROR_MESSAGE);
147
+                                JOptionPane.showMessageDialog(
148
+                                        ((SwingController) PluginManager
149
+                                        .getPluginManager().getPluginInfoByName("ui_swing")
150
+                                        .getPlugin()).getMainFrame(), "This file has already been completed, or is longer than the file you are receiving.\nPlease choose a different file.", "Problem with selected file", JOptionPane.ERROR_MESSAGE);
145 151
                                 saveFile(nickname, send, parser, reverse, sendFilename, token);
146 152
                                 return;
147 153
                             }
@@ -149,7 +155,10 @@ public final class DCCPlugin extends Plugin implements ActionListener {
149 155
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
150 156
                                 resume = true;
151 157
                             } else {
152
-                                result = JOptionPane.showConfirmDialog((JFrame) Main.getUI().getMainWindow(), "This file exists already, do you want to resume an exisiting download?", "Resume Download?", JOptionPane.YES_NO_OPTION);
158
+                                result = JOptionPane.showConfirmDialog(
159
+                                        ((SwingController) PluginManager
160
+                                        .getPluginManager().getPluginInfoByName("ui_swing")
161
+                                        .getPlugin()).getMainFrame(), "This file exists already, do you want to resume an exisiting download?", "Resume Download?", JOptionPane.YES_NO_OPTION);
153 162
                                 resume = (result == JOptionPane.YES_OPTION);
154 163
                             }
155 164
                         }

+ 7
- 5
src/com/dmdirc/addons/dcc/PlaceholderContainer.java Visa fil

@@ -23,14 +23,15 @@
23 23
 package com.dmdirc.addons.dcc;
24 24
 
25 25
 import com.dmdirc.FrameContainer;
26
-import com.dmdirc.Main;
27 26
 import com.dmdirc.Server;
28 27
 import com.dmdirc.addons.dcc.ui.PlaceholderWindow;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
28
+import com.dmdirc.addons.ui_swing.SwingController;
30 29
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
31 30
 import com.dmdirc.config.IdentityManager;
31
+import com.dmdirc.plugins.PluginManager;
32 32
 import com.dmdirc.ui.WindowManager;
33 33
 import com.dmdirc.ui.interfaces.Window;
34
+
34 35
 import java.awt.Dialog.ModalityType;
35 36
 
36 37
 /**
@@ -69,9 +70,10 @@ public class PlaceholderContainer extends FrameContainer<PlaceholderWindow> {
69 70
         }
70 71
 
71 72
         if (dccs > 0) {
72
-            new StandardQuestionDialog(
73
-                    (MainFrame) Main.getUI().getMainWindow(),
74
-                    ModalityType.MODELESS, "Close confirmation",
73
+            new StandardQuestionDialog(((SwingController) PluginManager
74
+                    .getPluginManager().getPluginInfoByName("ui_swing")
75
+                    .getPlugin()).getMainFrame(), ModalityType.MODELESS,
76
+                    "Close confirmation",
75 77
                     "Closing this window will cause all existing DCCs " +
76 78
                     "to terminate, are you sure you want to do this?") {
77 79
                 /**

+ 4
- 3
src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java Visa fil

@@ -22,13 +22,13 @@
22 22
 
23 23
 package com.dmdirc.addons.lagdisplay;
24 24
 
25
-import com.dmdirc.Main;
26 25
 import com.dmdirc.Server;
27 26
 import com.dmdirc.ServerManager;
28 27
 import com.dmdirc.ServerState;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
28
+import com.dmdirc.addons.ui_swing.SwingController;
30 29
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
31 30
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
31
+import com.dmdirc.plugins.PluginManager;
32 32
 
33 33
 import java.util.List;
34 34
 
@@ -61,7 +61,8 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
61 61
      * @param parent The {@link JPanel} to use for positioning
62 62
      */
63 63
     public ServerInfoDialog(final LagDisplayPlugin ldp, final StatusbarPopupPanel parent) {
64
-        super(parent, (MainFrame) Main.getUI().getMainWindow());
64
+        super(parent, ((SwingController) PluginManager.getPluginManager()
65
+                .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame());
65 66
 
66 67
         this.plugin = ldp;
67 68
     }

+ 4
- 3
src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java Visa fil

@@ -22,10 +22,10 @@
22 22
 
23 23
 package com.dmdirc.addons.nickcolours;
24 24
 
25
-import com.dmdirc.Main;
26
-import com.dmdirc.addons.ui_swing.MainFrame;
25
+import com.dmdirc.addons.ui_swing.SwingController;
27 26
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
28 27
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
28
+import com.dmdirc.plugins.PluginManager;
29 29
 
30 30
 import java.awt.event.ActionEvent;
31 31
 import java.awt.event.ActionListener;
@@ -77,7 +77,8 @@ public class NickColourInputDialog extends StandardDialog
77 77
     public NickColourInputDialog(final NickColourPanel panel, final int row,
78 78
             final String nickname, final String network,
79 79
             final String textcolour, final String nickcolour) {
80
-        super((MainFrame) Main.getUI().getMainWindow(), false);
80
+        super(((SwingController) PluginManager.getPluginManager()
81
+                .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
81 82
         
82 83
         this.panel = panel;
83 84
         this.row = row;

+ 4
- 3
src/com/dmdirc/addons/osd/OsdWindow.java Visa fil

@@ -22,10 +22,10 @@
22 22
 
23 23
 package com.dmdirc.addons.osd;
24 24
 
25
-import com.dmdirc.Main;
26
-import com.dmdirc.addons.ui_swing.MainFrame;
25
+import com.dmdirc.addons.ui_swing.SwingController;
27 26
 import com.dmdirc.addons.ui_swing.UIUtilities;
28 27
 import com.dmdirc.config.IdentityManager;
28
+import com.dmdirc.plugins.PluginManager;
29 29
 import com.dmdirc.ui.messages.ColourManager;
30 30
 
31 31
 import java.awt.Color;
@@ -91,7 +91,8 @@ public class OsdWindow extends JDialog implements MouseListener,
91 91
      */
92 92
     public OsdWindow(final String text, final boolean config, final int x,
93 93
             final int y, final OsdPlugin plugin, final OsdManager osdManager) {
94
-        super((MainFrame) Main.getUI().getMainWindow(), false);
94
+        super(((SwingController) PluginManager.getPluginManager()
95
+                .getPluginInfoByName("ui_swing").getPlugin()).getMainFrame(), false);
95 96
         
96 97
         this.config = config;
97 98
         this.osdManager = osdManager;

Laddar…
Avbryt
Spara