瀏覽代碼

Remove deprecated StandardDialog ctors.

Change-Id: I2d37f4e0be3d4c8f0a867ad9a0a516dc3193a2a7
Reviewed-on: http://gerrit.dmdirc.com/3020
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.8
Chris Smith 10 年之前
父節點
當前提交
f62fcfc285

+ 1
- 1
src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java 查看文件

@@ -79,7 +79,7 @@ public class NickColourInputDialog extends StandardDialog
79 79
             final NickColourPanel panel, final int row,
80 80
             final String nickname, final String network,
81 81
             final String textcolour, final String nickcolour) {
82
-        super(swingController, false);
82
+        super(swingController.getDialogManager(), swingController.getMainFrame(), false);
83 83
 
84 84
         this.panel = panel;
85 85
         this.row = row;

+ 1
- 1
src/com/dmdirc/addons/serverlistdialog/AddEntryInputDialog.java 查看文件

@@ -84,7 +84,7 @@ public class AddEntryInputDialog extends StandardDialog {
84 84
     public AddEntryInputDialog(final SwingController controller,
85 85
             final Window owner, final JTree items,
86 86
             final ServerListModel model) {
87
-        super(controller, owner, ModalityType.MODELESS);
87
+        super(controller.getDialogManager(), owner, ModalityType.MODELESS);
88 88
 
89 89
         this.items = items;
90 90
         this.model = model;

+ 1
- 1
src/com/dmdirc/addons/serverlistdialog/AddGroupInputDialog.java 查看文件

@@ -81,7 +81,7 @@ public class AddGroupInputDialog extends StandardDialog {
81 81
     public AddGroupInputDialog(final SwingController controller,
82 82
             final Window owner, final JTree items,
83 83
             final ServerListModel model) {
84
-        super(controller, owner, ModalityType.MODELESS);
84
+        super(controller.getDialogManager(), owner, ModalityType.MODELESS);
85 85
 
86 86
         this.tree = items;
87 87
         this.serverListModel = model;

+ 1
- 1
src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java 查看文件

@@ -83,7 +83,7 @@ public class ServerListDialog extends StandardDialog implements
83 83
             final SwingController controller,
84 84
             final URLHandler urlHandler,
85 85
             final PerformWrapper performWrapper) {
86
-        super(controller, controller.getMainFrame(), ModalityType.MODELESS);
86
+        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
87 87
 
88 88
         setTitle("Server List");
89 89
         model = new ServerListModel(controller.getPluginManager(),

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallerWindow.java 查看文件

@@ -63,7 +63,7 @@ public class InstallerWindow extends StandardDialog implements ActionListener {
63 63
      */
64 64
     public InstallerWindow(final SwingController controller,
65 65
             final BrowserWindow parentWindow, final AddonInfo info) {
66
-        super(controller, parentWindow, ModalityType.MODELESS);
66
+        super(controller.getDialogManager(), parentWindow, ModalityType.MODELESS);
67 67
         this.info = info;
68 68
         this.parentWindow = parentWindow;
69 69
         setTitle("Installing addon...");

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java 查看文件

@@ -119,7 +119,7 @@ public class DurationEditor extends StandardDialog implements ActionListener {
119 119
      */
120 120
     public DurationEditor(final SwingController controller,
121 121
             final Window window, final long duration) {
122
-        super(controller, window, ModalityType.MODELESS);
122
+        super(controller.getDialogManager(), window, ModalityType.MODELESS);
123 123
 
124 124
         this.window = window;
125 125
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPopupWindow.java 查看文件

@@ -62,7 +62,7 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
62 62
      */
63 63
     public StatusbarPopupWindow(final SwingController controller,
64 64
             final JPanel parent, final Window parentWindow) {
65
-        super(controller, parentWindow, ModalityType.MODELESS);
65
+        super(controller.getDialogManager(), parentWindow, ModalityType.MODELESS);
66 66
 
67 67
         this.parent = parent;
68 68
         this.parentWindow = parentWindow;

+ 0
- 23
src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java 查看文件

@@ -22,7 +22,6 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs;
24 24
 
25
-import com.dmdirc.addons.ui_swing.SwingController;
26 25
 import com.dmdirc.ui.CoreUIUtils;
27 26
 
28 27
 import java.awt.Component;
@@ -54,28 +53,6 @@ public class StandardDialog extends JDialog {
54 53
     /** The cancel button for this frame. */
55 54
     private JButton cancelButton;
56 55
 
57
-    @Deprecated
58
-    public StandardDialog(final SwingController controller, final boolean modal) {
59
-        this(controller.getDialogManager(), controller.getMainFrame(), modal);
60
-    }
61
-
62
-    @Deprecated
63
-    public StandardDialog(final SwingController controller, final ModalityType modal) {
64
-        this(controller.getDialogManager(), controller.getMainFrame(), modal);
65
-    }
66
-
67
-    @Deprecated
68
-    public StandardDialog(final SwingController controller, final Window parentWindow,
69
-            final ModalityType modal) {
70
-        this(controller.getDialogManager(), parentWindow, modal);
71
-    }
72
-
73
-    @Deprecated
74
-    public StandardDialog(final SwingController controller, final Frame parentWindow,
75
-            final boolean modal) {
76
-        this(controller.getDialogManager(), parentWindow, modal);
77
-    }
78
-
79 56
     /**
80 57
      * Creates a new instance of StandardDialog.
81 58
      *

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/StandardMessageDialog.java 查看文件

@@ -59,7 +59,7 @@ public class StandardMessageDialog extends StandardDialog {
59 59
     public StandardMessageDialog(final SwingController controller,
60 60
             final Window owner, final ModalityType modal, final String title,
61 61
             final String message) {
62
-        super(controller, owner, modal);
62
+        super(controller.getDialogManager(), owner, modal);
63 63
 
64 64
         this.message = message;
65 65
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java 查看文件

@@ -47,7 +47,7 @@ public class ChannelListDialog extends StandardDialog implements
47 47
     private JLabel total;
48 48
 
49 49
     public ChannelListDialog(final SwingController controller) {
50
-        super(controller, ModalityType.MODELESS);
50
+        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
51 51
         setTitle("Channel List");
52 52
         total = new JLabel("No results.");
53 53
         list = new ChannelListPanel((Server) controller.getMainFrame().getActiveFrame()

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java 查看文件

@@ -79,7 +79,7 @@ public final class ErrorListDialog extends StandardDialog implements
79 79
      * @param controller Swing controller
80 80
      */
81 81
     public ErrorListDialog(final SwingController controller) {
82
-        super(controller, ModalityType.MODELESS);
82
+        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
83 83
 
84 84
         setTitle("Error list");
85 85
         setMinimumSize(new Dimension(600, 550));

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java 查看文件

@@ -81,7 +81,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
81 81
     public PasteDialog(final SwingController controller,
82 82
             final InputTextFrame newParent, final String text,
83 83
             final Window parentWindow) {
84
-        super(controller, parentWindow, ModalityType.MODELESS);
84
+        super(controller.getDialogManager(), parentWindow, ModalityType.MODELESS);
85 85
 
86 86
         parent = newParent;
87 87
         this.parentWindow = parentWindow;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java 查看文件

@@ -83,7 +83,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
83 83
      * @param controller The controller which owns this preferences window.
84 84
      */
85 85
     public SwingPreferencesDialog(final SwingController controller) {
86
-        super(controller, ModalityType.MODELESS);
86
+        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
87 87
 
88 88
         this.controller = controller;
89 89
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java 查看文件

@@ -128,7 +128,7 @@ public class ProfileManagerDialog extends StandardDialog {
128 128
      * @param controller Swing controller
129 129
      */
130 130
     public ProfileManagerDialog(final SwingController controller) {
131
-        super(controller, ModalityType.MODELESS);
131
+        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
132 132
         this.model = new ProfileManagerModel(controller.getIdentityManager(), controller.getIdentityFactory());
133 133
         this.controller = new ProfileManagerController(this, model, controller.getIdentityFactory());
134 134
         final Bindings bindings = SwingUIBindings.extendedBindings();

Loading…
取消
儲存