Browse Source

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 years ago
parent
commit
05fcdd81ab

+ 5
- 3
src/com/dmdirc/addons/dcc/DCCCommand.java View File

26
 import com.dmdirc.addons.dcc.io.DCC;
26
 import com.dmdirc.addons.dcc.io.DCC;
27
 import com.dmdirc.addons.dcc.io.DCCChat;
27
 import com.dmdirc.addons.dcc.io.DCCChat;
28
 import com.dmdirc.FrameContainer;
28
 import com.dmdirc.FrameContainer;
29
-import com.dmdirc.Main;
30
 import com.dmdirc.Server;
29
 import com.dmdirc.Server;
31
 import com.dmdirc.actions.ActionManager;
30
 import com.dmdirc.actions.ActionManager;
32
 import com.dmdirc.addons.dcc.actions.DCCActions;
31
 import com.dmdirc.addons.dcc.actions.DCCActions;
33
 import com.dmdirc.addons.dcc.kde.KFileChooser;
32
 import com.dmdirc.addons.dcc.kde.KFileChooser;
33
+import com.dmdirc.addons.ui_swing.SwingController;
34
 import com.dmdirc.commandparser.CommandArguments;
34
 import com.dmdirc.commandparser.CommandArguments;
35
 import com.dmdirc.commandparser.CommandManager;
35
 import com.dmdirc.commandparser.CommandManager;
36
 import com.dmdirc.commandparser.commands.IntelligentCommand;
36
 import com.dmdirc.commandparser.commands.IntelligentCommand;
37
 import com.dmdirc.commandparser.commands.ServerCommand;
37
 import com.dmdirc.commandparser.commands.ServerCommand;
38
 import com.dmdirc.config.IdentityManager;
38
 import com.dmdirc.config.IdentityManager;
39
 import com.dmdirc.parser.interfaces.Parser;
39
 import com.dmdirc.parser.interfaces.Parser;
40
+import com.dmdirc.plugins.PluginManager;
40
 import com.dmdirc.ui.input.AdditionalTabTargets;
41
 import com.dmdirc.ui.input.AdditionalTabTargets;
41
 import com.dmdirc.ui.input.TabCompletionType;
42
 import com.dmdirc.ui.input.TabCompletionType;
42
 
43
 
43
 import java.io.File;
44
 import java.io.File;
44
 
45
 
45
 import javax.swing.JFileChooser;
46
 import javax.swing.JFileChooser;
46
-import javax.swing.JFrame;
47
 import javax.swing.JOptionPane;
47
 import javax.swing.JOptionPane;
48
 
48
 
49
 /**
49
 /**
156
                     jc.setDialogTitle("Send file to " + target + " - DMDirc ");
156
                     jc.setDialogTitle("Send file to " + target + " - DMDirc ");
157
                     jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
157
                     jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
158
                     jc.setMultiSelectionEnabled(false);
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
                 } else {
162
                 } else {
161
                     jc.setSelectedFile(givenFile);
163
                     jc.setSelectedFile(givenFile);
162
                     result = JFileChooser.APPROVE_OPTION;
164
                     result = JFileChooser.APPROVE_OPTION;

+ 13
- 4
src/com/dmdirc/addons/dcc/DCCPlugin.java View File

32
 import com.dmdirc.actions.interfaces.ActionType;
32
 import com.dmdirc.actions.interfaces.ActionType;
33
 import com.dmdirc.addons.dcc.kde.KFileChooser;
33
 import com.dmdirc.addons.dcc.kde.KFileChooser;
34
 import com.dmdirc.addons.dcc.actions.DCCActions;
34
 import com.dmdirc.addons.dcc.actions.DCCActions;
35
+import com.dmdirc.addons.ui_swing.SwingController;
35
 import com.dmdirc.commandparser.CommandManager;
36
 import com.dmdirc.commandparser.CommandManager;
36
 import com.dmdirc.config.Identity;
37
 import com.dmdirc.config.Identity;
37
 import com.dmdirc.config.IdentityManager;
38
 import com.dmdirc.config.IdentityManager;
46
 import com.dmdirc.parser.interfaces.ClientInfo;
47
 import com.dmdirc.parser.interfaces.ClientInfo;
47
 import com.dmdirc.parser.interfaces.Parser;
48
 import com.dmdirc.parser.interfaces.Parser;
48
 import com.dmdirc.plugins.Plugin;
49
 import com.dmdirc.plugins.Plugin;
50
+import com.dmdirc.plugins.PluginManager;
49
 import com.dmdirc.ui.WindowManager;
51
 import com.dmdirc.ui.WindowManager;
50
 
52
 
51
 import java.io.File;
53
 import java.io.File;
54
 import java.net.UnknownHostException;
56
 import java.net.UnknownHostException;
55
 
57
 
56
 import javax.swing.JFileChooser;
58
 import javax.swing.JFileChooser;
57
-import javax.swing.JFrame;
58
 import javax.swing.JOptionPane;
59
 import javax.swing.JOptionPane;
59
 
60
 
60
 /**
61
 /**
131
                 if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
132
                 if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
132
                     result = JFileChooser.APPROVE_OPTION;
133
                     result = JFileChooser.APPROVE_OPTION;
133
                 } else {
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
                 if (result == JFileChooser.APPROVE_OPTION) {
139
                 if (result == JFileChooser.APPROVE_OPTION) {
137
                     send.setFileName(jc.getSelectedFile().getPath());
140
                     send.setFileName(jc.getSelectedFile().getPath());
141
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
144
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
142
                                 return;
145
                                 return;
143
                             } else {
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
                                 saveFile(nickname, send, parser, reverse, sendFilename, token);
151
                                 saveFile(nickname, send, parser, reverse, sendFilename, token);
146
                                 return;
152
                                 return;
147
                             }
153
                             }
149
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
155
                             if (IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "receive.autoaccept")) {
150
                                 resume = true;
156
                                 resume = true;
151
                             } else {
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
                                 resume = (result == JOptionPane.YES_OPTION);
162
                                 resume = (result == JOptionPane.YES_OPTION);
154
                             }
163
                             }
155
                         }
164
                         }

+ 7
- 5
src/com/dmdirc/addons/dcc/PlaceholderContainer.java View File

23
 package com.dmdirc.addons.dcc;
23
 package com.dmdirc.addons.dcc;
24
 
24
 
25
 import com.dmdirc.FrameContainer;
25
 import com.dmdirc.FrameContainer;
26
-import com.dmdirc.Main;
27
 import com.dmdirc.Server;
26
 import com.dmdirc.Server;
28
 import com.dmdirc.addons.dcc.ui.PlaceholderWindow;
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
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
29
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
31
 import com.dmdirc.config.IdentityManager;
30
 import com.dmdirc.config.IdentityManager;
31
+import com.dmdirc.plugins.PluginManager;
32
 import com.dmdirc.ui.WindowManager;
32
 import com.dmdirc.ui.WindowManager;
33
 import com.dmdirc.ui.interfaces.Window;
33
 import com.dmdirc.ui.interfaces.Window;
34
+
34
 import java.awt.Dialog.ModalityType;
35
 import java.awt.Dialog.ModalityType;
35
 
36
 
36
 /**
37
 /**
69
         }
70
         }
70
 
71
 
71
         if (dccs > 0) {
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
                     "Closing this window will cause all existing DCCs " +
77
                     "Closing this window will cause all existing DCCs " +
76
                     "to terminate, are you sure you want to do this?") {
78
                     "to terminate, are you sure you want to do this?") {
77
                 /**
79
                 /**

+ 4
- 3
src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java View File

22
 
22
 
23
 package com.dmdirc.addons.lagdisplay;
23
 package com.dmdirc.addons.lagdisplay;
24
 
24
 
25
-import com.dmdirc.Main;
26
 import com.dmdirc.Server;
25
 import com.dmdirc.Server;
27
 import com.dmdirc.ServerManager;
26
 import com.dmdirc.ServerManager;
28
 import com.dmdirc.ServerState;
27
 import com.dmdirc.ServerState;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
28
+import com.dmdirc.addons.ui_swing.SwingController;
30
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
29
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
31
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
30
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
31
+import com.dmdirc.plugins.PluginManager;
32
 
32
 
33
 import java.util.List;
33
 import java.util.List;
34
 
34
 
61
      * @param parent The {@link JPanel} to use for positioning
61
      * @param parent The {@link JPanel} to use for positioning
62
      */
62
      */
63
     public ServerInfoDialog(final LagDisplayPlugin ldp, final StatusbarPopupPanel parent) {
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
         this.plugin = ldp;
67
         this.plugin = ldp;
67
     }
68
     }

+ 4
- 3
src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java View File

22
 
22
 
23
 package com.dmdirc.addons.nickcolours;
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
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
26
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
28
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
27
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
28
+import com.dmdirc.plugins.PluginManager;
29
 
29
 
30
 import java.awt.event.ActionEvent;
30
 import java.awt.event.ActionEvent;
31
 import java.awt.event.ActionListener;
31
 import java.awt.event.ActionListener;
77
     public NickColourInputDialog(final NickColourPanel panel, final int row,
77
     public NickColourInputDialog(final NickColourPanel panel, final int row,
78
             final String nickname, final String network,
78
             final String nickname, final String network,
79
             final String textcolour, final String nickcolour) {
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
         this.panel = panel;
83
         this.panel = panel;
83
         this.row = row;
84
         this.row = row;

+ 4
- 3
src/com/dmdirc/addons/osd/OsdWindow.java View File

22
 
22
 
23
 package com.dmdirc.addons.osd;
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
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
 import com.dmdirc.addons.ui_swing.UIUtilities;
28
 import com.dmdirc.config.IdentityManager;
27
 import com.dmdirc.config.IdentityManager;
28
+import com.dmdirc.plugins.PluginManager;
29
 import com.dmdirc.ui.messages.ColourManager;
29
 import com.dmdirc.ui.messages.ColourManager;
30
 
30
 
31
 import java.awt.Color;
31
 import java.awt.Color;
91
      */
91
      */
92
     public OsdWindow(final String text, final boolean config, final int x,
92
     public OsdWindow(final String text, final boolean config, final int x,
93
             final int y, final OsdPlugin plugin, final OsdManager osdManager) {
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
         this.config = config;
97
         this.config = config;
97
         this.osdManager = osdManager;
98
         this.osdManager = osdManager;

Loading…
Cancel
Save