Sfoglia il codice sorgente

Switch all UI stuff to use SwingController.getMainFrame() in favour of

horrible casting Main.getUI() to SwingController
tags/0.6.3m1rc1
Chris Smith 15 anni fa
parent
commit
a7a881398c
20 ha cambiato i file con 53 aggiunte e 75 eliminazioni
  1. 1
    3
      src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java
  2. 3
    5
      src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java
  3. 2
    3
      src/com/dmdirc/addons/osd/OsdWindow.java
  4. 3
    3
      src/com/dmdirc/addons/systray/SystrayPlugin.java
  5. 2
    3
      src/com/dmdirc/addons/ui_swing/components/ColourPickerDialog.java
  6. 2
    3
      src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java
  7. 3
    4
      src/com/dmdirc/addons/ui_swing/components/TextFrame.java
  8. 2
    2
      src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java
  9. 3
    4
      src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java
  10. 3
    4
      src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java
  11. 3
    4
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java
  12. 3
    4
      src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java
  13. 4
    5
      src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java
  14. 3
    5
      src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java
  15. 2
    3
      src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java
  16. 2
    4
      src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java
  17. 2
    3
      src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java
  18. 3
    4
      src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java
  19. 3
    4
      src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java
  20. 4
    5
      src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

+ 1
- 3
src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java Vedi File

23
 package com.dmdirc.addons.lagdisplay;
23
 package com.dmdirc.addons.lagdisplay;
24
 
24
 
25
 import com.dmdirc.Server;
25
 import com.dmdirc.Server;
26
-import com.dmdirc.Main;
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;
30
 import com.dmdirc.addons.ui_swing.SwingController;
28
 import com.dmdirc.addons.ui_swing.SwingController;
31
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
29
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
32
 
30
 
67
      * @param parent The {@link JPanel} to use for positioning
65
      * @param parent The {@link JPanel} to use for positioning
68
      */
66
      */
69
     public ServerInfoDialog(final LagDisplayPlugin ldp, final JPanel parent) {
67
     public ServerInfoDialog(final LagDisplayPlugin ldp, final JPanel parent) {
70
-        super((MainFrame) Main.getUI().getMainWindow(), false);
68
+        super(SwingController.getMainFrame(), false);
71
 
69
 
72
         this.parent = parent;
70
         this.parent = parent;
73
 
71
 

+ 3
- 5
src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java Vedi 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.components.StandardDialog;
26
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
28
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
27
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
29
 
28
 
32
 
31
 
33
 import javax.swing.JButton;
32
 import javax.swing.JButton;
34
 import javax.swing.JLabel;
33
 import javax.swing.JLabel;
35
-import javax.swing.JPanel;
36
 import javax.swing.JTextField;
34
 import javax.swing.JTextField;
37
 import javax.swing.WindowConstants;
35
 import javax.swing.WindowConstants;
38
 
36
 
81
     public NickColourInputDialog(final NickColourPanel panel, final int row,
79
     public NickColourInputDialog(final NickColourPanel panel, final int row,
82
             final String nickname, final String network,
80
             final String nickname, final String network,
83
             final String textcolour, final String nickcolour) {
81
             final String textcolour, final String nickcolour) {
84
-        super((MainFrame) Main.getUI().getMainWindow(), false);
82
+        super(SwingController.getMainFrame(), false);
85
         
83
         
86
         this.panel = panel;
84
         this.panel = panel;
87
         this.row = row;
85
         this.row = row;
94
         
92
         
95
         setTitle("Nick colour editor");
93
         setTitle("Nick colour editor");
96
         
94
         
97
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
95
+        setLocationRelativeTo(SwingController.getMainFrame());
98
         setVisible(true);
96
         setVisible(true);
99
     }
97
     }
100
     
98
     

+ 2
- 3
src/com/dmdirc/addons/osd/OsdWindow.java Vedi 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.config.IdentityManager;
25
 import com.dmdirc.config.IdentityManager;
27
 import com.dmdirc.ui.messages.ColourManager;
26
 import com.dmdirc.ui.messages.ColourManager;
28
-import com.dmdirc.addons.ui_swing.MainFrame;
27
+import com.dmdirc.addons.ui_swing.SwingController;
29
 
28
 
30
 import java.awt.Color;
29
 import java.awt.Color;
31
 import java.awt.Point;
30
 import java.awt.Point;
146
      * @param y The y-axis position for the OSD window
145
      * @param y The y-axis position for the OSD window
147
      */
146
      */
148
     public OsdWindow(final String text, final boolean config, final int x, final int y) {
147
     public OsdWindow(final String text, final boolean config, final int x, final int y) {
149
-        super(((MainFrame) Main.getUI().getMainWindow()), false);
148
+        super(SwingController.getMainFrame(), false);
150
         
149
         
151
         this.config = config;
150
         this.config = config;
152
         
151
         

+ 3
- 3
src/com/dmdirc/addons/systray/SystrayPlugin.java Vedi File

35
 import com.dmdirc.config.prefs.validator.ValidationResponse;
35
 import com.dmdirc.config.prefs.validator.ValidationResponse;
36
 import com.dmdirc.plugins.Plugin;
36
 import com.dmdirc.plugins.Plugin;
37
 import com.dmdirc.ui.messages.Styliser;
37
 import com.dmdirc.ui.messages.Styliser;
38
-import com.dmdirc.addons.ui_swing.MainFrame;
38
+import com.dmdirc.addons.ui_swing.SwingController;
39
 
39
 
40
 import java.awt.AWTException;
40
 import java.awt.AWTException;
41
 import java.awt.Frame;
41
 import java.awt.Frame;
165
                 Main.getUI().getMainWindow().setVisible(false);
165
                 Main.getUI().getMainWindow().setVisible(false);
166
             } else {
166
             } else {
167
                 Main.getUI().getMainWindow().setVisible(true);
167
                 Main.getUI().getMainWindow().setVisible(true);
168
-                ((MainFrame) Main.getUI().getMainWindow()).setState(Frame.NORMAL);
169
-                ((MainFrame) Main.getUI().getMainWindow()).toFront();
168
+                SwingController.getMainFrame().setState(Frame.NORMAL);
169
+                SwingController.getMainFrame().toFront();
170
             }
170
             }
171
         }
171
         }
172
     }
172
     }

+ 2
- 3
src/com/dmdirc/addons/ui_swing/components/ColourPickerDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.components;
23
 package com.dmdirc.addons.ui_swing.components;
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
 
28
 import java.awt.Window;
27
 import java.awt.Window;
29
 import java.awt.event.ActionListener;
28
 import java.awt.event.ActionListener;
89
      */
88
      */
90
     public ColourPickerDialog(final boolean showIRC, final boolean showHex,
89
     public ColourPickerDialog(final boolean showIRC, final boolean showHex,
91
             final Window window) {
90
             final Window window) {
92
-        super((MainFrame) Main.getUI().getMainWindow(), false);
91
+        super(SwingController.getMainFrame(), false);
93
 
92
 
94
         colourChooser = new ColourPickerPanel(showIRC, showHex);
93
         colourChooser = new ColourPickerPanel(showIRC, showHex);
95
 
94
 

+ 2
- 3
src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java Vedi File

23
 package com.dmdirc.addons.ui_swing.components;
23
 package com.dmdirc.addons.ui_swing.components;
24
 
24
 
25
 import com.dmdirc.ui.IconManager;
25
 import com.dmdirc.ui.IconManager;
26
-import com.dmdirc.Main;
27
 import com.dmdirc.ui.interfaces.SearchBar;
26
 import com.dmdirc.ui.interfaces.SearchBar;
28
 import com.dmdirc.ui.messages.ColourManager;
27
 import com.dmdirc.ui.messages.ColourManager;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
28
+import com.dmdirc.addons.ui_swing.SwingController;
30
 import com.dmdirc.addons.ui_swing.UIUtilities;
29
 import com.dmdirc.addons.ui_swing.UIUtilities;
31
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
30
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
32
 import com.dmdirc.addons.ui_swing.textpane.IRCDocument;
31
 import com.dmdirc.addons.ui_swing.textpane.IRCDocument;
239
                 || textPane.getSelectedRange().getEndPos() != 0)
238
                 || textPane.getSelectedRange().getEndPos() != 0)
240
                 && ((up && result.getEndLine() > textPane.getSelectedRange().getEndLine())
239
                 && ((up && result.getEndLine() > textPane.getSelectedRange().getEndLine())
241
                 || (!up && result.getStartLine() < textPane.getSelectedRange().getStartLine()))
240
                 || (!up && result.getStartLine() < textPane.getSelectedRange().getStartLine()))
242
-                && JOptionPane.showConfirmDialog((MainFrame) Main.getUI().getMainWindow(),
241
+                && JOptionPane.showConfirmDialog(SwingController.getMainFrame(),
243
                 "Do you want to continue searching from the " + (up ? "end" : "beginning"),
242
                 "Do you want to continue searching from the " + (up ? "end" : "beginning"),
244
                 "No more results", JOptionPane.OK_CANCEL_OPTION,
243
                 "No more results", JOptionPane.OK_CANCEL_OPTION,
245
                 JOptionPane.QUESTION_MESSAGE) != JOptionPane.OK_OPTION) {
244
                 JOptionPane.QUESTION_MESSAGE) != JOptionPane.OK_OPTION) {

+ 3
- 4
src/com/dmdirc/addons/ui_swing/components/TextFrame.java Vedi File

42
 import com.dmdirc.ui.interfaces.Window;
42
 import com.dmdirc.ui.interfaces.Window;
43
 import com.dmdirc.ui.messages.Formatter;
43
 import com.dmdirc.ui.messages.Formatter;
44
 import com.dmdirc.ui.messages.Styliser;
44
 import com.dmdirc.ui.messages.Styliser;
45
-import com.dmdirc.addons.ui_swing.MainFrame;
45
+import com.dmdirc.addons.ui_swing.SwingController;
46
 import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
46
 import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
47
 import com.dmdirc.addons.ui_swing.actions.CommandAction;
47
 import com.dmdirc.addons.ui_swing.actions.CommandAction;
48
 import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
48
 import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
182
         setResizable(true);
182
         setResizable(true);
183
         setIconifiable(true);
183
         setIconifiable(true);
184
         setFocusable(true);
184
         setFocusable(true);
185
-        setPreferredSize(new Dimension(((MainFrame) Main.getUI().getMainWindow()).getWidth() /
186
-                2,
187
-                ((MainFrame) Main.getUI().getMainWindow()).getHeight() / 3));
185
+        setPreferredSize(new Dimension(SwingController.getMainFrame().getWidth() /
186
+                2, SwingController.getMainFrame().getHeight() / 3));
188
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
187
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
189
 
188
 
190
         addPropertyChangeListener("maximum", this);
189
         addPropertyChangeListener("maximum", this);

+ 2
- 2
src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java Vedi File

29
 import com.dmdirc.config.IdentityManager;
29
 import com.dmdirc.config.IdentityManager;
30
 import com.dmdirc.config.prefs.validator.PortValidator;
30
 import com.dmdirc.config.prefs.validator.PortValidator;
31
 import com.dmdirc.config.prefs.validator.RegexStringValidator;
31
 import com.dmdirc.config.prefs.validator.RegexStringValidator;
32
-import com.dmdirc.addons.ui_swing.MainFrame;
32
+import com.dmdirc.addons.ui_swing.SwingController;
33
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
33
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
34
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
34
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
35
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
35
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
109
     public static void showNewServerDialog(final Window parentWindow) {
109
     public static void showNewServerDialog(final Window parentWindow) {
110
         me = getNewServerDialog(parentWindow);
110
         me = getNewServerDialog(parentWindow);
111
 
111
 
112
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
112
+        me.setLocationRelativeTo(SwingController.getMainFrame());
113
         me.setVisible(true);
113
         me.setVisible(true);
114
         me.requestFocusInWindow();
114
         me.requestFocusInWindow();
115
     }
115
     }

+ 3
- 4
src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.about;
23
 package com.dmdirc.addons.ui_swing.dialogs.about;
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.components.StandardDialog;
26
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
28
 
27
 
29
 import java.awt.event.ActionEvent;
28
 import java.awt.event.ActionEvent;
60
 
59
 
61
     /** Creates a new instance of AboutDialog. */
60
     /** Creates a new instance of AboutDialog. */
62
     private AboutDialog() {
61
     private AboutDialog() {
63
-        super((MainFrame) Main.getUI().getMainWindow(), false);
62
+        super(SwingController.getMainFrame(), false);
64
         initComponents();
63
         initComponents();
65
     }
64
     }
66
 
65
 
68
     public static void showAboutDialog() {
67
     public static void showAboutDialog() {
69
         me = getAboutDialog();
68
         me = getAboutDialog();
70
 
69
 
71
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
70
+        me.setLocationRelativeTo(SwingController.getMainFrame());
72
         me.setVisible(true);
71
         me.setVisible(true);
73
         me.requestFocusInWindow();
72
         me.requestFocusInWindow();
74
     }
73
     }

+ 3
- 4
src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java Vedi File

25
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
25
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
26
 import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
26
 import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
27
 import com.dmdirc.actions.wrappers.Alias;
27
 import com.dmdirc.actions.wrappers.Alias;
28
-import com.dmdirc.Main;
29
 import com.dmdirc.actions.Action;
28
 import com.dmdirc.actions.Action;
30
 import com.dmdirc.actions.ActionCondition;
29
 import com.dmdirc.actions.ActionCondition;
31
 import com.dmdirc.actions.ActionManager;
30
 import com.dmdirc.actions.ActionManager;
32
 import com.dmdirc.actions.CoreActionComparison;
31
 import com.dmdirc.actions.CoreActionComparison;
33
 import com.dmdirc.actions.wrappers.AliasWrapper;
32
 import com.dmdirc.actions.wrappers.AliasWrapper;
34
-import com.dmdirc.addons.ui_swing.MainFrame;
33
+import com.dmdirc.addons.ui_swing.SwingController;
35
 import com.dmdirc.addons.ui_swing.components.PackingTable;
34
 import com.dmdirc.addons.ui_swing.components.PackingTable;
36
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
35
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
37
 
36
 
91
 
90
 
92
     /** Creates a new instance of ErrorListDialog. */
91
     /** Creates a new instance of ErrorListDialog. */
93
     private AliasManagerDialog() {
92
     private AliasManagerDialog() {
94
-        super((MainFrame) Main.getUI().getMainWindow(), false);
93
+        super(SwingController.getMainFrame(), false);
95
 
94
 
96
         setTitle("DMDirc: Alias manager");
95
         setTitle("DMDirc: Alias manager");
97
 
96
 
108
     public static void showAliasManagerDialog() {
107
     public static void showAliasManagerDialog() {
109
         me = getAliasManagerDialog();
108
         me = getAliasManagerDialog();
110
 
109
 
111
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
110
+        me.setLocationRelativeTo(SwingController.getMainFrame());
112
         me.setVisible(true);
111
         me.setVisible(true);
113
         me.requestFocusInWindow();
112
         me.requestFocusInWindow();
114
     }
113
     }

+ 3
- 4
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java Vedi File

23
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
23
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
24
 
24
 
25
 import com.dmdirc.Channel;
25
 import com.dmdirc.Channel;
26
-import com.dmdirc.Main;
27
 import com.dmdirc.config.Identity;
26
 import com.dmdirc.config.Identity;
28
 import com.dmdirc.config.IdentityManager;
27
 import com.dmdirc.config.IdentityManager;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
28
+import com.dmdirc.addons.ui_swing.SwingController;
30
 import com.dmdirc.addons.ui_swing.UIUtilities;
29
 import com.dmdirc.addons.ui_swing.UIUtilities;
31
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
30
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
32
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
31
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
84
      * @param newChannel The channel object that we're editing settings for
83
      * @param newChannel The channel object that we're editing settings for
85
      */
84
      */
86
     private ChannelSettingsDialog(final Channel newChannel) {
85
     private ChannelSettingsDialog(final Channel newChannel) {
87
-        super((MainFrame) Main.getUI().getMainWindow(), false);
86
+        super(SwingController.getMainFrame(), false);
88
 
87
 
89
         channel = newChannel;
88
         channel = newChannel;
90
         identity = IdentityManager.getChannelConfig(channel.getServer().
89
         identity = IdentityManager.getChannelConfig(channel.getServer().
103
         me = getChannelSettingsDialog(channel);
102
         me = getChannelSettingsDialog(channel);
104
 
103
 
105
         me.pack();
104
         me.pack();
106
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
105
+        me.setLocationRelativeTo(SwingController.getMainFrame());
107
         me.setVisible(true);
106
         me.setVisible(true);
108
         me.requestFocusInWindow();
107
         me.requestFocusInWindow();
109
     }
108
     }

+ 3
- 4
src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java Vedi File

24
 
24
 
25
 import com.dmdirc.addons.ui_swing.components.renderers.ErrorLevelIconCellRenderer;
25
 import com.dmdirc.addons.ui_swing.components.renderers.ErrorLevelIconCellRenderer;
26
 import com.dmdirc.addons.ui_swing.components.renderers.DateCellRenderer;
26
 import com.dmdirc.addons.ui_swing.components.renderers.DateCellRenderer;
27
-import com.dmdirc.Main;
28
 import com.dmdirc.logger.ErrorListener;
27
 import com.dmdirc.logger.ErrorListener;
29
 import com.dmdirc.logger.ErrorManager;
28
 import com.dmdirc.logger.ErrorManager;
30
 import com.dmdirc.logger.ErrorReportStatus;
29
 import com.dmdirc.logger.ErrorReportStatus;
31
 import com.dmdirc.logger.ProgramError;
30
 import com.dmdirc.logger.ProgramError;
32
-import com.dmdirc.addons.ui_swing.MainFrame;
31
+import com.dmdirc.addons.ui_swing.SwingController;
33
 import com.dmdirc.addons.ui_swing.components.PackingTable;
32
 import com.dmdirc.addons.ui_swing.components.PackingTable;
34
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
33
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
35
 
34
 
86
 
85
 
87
     /** Creates a new instance of ErrorListDialog. */
86
     /** Creates a new instance of ErrorListDialog. */
88
     private ErrorListDialog() {
87
     private ErrorListDialog() {
89
-        super((MainFrame) Main.getUI().getMainWindow(), false);
88
+        super(SwingController.getMainFrame(), false);
90
 
89
 
91
         setTitle("DMDirc: Error list");
90
         setTitle("DMDirc: Error list");
92
 
91
 
388
     /** {@inheritDoc} */
387
     /** {@inheritDoc} */
389
     @Override
388
     @Override
390
     public boolean isReady() {
389
     public boolean isReady() {
391
-        return Main.getUI().getStatusBar().isVisible();
390
+        return SwingController.getSwingStatusBar().isVisible();
392
     }
391
     }
393
     
392
     
394
     /** {@inheritDoc} */
393
     /** {@inheritDoc} */

+ 4
- 5
src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.paste;
23
 package com.dmdirc.addons.ui_swing.dialogs.paste;
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.addons.ui_swing.components.InputTextFrame;
27
 import com.dmdirc.addons.ui_swing.components.InputTextFrame;
29
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
28
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
78
      * @param text text to show in the paste dialog
77
      * @param text text to show in the paste dialog
79
      */
78
      */
80
     public PasteDialog(final InputTextFrame newParent, final String text) {
79
     public PasteDialog(final InputTextFrame newParent, final String text) {
81
-        super((MainFrame) Main.getUI().getMainWindow(), false);
80
+        super(SwingController.getMainFrame(), false);
82
 
81
 
83
         this.parent = newParent;
82
         this.parent = newParent;
84
 
83
 
93
         getOkButton().setSelected(true);
92
         getOkButton().setSelected(true);
94
 
93
 
95
         pack();
94
         pack();
96
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
95
+        setLocationRelativeTo(SwingController.getMainFrame());
97
     }
96
     }
98
 
97
 
99
     /**
98
     /**
231
 
230
 
232
                 @Override
231
                 @Override
233
                 public void run() {
232
                 public void run() {
234
-                    setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
233
+                    setLocationRelativeTo(SwingController.getMainFrame());
235
                 }
234
                 }
236
             });
235
             });
237
         } else if (getCancelButton().equals(actionEvent.getSource())) {
236
         } else if (getCancelButton().equals(actionEvent.getSource())) {

+ 3
- 5
src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
23
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
24
 
24
 
25
-import com.dmdirc.Main;
26
 import com.dmdirc.config.prefs.PreferencesCategory;
25
 import com.dmdirc.config.prefs.PreferencesCategory;
27
 import com.dmdirc.config.prefs.PreferencesManager;
26
 import com.dmdirc.config.prefs.PreferencesManager;
28
 import com.dmdirc.config.prefs.PreferencesSetting;
27
 import com.dmdirc.config.prefs.PreferencesSetting;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
30
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
28
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
29
+import com.dmdirc.addons.ui_swing.SwingController;
31
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
30
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
32
 import com.dmdirc.addons.ui_swing.components.ListScroller;
31
 import com.dmdirc.addons.ui_swing.components.ListScroller;
33
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
32
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
131
      * Creates a new instance of SwingPreferencesDialog.
130
      * Creates a new instance of SwingPreferencesDialog.
132
      */
131
      */
133
     private SwingPreferencesDialog() {
132
     private SwingPreferencesDialog() {
134
-        super((MainFrame) Main.getUI().getMainWindow(), false);
133
+        super(SwingController.getMainFrame(), false);
135
 
134
 
136
         categories = new HashMap<PreferencesCategory, JPanel>();
135
         categories = new HashMap<PreferencesCategory, JPanel>();
137
         components = new HashMap<PreferencesSetting, JComponent>();
136
         components = new HashMap<PreferencesSetting, JComponent>();
504
         }
503
         }
505
 
504
 
506
         if (restart) {
505
         if (restart) {
507
-            JOptionPane.showMessageDialog((MainFrame) Main.getUI().
508
-                    getMainWindow(),
506
+            JOptionPane.showMessageDialog(SwingController.getMainFrame(),
509
                                           "One or more of the changes you made " +
507
                                           "One or more of the changes you made " +
510
                                           "won't take effect until you restart the client.",
508
                                           "won't take effect until you restart the client.",
511
                                           "Restart needed",
509
                                           "Restart needed",

+ 2
- 3
src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java Vedi File

24
 
24
 
25
 import com.dmdirc.addons.ui_swing.components.renderers.URISchemeCellRenderer;
25
 import com.dmdirc.addons.ui_swing.components.renderers.URISchemeCellRenderer;
26
 import com.dmdirc.addons.ui_swing.components.renderers.URIHandlerCellRenderer;
26
 import com.dmdirc.addons.ui_swing.components.renderers.URIHandlerCellRenderer;
27
-import com.dmdirc.Main;
28
 import com.dmdirc.config.IdentityManager;
27
 import com.dmdirc.config.IdentityManager;
29
 import com.dmdirc.config.prefs.PreferencesInterface;
28
 import com.dmdirc.config.prefs.PreferencesInterface;
30
 import com.dmdirc.config.prefs.validator.URLProtocolValidator;
29
 import com.dmdirc.config.prefs.validator.URLProtocolValidator;
31
-import com.dmdirc.addons.ui_swing.MainFrame;
30
+import com.dmdirc.addons.ui_swing.SwingController;
32
 import com.dmdirc.addons.ui_swing.components.PackingTable;
31
 import com.dmdirc.addons.ui_swing.components.PackingTable;
33
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
32
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
34
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
33
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
253
     @Override
252
     @Override
254
     public void actionPerformed(final ActionEvent e) {
253
     public void actionPerformed(final ActionEvent e) {
255
         if (e.getSource() == add) {
254
         if (e.getSource() == add) {
256
-            new StandardInputDialog((MainFrame) Main.getUI().getMainWindow(),
255
+            new StandardInputDialog(SwingController.getMainFrame(),
257
                     false, "DMDIRC: New URL handler",
256
                     false, "DMDIRC: New URL handler",
258
                     "Please enter the name of the new protocol.",
257
                     "Please enter the name of the new protocol.",
259
                     new URLProtocolValidator()) {
258
                     new URLProtocolValidator()) {

+ 2
- 4
src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
23
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
24
 
24
 
25
-import com.dmdirc.Main;
26
 import com.dmdirc.config.Identity;
25
 import com.dmdirc.config.Identity;
27
 import com.dmdirc.config.IdentityManager;
26
 import com.dmdirc.config.IdentityManager;
28
-import com.dmdirc.addons.ui_swing.MainFrame;
29
 import com.dmdirc.addons.ui_swing.SwingController;
27
 import com.dmdirc.addons.ui_swing.SwingController;
30
 import com.dmdirc.addons.ui_swing.components.ListScroller;
28
 import com.dmdirc.addons.ui_swing.components.ListScroller;
31
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
29
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
113
         me = getProfileManagerDialog(SwingController.getMainFrame());
111
         me = getProfileManagerDialog(SwingController.getMainFrame());
114
 
112
 
115
         me.pack();
113
         me.pack();
116
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
114
+        me.setLocationRelativeTo(SwingController.getMainFrame());
117
         me.setVisible(true);
115
         me.setVisible(true);
118
         me.requestFocusInWindow();
116
         me.requestFocusInWindow();
119
     }
117
     }
127
         me = getProfileManagerDialog(parentWindow);
125
         me = getProfileManagerDialog(parentWindow);
128
 
126
 
129
         me.pack();
127
         me.pack();
130
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
128
+        me.setLocationRelativeTo(SwingController.getMainFrame());
131
         me.setVisible(true);
129
         me.setVisible(true);
132
         me.requestFocusInWindow();
130
         me.requestFocusInWindow();
133
     }
131
     }

+ 2
- 3
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java Vedi File

23
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
23
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
24
 
24
 
25
 import com.dmdirc.IgnoreList;
25
 import com.dmdirc.IgnoreList;
26
-import com.dmdirc.Main;
27
 import com.dmdirc.Server;
26
 import com.dmdirc.Server;
28
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
27
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
29
 import com.dmdirc.config.prefs.validator.RegexValidator;
28
 import com.dmdirc.config.prefs.validator.RegexValidator;
30
 import com.dmdirc.config.prefs.validator.ValidatorChain;
29
 import com.dmdirc.config.prefs.validator.ValidatorChain;
31
-import com.dmdirc.addons.ui_swing.MainFrame;
30
+import com.dmdirc.addons.ui_swing.SwingController;
32
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
31
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
33
 import com.dmdirc.addons.ui_swing.UIUtilities;
32
 import com.dmdirc.addons.ui_swing.UIUtilities;
34
 
33
 
175
     @SuppressWarnings("unchecked")
174
     @SuppressWarnings("unchecked")
176
     public void actionPerformed(final ActionEvent e) {
175
     public void actionPerformed(final ActionEvent e) {
177
         if (e.getSource() == addButton) {
176
         if (e.getSource() == addButton) {
178
-            new StandardInputDialog((MainFrame) Main.getUI().getMainWindow(),
177
+            new StandardInputDialog(SwingController.getMainFrame(),
179
                     false, "New ignore list entry",
178
                     false, "New ignore list entry",
180
                     "Please enter the new ignore list entry",
179
                     "Please enter the new ignore list entry",
181
                     viewToggle.isSelected() ? new ValidatorChain<String>(
180
                     viewToggle.isSelected() ? new ValidatorChain<String>(

+ 3
- 4
src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
23
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
24
 
24
 
25
-import com.dmdirc.Main;
26
 import com.dmdirc.Server;
25
 import com.dmdirc.Server;
27
 import com.dmdirc.config.Identity;
26
 import com.dmdirc.config.Identity;
28
-import com.dmdirc.addons.ui_swing.MainFrame;
27
+import com.dmdirc.addons.ui_swing.SwingController;
29
 import com.dmdirc.addons.ui_swing.UIUtilities;
28
 import com.dmdirc.addons.ui_swing.UIUtilities;
30
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
29
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
31
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
30
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
72
      * @param server The server object that we're editing settings for
71
      * @param server The server object that we're editing settings for
73
      */
72
      */
74
     private ServerSettingsDialog(final Server server) {
73
     private ServerSettingsDialog(final Server server) {
75
-        super((MainFrame) Main.getUI().getMainWindow(), false);
74
+        super(SwingController.getMainFrame(), false);
76
 
75
 
77
         this.server = server;
76
         this.server = server;
78
 
77
 
92
         me = getServerSettingsDialog(server);
91
         me = getServerSettingsDialog(server);
93
         
92
         
94
         me.pack();
93
         me.pack();
95
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
94
+        me.setLocationRelativeTo(SwingController.getMainFrame());
96
         me.setVisible(true);
95
         me.setVisible(true);
97
         me.requestFocusInWindow();
96
         me.requestFocusInWindow();
98
     }
97
     }

+ 3
- 4
src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.updater;
23
 package com.dmdirc.addons.ui_swing.dialogs.updater;
24
 
24
 
25
-import com.dmdirc.Main;
26
 import com.dmdirc.interfaces.UpdateCheckerListener;
25
 import com.dmdirc.interfaces.UpdateCheckerListener;
27
 import com.dmdirc.ui.interfaces.UpdaterDialog;
26
 import com.dmdirc.ui.interfaces.UpdaterDialog;
28
 import com.dmdirc.addons.ui_swing.components.TextLabel;
27
 import com.dmdirc.addons.ui_swing.components.TextLabel;
29
-import com.dmdirc.addons.ui_swing.MainFrame;
28
+import com.dmdirc.addons.ui_swing.SwingController;
30
 import com.dmdirc.addons.ui_swing.components.PackingTable;
29
 import com.dmdirc.addons.ui_swing.components.PackingTable;
31
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
30
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
32
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;
31
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;
81
      * @param updates A list of updates that are available.
80
      * @param updates A list of updates that are available.
82
      */
81
      */
83
     private SwingUpdaterDialog(final List<Update> updates) {
82
     private SwingUpdaterDialog(final List<Update> updates) {
84
-        super((MainFrame) Main.getUI().getMainWindow(), false);
83
+        super(SwingController.getMainFrame(), false);
85
 
84
 
86
         initComponents(updates);
85
         initComponents(updates);
87
         layoutComponents();
86
         layoutComponents();
188
     /** {@inheritDoc} */
187
     /** {@inheritDoc} */
189
     @Override
188
     @Override
190
     public void display() {
189
     public void display() {
191
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
190
+        setLocationRelativeTo(SwingController.getMainFrame());
192
         setVisible(true);
191
         setVisible(true);
193
         requestFocusInWindow();
192
         requestFocusInWindow();
194
     }
193
     }

+ 4
- 5
src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java Vedi File

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.url;
23
 package com.dmdirc.addons.ui_swing.dialogs.url;
24
 
24
 
25
-import com.dmdirc.Main;
26
 import com.dmdirc.addons.ui_swing.components.TextLabel;
25
 import com.dmdirc.addons.ui_swing.components.TextLabel;
27
-import com.dmdirc.addons.ui_swing.MainFrame;
26
+import com.dmdirc.addons.ui_swing.SwingController;
28
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
27
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
29
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
28
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
30
 import com.dmdirc.util.URLHandler;
29
 import com.dmdirc.util.URLHandler;
61
      * @param url URL to open once added
60
      * @param url URL to open once added
62
      */
61
      */
63
     private URLDialog(final URI url) {
62
     private URLDialog(final URI url) {
64
-        super((MainFrame) Main.getUI().getMainWindow(), false);
63
+        super(SwingController.getMainFrame(), false);
65
 
64
 
66
         this.url = url;
65
         this.url = url;
67
 
66
 
82
     public static void showURLDialog(final URI url) {
81
     public static void showURLDialog(final URI url) {
83
         me = getURLDialog(url);
82
         me = getURLDialog(url);
84
 
83
 
85
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
84
+        me.setLocationRelativeTo(SwingController.getMainFrame());
86
         me.setVisible(true);
85
         me.setVisible(true);
87
         me.requestFocusInWindow();
86
         me.requestFocusInWindow();
88
     }
87
     }
150
     public void validate() {
149
     public void validate() {
151
         super.validate();
150
         super.validate();
152
 
151
 
153
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
152
+        setLocationRelativeTo(SwingController.getMainFrame());
154
     }
153
     }
155
 
154
 
156
     /** {@inheritDoc} */
155
     /** {@inheritDoc} */

Loading…
Annulla
Salva