Adds standardquestiondialog; moves dialogs to dialogs package; fixes issue 2755

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
 
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/components/ColourPickerDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.SwingController;
 
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/components/MenuBar.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
 import com.dmdirc.ui.interfaces.Window;

src/com/dmdirc/addons/ui_swing/components/StandardDialog.java

@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.components;
-
-import com.dmdirc.ui.CoreUIUtils;
-
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JRootPane;
-import javax.swing.KeyStroke;
-
-/**
- * Provides common methods for dialogs.
- */
-public class StandardDialog extends JDialog {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    /**
-     * The OK button for this frame.
-     */
-    private JButton okButton;
-    /**
-     * The cancel button for this frame.
-     */
-    private JButton cancelButton;
-
-    /**
-     * Creates a new instance of StandardDialog.
-     * @param owner The frame that owns this dialog
-     * @param modal Whether to display modally or not
-     */
-    public StandardDialog(final Frame owner, final boolean modal) {
-        super(owner, modal);
-        
-        if (owner != null) {
-            setIconImages(owner.getIconImages());
-        }
-    }
-
-    /**
-     * Creates a new instance of StandardDialog.
-     * @param owner The frame that owns this dialog
-     * @param modal Whether to display modally or not
-     */
-    public StandardDialog(final Window owner, final ModalityType modal) {
-        super(owner, modal);
-        
-        if (owner != null) {
-            setIconImages(owner.getIconImages());
-        }
-    }
-
-    /**
-     * Creates a new instance of StandardDialog.
-     * @param owner The frame that owns this dialog
-     * @param modal Whether to display modally or not
-     */
-    public StandardDialog(final Dialog owner, final boolean modal) {
-        super(owner, modal);
-        
-        if (owner != null) {
-            setIconImages(owner.getIconImages());
-        }
-    }
-
-    /**
-     * Centers and displays this dialog.
-     */
-    public void display() {
-        CoreUIUtils.centreWindow(this);
-        setVisible(true);
-    }
-
-    /**
-     * Sets the specified button up as the OK button.
-     * @param button The target button
-     */
-    protected void setOkButton(final JButton button) {
-        okButton = button;
-        button.setText("OK");
-        button.setDefaultCapable(false);
-    }
-
-    /**
-     * Sets the specified button up as the Cancel button.
-     * @param button The target button
-     */
-    protected void setCancelButton(final JButton button) {
-        cancelButton = button;
-        button.setText("Cancel");
-        button.setDefaultCapable(false);
-    }
-
-    /**
-     * Gets the left hand button for a dialog.
-     * @return left JButton
-     */
-    protected final JButton getLeftButton() {
-        if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
-            return getOkButton();
-        } else {
-            return getCancelButton();
-        }
-    }
-
-    /**
-     * Gets the right hand button for a dialog.
-     * @return right JButton
-     */
-    protected final JButton getRightButton() {
-        if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
-            return getCancelButton();
-        } else {
-            return getOkButton();
-        }
-    }
-
-    /**
-     * Orders the OK and Cancel buttons in an appropriate order for the current
-     * operating system.
-     * @param leftButton The left-most button
-     * @param rightButton The right-most button
-     */
-    protected final void orderButtons(final JButton leftButton,
-            final JButton rightButton) {
-        if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
-            // Windows - put the OK button on the left
-            setOkButton(leftButton);
-            setCancelButton(rightButton);
-        } else {
-            // Everything else - adhere to usability guidelines and put it on
-            // the right.
-            setOkButton(rightButton);
-            setCancelButton(leftButton);
-        }
-        leftButton.setPreferredSize(new Dimension(100, 25));
-        rightButton.setPreferredSize(new Dimension(100, 25));
-        leftButton.setMinimumSize(new Dimension(100, 25));
-        rightButton.setMinimumSize(new Dimension(100, 25));
-    }
-
-    /**
-     * Creates the root pane of this dialog. We hook in two keylisteners
-     * to send enter/escape events to our buttons.
-     * @return The new root pane
-     */
-    @Override
-    protected final JRootPane createRootPane() {
-        final ActionListener escapeListener = new ActionListener() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(final ActionEvent actionEvent) {
-                executeAction(StandardDialog.this.cancelButton);
-            }
-        };
-
-        final ActionListener enterListener = new ActionListener() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(final ActionEvent actionEvent) {
-                if (StandardDialog.this.getFocusOwner() instanceof JButton) {
-                    executeAction((JButton) StandardDialog.this.getFocusOwner());
-                } else {
-                    executeAction(StandardDialog.this.okButton);
-                }
-            }
-        };
-
-        final KeyStroke escape = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
-        final KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,
-                InputEvent.CTRL_DOWN_MASK);
-
-        final JRootPane customRootPane = new JRootPane();
-
-        customRootPane.registerKeyboardAction(escapeListener, escape,
-                JComponent.WHEN_IN_FOCUSED_WINDOW);
-        customRootPane.registerKeyboardAction(enterListener, enter,
-                JComponent.WHEN_IN_FOCUSED_WINDOW);
-
-        return customRootPane;
-    }
-
-    /**
-     * Retrieves the OK button for this form.
-     * @return The form's OK button
-     */
-    public final JButton getOkButton() {
-        return okButton;
-    }
-
-    /**
-     * Retrieves the Cancel button for this form.
-     * @return The form's cancel button
-     */
-    public final JButton getCancelButton() {
-        return cancelButton;
-    }
-
-    /**
-     * Simulates the user clicking on the specified target button.
-     * @param target The button to use
-     */
-    protected final void executeAction(final JButton target) {
-        if (target != null) {
-            target.doClick();
-        }
-    }
-}

src/com/dmdirc/addons/ui_swing/components/StandardInputDialog.java

@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing.components;
-
-import com.dmdirc.config.prefs.validator.ValidationResponse;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.config.prefs.validator.Validator;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-
-import java.awt.Component;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.KeyStroke;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Standard input dialog.
- */
-public abstract class StandardInputDialog extends StandardDialog {
-
-    /** Validator. */
-    private Validator<String> validator;
-    /** Text field. */
-    private ValidatingJTextField textField;
-    /** Blurb label. */
-    private TextLabel blurb;
-    /** Message. */
-    private String message;
-
-    /**
-     * Instantiates a new standard input dialog.
-     * 
-     * @param owner Dialog owner
-     * @param modal modality type
-     * @param title Dialog title
-     * @param message Dialog message
-     */
-    public StandardInputDialog(Window owner, ModalityType modal,
-            final String title,
-            final String message) {
-        this(owner, modal, title, message, new Validator<String>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public ValidationResponse validate(final String object) {
-                return new ValidationResponse();
-            }
-        });
-    }
-
-    /**
-     * Instantiates a new standard input dialog.
-     * 
-     * @param owner Dialog owner
-     * @param modal modality type
-     * @param validator Textfield validator
-     * @param title Dialog title
-     * @param message Dialog message
-     */
-    public StandardInputDialog(Window owner, ModalityType modal,
-            final String title, final String message,
-            final Validator<String> validator) {
-        super(owner, modal);
-
-        this.validator = validator;
-        this.message = message;
-
-        setTitle(title);
-        setDefaultCloseOperation(StandardInputDialog.DISPOSE_ON_CLOSE);
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Called when the dialog's OK button is clicked.
-     * 
-     * @return whether the dialog can close
-     */
-    public abstract boolean save();
-
-    /**
-     * Called when the dialog's cancel button is clicked, or otherwise closed.
-     */
-    public abstract void cancelled();
-
-    /**
-     * Initialises the components.
-     */
-    private final void initComponents() {
-        orderButtons(new JButton(), new JButton());
-        textField = new ValidatingJTextField(validator);
-        blurb = new TextLabel(message);
-        validateText();
-    }
-
-    /**
-     * Adds the listeners
-     */
-    private final void addListeners() {
-        getOkButton().addActionListener(new ActionListener() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (save()) {
-                    dispose();
-                }
-            }
-        });
-        getCancelButton().addActionListener(new ActionListener() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                cancelled();
-                dispose();
-            }
-        });
-        addWindowListener(new WindowAdapter() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void windowOpened(WindowEvent e) {
-                textField.requestFocusInWindow();
-            }
-
-            /** {@inheritDoc} */
-            @Override
-            public void windowClosed(WindowEvent e) {
-                cancelled();
-            //dispose();
-            }
-        });
-        textField.getDocument().addDocumentListener(new DocumentListener() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void insertUpdate(DocumentEvent e) {
-                validateText();
-            }
-
-            /** {@inheritDoc} */
-            @Override
-            public void removeUpdate(DocumentEvent e) {
-                validateText();
-            }
-
-            /** {@inheritDoc} */
-            @Override
-            public void changedUpdate(DocumentEvent e) {
-            //Ignore
-            }
-        });
-
-        final ActionListener enterListener = new ActionListener() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(final ActionEvent actionEvent) {
-                getOkButton().doClick();
-            }
-        };
-        final KeyStroke enter = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0);
-        getRootPane().registerKeyboardAction(enterListener, enter,
-                JComponent.WHEN_IN_FOCUSED_WINDOW);
-    }
-
-    /**
-     * Validates the change.
-     */
-    private void validateText() {
-        getOkButton().setEnabled(!validator.validate(getText()).isFailure());
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private final void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 1"));
-
-        add(blurb, "growx");
-        add(textField, "growx");
-        add(getLeftButton(), "split 2, right");
-        add(getRightButton(), "right");
-    }
-
-    /**
-     * Displays the input dialog.
-     */
-    @Override
-    public final void display() {
-        display(getParent());
-    }
-
-    /**
-     * Displays the input dialog.
-     * 
-     * @param parent Parent component
-     */
-    public final void display(final Component parent) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                pack();
-                setLocationRelativeTo(parent);
-                setVisible(true);
-            }
-        });
-    }
-
-    /**
-     * Returns the text in the input field.
-     * 
-     * @return Input text
-     */
-    public final String getText() {
-        return textField.getText();
-    }
-
-    /**
-     * Sets the dialogs text to the specified text.
-     * 
-     * @param text New test
-     */
-    public final void setText(final String text) {
-        textField.setText(text);
-    }
-}

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPopupWindow.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.Component;
 import java.awt.Graphics;

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -29,7 +29,6 @@ import com.dmdirc.ui.core.util.Info;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.Downloader;

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -30,7 +30,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.validator.PortValidator;
 import com.dmdirc.config.prefs.validator.RegexStringValidator;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.Action;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.Dimension;
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -34,8 +34,8 @@ import com.dmdirc.config.prefs.validator.ValidatorChain;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.SortedListModel;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
-import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionGroupListCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -31,7 +31,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.Dimension;
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -26,7 +26,7 @@ import com.dmdirc.Channel;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.error;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.paste;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -27,7 +27,7 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -28,7 +28,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.prefs.validator.URLProtocolValidator;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 
 import java.awt.Dialog.ModalityType;

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileDetailPanel.java

@@ -28,7 +28,7 @@ import com.dmdirc.config.prefs.validator.IdentValidator;
 import com.dmdirc.config.prefs.validator.NicknameValidator;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.config.prefs.validator.ValidationResponse;
-import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.ProfileListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -26,7 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.config.prefs.validator.RegexValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
-import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.awt.Dialog.ModalityType;

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 import com.dmdirc.Server;
 import com.dmdirc.config.Identity;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SSLCertificateDialog.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingRestartDialog.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import com.dmdirc.updater.components.LauncherComponent;

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -27,7 +27,7 @@ import com.dmdirc.updater.UpdateCheckerListener;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateStatusTableCellRenderer;
 import com.dmdirc.updater.Update;

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.url;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.util.URLHandler;
 

src/com/dmdirc/addons/ui_swing/wizard/WizardDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.wizard;
 
-import com.dmdirc.addons.ui_swing.components.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import com.dmdirc.ui.CoreUIUtils;
 import java.awt.Window;

src/com/dmdirc/logger/ProgramError.java

@@ -487,5 +487,4 @@ public final class ProgramError implements Serializable {
         hash = 67 * hash + Arrays.hashCode(this.trace);
         return hash;
     }
-    
 }

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialogTest.java

@@ -30,7 +30,7 @@ import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
 import com.dmdirc.harness.ui.UITestIface;
 
-import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 import java.lang.reflect.InvocationTargetException;
 import javax.swing.JPanel;