Remove old alias manager dialog.

Change-Id: I89fed29438eae6e7439e804ee91de11a4848ee06
Reviewed-on: http://gerrit.dmdirc.com/3560
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/menubar/SettingsMenu.java

@@ -53,22 +53,18 @@ public class SettingsMenu extends JMenu implements ActionListener {
     private final DialogProvider<SwingPreferencesDialog> prefsDialogProvider;
     /** Provider of alias manager dialogs. */
     private final DialogProvider<AliasManagerDialog> aliasDialogProvider;
-    /** Provider of alias manager dialogs. */
-    private final DialogProvider<com.dmdirc.addons.ui_swing.dialogs.newaliases.AliasManagerDialog> newAliasDialogProvider;
 
     @Inject
     public SettingsMenu(
             final DialogProvider<ProfileManagerDialog> profileDialogProvider,
             final DialogProvider<ActionsManagerDialog> actionsDialogProvider,
             final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
-            final DialogProvider<AliasManagerDialog> aliasDialogProvider,
-            final DialogProvider<com.dmdirc.addons.ui_swing.dialogs.newaliases.AliasManagerDialog> newAliasDialogProvider) {
+            final DialogProvider<AliasManagerDialog> aliasDialogProvider) {
         super("Settings");
         this.profileDialogProvider = profileDialogProvider;
         this.actionsDialogProvider = actionsDialogProvider;
         this.prefsDialogProvider = prefsDialogProvider;
         this.aliasDialogProvider = aliasDialogProvider;
-        this.newAliasDialogProvider = newAliasDialogProvider;
 
         setMnemonic('e');
         initSettingsMenu();
@@ -109,13 +105,6 @@ public class SettingsMenu extends JMenu implements ActionListener {
         menuItem.setActionCommand("Aliases");
         menuItem.addActionListener(this);
         add(menuItem);
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('l');
-        menuItem.setText("New Alias Manager");
-        menuItem.setActionCommand("NewAliases");
-        menuItem.addActionListener(this);
-        add(menuItem);
     }
 
     @Override
@@ -133,9 +122,6 @@ public class SettingsMenu extends JMenu implements ActionListener {
             case "Aliases":
                 aliasDialogProvider.displayOrRequestFocus();
                 break;
-            case "NewAliases":
-                newAliasDialogProvider.displayOrRequestFocus();
-                break;
         }
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/newaliases/AliasManagerController.java → src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerController.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.newaliases;
+package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
 /**
  * Alias manager dialog controller reacts to actions in the UI.

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

@@ -22,449 +22,108 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.actions.CoreActionComparison;
-import com.dmdirc.actions.wrappers.Alias;
-import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
-import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.ui.AliasDialogModel;
+import com.dmdirc.ui.IconManager;
+import com.dmdirc.util.validators.NotEmptyValidator;
 
 import java.awt.Dimension;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 import javax.inject.Inject;
 import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
 import javax.swing.JSplitPane;
 import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableRowSorter;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
 
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
 /**
- * Alias manager dialog.
+ * Dialog to list and change command aliases.
  */
-public class AliasManagerDialog extends StandardDialog implements ActionListener,
-        ListSelectionListener {
+public class AliasManagerDialog extends StandardDialog {
 
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3;
-    /** Factory to use when creating aliases. */
-    private final ActionFactory actionFactory;
-    /** Alias wrapper to retrieve aliases from. */
-    private final AliasWrapper aliasWrapper;
-    /** Actions substitutor factory. */
-    private final ActionSubstitutorFactory substitutorFactory;
-    /** Table scrollpane. */
-    private JScrollPane scrollPane;
-    /** Error table. */
-    private JTable table;
-    /** Table model. */
-    private AliasTableModel tableModel;
-    /** Error detail panel. */
-    private AliasPanel aliasDetails;
-    /** Add/edit button. */
-    private JButton addButton;
-    /** Delete button. */
-    private JButton deleteButton;
-    /** Selected row. */
-    private int selectedRow;
-    /** Substitutions panel. */
-    private AliasSubstitutionsPanel subsPanel;
-    /** Show/Hide substitution button. */
-    private JButton showSubs;
+    private static final long serialVersionUID = 1;
+    private final AliasManagerModel model;
+    private final AliasManagerController controller;
+    private final AliasManagerLinker linker;
 
-    /**
-     * Creates a new instance of ErrorListDialog.
-     *
-     * @param parentWindow       Parent window
-     * @param substitutorFactory Actions substitution factory
-     * @param aliasWrapper       The alias wrapper to read aliases from.
-     * @param actionFactory      The factory to use to create new actions.
-     * @param aliasPanel         The alias panel to use.
-     */
     @Inject
-    public AliasManagerDialog(
-            @MainWindow final Window parentWindow,
-            final ActionSubstitutorFactory substitutorFactory,
-            final AliasWrapper aliasWrapper,
-            final ActionFactory actionFactory,
-            final AliasPanel aliasPanel) {
-        super(parentWindow, ModalityType.MODELESS);
-
-        this.substitutorFactory = substitutorFactory;
-        this.aliasWrapper = aliasWrapper;
-        this.actionFactory = actionFactory;
-
-        setTitle("Alias manager");
-
-        selectedRow = -1;
-
-        initComponents(aliasPanel);
-        layoutComponents();
-        initListeners();
-    }
-
-    /** Initialises the components. */
-    private void initComponents(final AliasPanel aliasPanel) {
-        final TableCellRenderer arrayRenderer = new ArrayCellRenderer();
-        final TableCellRenderer conditionRenderer = new ActionConditionCellRenderer();
-
-        orderButtons(new JButton(), new JButton());
-        addButton = new JButton("Add");
-        deleteButton = new JButton("Delete");
-
-        deleteButton.setEnabled(false);
-
-        scrollPane = new JScrollPane();
-
-        tableModel = new AliasTableModel(getTableData());
-        table = new PackingTable(tableModel, scrollPane, false) {
-            /** Java Serialisation verion ID. */
-            private static final long serialVersionUID = 1;
-
-            @Override
-            public TableCellRenderer getCellRenderer(final int row,
-                    final int column) {
-                switch (column) {
-                    case 1:
-                        return conditionRenderer;
-                    case 2:
-                        return arrayRenderer;
-                    default:
-                        return super.getCellRenderer(row, column);
-                }
-            }
-        };
-        table.setAutoCreateColumnsFromModel(true);
-        table.setColumnSelectionAllowed(false);
-        table.setCellSelectionEnabled(false);
-        table.setDragEnabled(false);
-        table.setFillsViewportHeight(false);
-        table.setRowSelectionAllowed(true);
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        table.getTableHeader().setReorderingAllowed(false);
-
-        final TableRowSorter<AliasTableModel> sorter = new TableRowSorter<>(tableModel);
-        sorter.setComparator(2, new StringArrayComparator());
-        table.setRowSorter(sorter);
-        table.getRowSorter().toggleSortOrder(0);
-
-        scrollPane.setViewportView(table);
-
-        aliasDetails = aliasPanel;
-        subsPanel = new AliasSubstitutionsPanel(substitutorFactory);
-        subsPanel.setVisible(false);
-        showSubs = new JButton("Show Substitutions");
-    }
-
-    /**
-     * Updates the table data.
-     */
-    public void updateTableData() {
-        tableModel.setAliases(getTableData());
-    }
-
-    /**
-     * Gets the table data fromt he alias wrapper.
-     *
-     * @return Alias list
-     */
-    private List<Alias> getTableData() {
-        final List<Alias> aliases = new ArrayList<>();
-
-        for (Action loopAction : aliasWrapper) {
-            final List<ActionCondition> arguments = loopAction.getConditions();
-
-            ActionCondition argument;
-
-            argument = arguments.get(0);
-
-            if (argument.getComparison() != CoreActionComparison.STRING_EQUALS) {
-                argument = arguments.get(1);
-            }
-
-            aliases.add(new Alias(actionFactory, argument.getTarget(),
-                    arguments, loopAction.getResponse()));
-        }
-
-        return aliases;
-    }
-
-    /** Initialises the listeners. */
-    private void initListeners() {
-        table.getSelectionModel().addListSelectionListener(this);
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
-        addButton.addActionListener(this);
-        deleteButton.addActionListener(this);
-        showSubs.addActionListener(this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, hidemode 3, pack"));
+    public AliasManagerDialog(@MainWindow final Window mainFrame,
+            final AliasDialogModel dialogModel,
+            @GlobalConfig final IconManager iconManager,
+            final CommandController commandController) {
+        super(mainFrame, ModalityType.DOCUMENT_MODAL);
+        this.model = new AliasManagerModel(dialogModel, commandController);
+        controller = new AliasManagerController(this, model);
+        linker = new AliasManagerLinker(controller, model, this, iconManager);
+        setTitle("Alias Manager");
+        final JTable aliasList = new JTable();
+        final JTextField command = new JTextField();
+        final JSpinner argumentsNumber = new JSpinner();
+        final JTextArea response = new JTextArea();
+        final JButton addAlias = new JButton("Add Alias");
+        final JButton deleteAlias = new JButton("Delete Alias");
+        getOkButton();
+        getCancelButton();
+        setLayout(new MigLayout("fill, pack"));
         setMinimumSize(new Dimension(800, 400));
-        table.setPreferredScrollableViewportSize(new Dimension(800, 150));
+        final JScrollPane scrollPane = new JScrollPane(aliasList);
+        aliasList.setPreferredScrollableViewportSize(new Dimension(800, 150));
         scrollPane.setMinimumSize(new Dimension(750, 150));
-        final JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT,
-                true, scrollPane, aliasDetails);
-        splitPane.setDividerSize((int) PlatformDefaults.getPanelInsets(0).
-                getValue());
+        final JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, scrollPane,
+                getAliasDetails(command, argumentsNumber, response, iconManager));
+        splitPane.setDividerSize((int) PlatformDefaults.getPanelInsets(0).getValue());
 
         add(splitPane, "spanx 5, grow, push, wrap");
-        add(subsPanel, "spanx 5, grow, pushy, wrap");
-        add(showSubs, "split 3, sgx button");
-        add(addButton, "sgx button, gap unrel");
-        add(deleteButton, "sgx button");
-        add(getLeftButton(), "sgx button, gap unrel");
+        add(addAlias, "split 2, sgx button");
+        add(deleteAlias, "sgx button");
+        add(getLeftButton(), "sgx button");
         add(getRightButton(), "sgx button");
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public void valueChanged(final ListSelectionEvent e) {
-        if (!e.getValueIsAdjusting()) {
 
-            if (selectedRow > -1 && selectedRow < tableModel.getRowCount() && aliasDetails.
-                    getAlias() == tableModel.getAlias(
-                            table.getRowSorter().convertRowIndexToModel(selectedRow))) {
-                updateAlias();
-            }
-
-            if (table.getSelectedRow() > -1) {
-                aliasDetails.setAlias(tableModel.getAlias(table.getRowSorter().
-                        convertRowIndexToModel(table.getSelectedRow())));
-                deleteButton.setEnabled(true);
-            } else {
-                aliasDetails.clear();
-                deleteButton.setEnabled(false);
-            }
-
-            selectedRow = table.getSelectedRow();
-        }
-    }
-
-    /** Updates the selected alias with the edited details. */
-    private void updateAlias() {
-        final Alias alias = tableModel.getAlias(table.getRowSorter().
-                convertRowIndexToModel(selectedRow));
-
-        alias.update(aliasDetails.getNewAlias());
-
-        tableModel.fireTableRowsUpdated(tableModel.indexOf(alias),
-                tableModel.indexOf(alias));
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == deleteButton) {
-            delete();
-        } else if (e.getSource() == addButton) {
-            add();
-        } else if (e.getSource() == getCancelButton()) {
-            dispose();
-        } else if (e.getSource() == getOkButton()) {
-            if (table.getSelectedRow() != -1) {
-                updateAlias();
-            }
-            if (checkForDuplicates()) {
-                final StandardQuestionDialog dialog = new StandardQuestionDialog(
-                        this, ModalityType.APPLICATION_MODAL,
-                        "Duplicate Aliases", "There are duplicate aliases in "
-                        + "the table, these need to be removed before saving") {
-                            /** Java Serialisation verion ID. */
-                            private static final long serialVersionUID = 1;
-
-                            @Override
-                            public boolean save() {
-                                return true;
-                            }
-
-                            @Override
-                            public void cancelled() {
-                                //Ignore
-                            }
-                        };
-                dialog.getOkButton().setVisible(false);
-                dialog.getCancelButton().setText("OK");
-                dialog.display();
-                return;
-            }
-            save();
-            dispose();
-        } else if (e.getSource() == showSubs) {
-            if (subsPanel.isVisible()) {
-                final Dimension minSize = getMinimumSize();
-                minSize.setSize(minSize.getWidth(), minSize.getHeight()
-                        - subsPanel.getSize().getHeight());
-                setMinimumSize(minSize);
-                subsPanel.setVisible(false);
-                pack();
-                showSubs.setText("Show Substitutions");
-            } else {
-                subsPanel.setVisible(true);
-                pack();
-                final Dimension minSize = getMinimumSize();
-                minSize.setSize(minSize.getWidth(), minSize.getHeight()
-                        + subsPanel.getSize().getHeight());
-                setMinimumSize(minSize);
-                showSubs.setText("Hide Substitutions");
-            }
-        }
-    }
-
-    /** Adds an alias. */
-    private void add() {
-        final Alias alias = new Alias(actionFactory, "");
-        tableModel.addRow(alias);
-        final int newRow = table.getRowSorter().
-                convertRowIndexToView(tableModel.indexOf(alias));
-        table.getSelectionModel().setSelectionInterval(newRow, newRow);
-        aliasDetails.focusCommand();
-    }
-
-    /** Deletes an alias. */
-    private void delete() {
-        if (table.getSelectedRow() != -1) {
-            tableModel.removeRow(table.getRowSorter().
-                    convertRowIndexToModel(table.getSelectedRow()));
-        }
-    }
-
-    /** Saves the aliases. */
-    private void save() {
-        final List<Action> actions = aliasWrapper.getActions();
-        final List<Alias> aliases = tableModel.getAliases();
-
-        final List<Alias> newAliases = new ArrayList<>();
-        final List<Alias> modifiedAliases = new ArrayList<>();
-
-        for (Alias alias : aliases) {
-            final Action action = getAction(alias);
-
-            if (action == null) {
-                newAliases.add(alias);
-            } else {
-                if (!action.getName().equals(alias.getName()) || !action.
-                        getConditions().
-                        equals(alias.getArguments()) || !Arrays.equals(action.
-                                getResponse(), alias.getResponse())) {
-                    modifiedAliases.add(alias);
-                }
-                actions.remove(action);
-            }
-        }
-
-        for (Action action : actions) {
-            action.delete();
-        }
-
-        saveNewAliases(newAliases);
-
-        saveModifiedAliases(modifiedAliases);
-
-        ActionManager.getActionManager().loadUserActions();
+        linker.bindCommandList(aliasList);
+        linker.bindCommand(command);
+        linker.bindArgumentsNumber(argumentsNumber);
+        linker.bindResponse(response);
+        linker.bindAddAlias(addAlias);
+        linker.bindDeleteAlias(deleteAlias);
+        linker.bindOKButton(getOkButton());
+        linker.bindCancelButton(getCancelButton());
+        model.load();
     }
 
     /**
-     * Saves new aliases.
+     * Creates a panel showing all alias details.
      *
-     * @param aliases List of new aliases to save
-     */
-    private void saveNewAliases(final List<Alias> aliases) {
-        for (Alias alias : aliases) {
-            alias.createAction().save();
-        }
-    }
-
-    /**
-     * Saves modified aliases.
+     * @param command         Command name
+     * @param argumentsNumber Number of arguments
+     * @param response        Alias substitution
      *
-     * @param aliases List of modified aliases to save
+     * @return Panel to display
      */
-    private void saveModifiedAliases(final List<Alias> aliases) {
-        for (Alias alias : aliases) {
-            final Action action = getAction(alias);
-            if (action != null) {
-                action.setName(alias.getName());
-                action.setConditions(alias.getArguments());
-                action.setResponse(alias.getResponse());
-                action.save();
-            }
-        }
-    }
-
-    /**
-     * Returns the action corresponding to the specified alias.
-     *
-     * @param alias Alias to check
-     *
-     * @return Corresponding action or null if none found
-     */
-    private Action getAction(final Alias alias) {
-        final List<Action> actions = aliasWrapper.getActions();
-        Action action = null;
-
-        for (Action loopAction : actions) {
-            if (loopAction.getName().equals(alias.getName()) && loopAction.
-                    getConditions().
-                    equals(alias.getArguments())) {
-                action = loopAction;
-                break;
-            }
-        }
-
-        return action;
-    }
-
-    /**
-     * Checks if ths alias matches another alias.
-     *
-     * @return true iif there are duplicate matches
-     */
-    private boolean checkForDuplicates() {
-        final List<Alias> aliases = tableModel.getAliases();
-
-        for (Alias alias : aliases) {
-            int matches = 0;
-
-            for (Alias loopAlias : aliases) {
-                if (loopAlias.matches(alias)) {
-                    matches++;
-                }
-            }
-
-            if (matches > 1) {
-                return true;
-            }
-        }
-
-        return false;
+    private JPanel getAliasDetails(final JTextField command, final JSpinner argumentsNumber,
+            final JTextArea response, final IconManager iconManager) {
+        final JPanel aliasDetails = new JPanel();
+        aliasDetails.setLayout(new MigLayout("fill, ins 0"));
+        aliasDetails.add(new JLabel("Command: "));
+        aliasDetails.add(ValidationFactory.getValidatorPanel(command,
+                model.getCommandValidator(), iconManager), "sgy args, growx, pushx");
+        aliasDetails.add(new JLabel("#Arguments: "));
+        aliasDetails.add(argumentsNumber, "sgy args, growx, pushx, wrap");
+        aliasDetails.add(new JLabel("Response: "));
+        aliasDetails.add(ValidationFactory.getValidatorPanel(new JScrollPane(response),
+                response, new NotEmptyValidator(), iconManager), "span 3, grow, push, wrap");
+        return aliasDetails;
     }
 
 }

src/com/dmdirc/addons/ui_swing/dialogs/newaliases/AliasManagerLinker.java → src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerLinker.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.newaliases;
+package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableListSelectionModel;

src/com/dmdirc/addons/ui_swing/dialogs/newaliases/AliasManagerModel.java → src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerModel.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.newaliases;
+package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
 import com.dmdirc.commandparser.aliases.Alias;
 import com.dmdirc.commandparser.validators.CommandNameValidator;

src/com/dmdirc/addons/ui_swing/dialogs/newaliases/AliasNameValidator.java → src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasNameValidator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.newaliases;
+package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
 import com.dmdirc.commandparser.aliases.Alias;
 import com.dmdirc.util.validators.ValidationResponse;

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

@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.dialogs.aliases;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.CoreActionComparison;
-import com.dmdirc.actions.CoreActionComponent;
-import com.dmdirc.actions.wrappers.Alias;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.inputfields.ValidatingTextFieldInputField;
-import com.dmdirc.addons.ui_swing.components.renderers.ActionComparisonCellRenderer;
-import com.dmdirc.commandparser.validators.CommandNameValidator;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.validators.FileNameValidator;
-import com.dmdirc.util.validators.ValidatorChain;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSpinner;
-import javax.swing.JTextArea;
-import javax.swing.SpinnerNumberModel;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Panel to display an alias.
- */
-public class AliasPanel extends JPanel implements ActionListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 2;
-    /** Factory to use when creating aliases. */
-    private final ActionFactory actionFactory;
-    /** Name field. */
-    private final ValidatingTextFieldInputField command;
-    /** argument component combo box. */
-    private final JComboBox<Object> argumentComponent;
-    /** Argument number spinner. */
-    private final JSpinner argumentNumber;
-    /** Response field. */
-    private final JTextArea response;
-    /** Alias. */
-    private Alias alias;
-
-    /**
-     * Creates a new instance of AliasPanel.
-     *
-     * @param iconManager       The icon manager to use for validation and dialog icons.
-     * @param colourManager     The manager to use for colour input.
-     * @param globalConfig      The config to read settings from.
-     * @param actionFactory     The factory to use to create new actions.
-     * @param commandController The controller to use to retrieve command information.
-     */
-    @Inject
-    public AliasPanel(
-            @GlobalConfig final IconManager iconManager,
-            final ColourManager colourManager,
-            @GlobalConfig final AggregateConfigProvider globalConfig,
-            final ActionFactory actionFactory,
-            final CommandController commandController) {
-        super();
-
-        this.actionFactory = actionFactory;
-
-        final ValidatorChain<String> chain = ValidatorChain.<String>builder()
-                .addValidator(new CommandNameValidator(commandController.getCommandChar()))
-                .addValidator(new FileNameValidator())
-                .build();
-        command = new ValidatingTextFieldInputField(iconManager, colourManager, globalConfig, chain);
-        command.setEnabled(false);
-
-        argumentComponent = new JComboBox<Object>(new CoreActionComparison[]{null,
-            CoreActionComparison.INT_GREATER, CoreActionComparison.INT_EQUALS,
-            CoreActionComparison.INT_LESS,});
-        argumentNumber = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
-        response = new JTextArea();
-
-        argumentNumber.setEnabled(false);
-        response.setRows(5);
-
-        argumentComponent.setRenderer(new ActionComparisonCellRenderer(
-                argumentComponent.getRenderer()));
-        argumentComponent.putClientProperty("JComboBox.isTableCellEditor",
-                Boolean.TRUE);
-        argumentComponent.addActionListener(this);
-
-        UIUtilities.addUndoManager(response);
-
-        layoutComponents();
-
-        clear();
-    }
-
-    /** Lays out and initialises the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill"));
-
-        add(new JLabel("Command: "));
-        add(command, "span 2, growx, pushx, wrap");
-
-        add(new JLabel("#Arguments: "));
-        add(argumentComponent, "sgy args");
-        add(argumentNumber, "sgy args, growx, pushx, wrap");
-
-        add(new JLabel("Response: "));
-        add(new JScrollPane(response), "span 2, grow, push, wrap");
-    }
-
-    /** Clears the details. */
-    public void clear() {
-        alias = null;
-        command.setText("");
-        command.setEnabled(false);
-        argumentComponent.setSelectedItem(null);
-        argumentNumber.setValue(0);
-        response.setText("");
-        command.setEnabled(false);
-        argumentComponent.setEnabled(false);
-        argumentNumber.setEnabled(false);
-        response.setEnabled(false);
-    }
-
-    /**
-     * Sets the alias details.
-     *
-     * @param alias List of alias details to display
-     */
-    public void setAlias(final Alias alias) {
-        if (alias == null) {
-            clear();
-            return;
-        }
-        this.alias = alias;
-        command.setEnabled(true);
-        argumentComponent.setEnabled(true);
-        response.setEnabled(true);
-        command.setText(alias.getCommand());
-
-        final List<ActionCondition> arguments = alias.getArguments();
-        ActionCondition argument;
-
-        if (arguments.size() == 1) {
-            argumentComponent.setSelectedItem(null);
-            argumentNumber.setValue(0);
-            argumentNumber.setEnabled(false);
-        } else {
-            argument = arguments.get(0);
-
-            if (argument.getComparison() == CoreActionComparison.STRING_EQUALS) {
-                argument = arguments.get(1);
-            }
-            argumentComponent.setSelectedItem(argument.getComparison());
-            argumentNumber.setValue(Integer.parseInt(argument.getTarget()));
-            argumentNumber.setEnabled(true);
-        }
-
-        final StringBuffer sb = new StringBuffer();
-        for (String line : alias.getResponse()) {
-            sb.append(line).append('\n');
-        }
-
-        if (sb.length() > 1) {
-            response.setText(sb.substring(0, sb.length() - 1));
-        } else {
-            response.setText("");
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     *
-     * @param e Action event
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        ((SpinnerNumberModel) argumentNumber.getModel()).setMinimum(0);
-        if (argumentComponent.getSelectedIndex() > 0) {
-            argumentNumber.setEnabled(true);
-            if (argumentComponent.getSelectedItem() == CoreActionComparison.INT_LESS) {
-                if (argumentNumber.getModel().getValue().equals(0)) {
-                    argumentNumber.getModel().setValue(1);
-                }
-                ((SpinnerNumberModel) argumentNumber.getModel()).setMinimum(1);
-            }
-        } else {
-            argumentNumber.setEnabled(false);
-        }
-    }
-
-    /**
-     * Returns the current command.
-     *
-     * @return Alias command
-     */
-    public String getCommand() {
-        return command.getText();
-    }
-
-    /**
-     * Returns the arguments condition.
-     *
-     * @return Action argument condition
-     */
-    public ActionCondition getArguments() {
-        if (argumentComponent.getSelectedItem() == null) {
-            return null;
-        }
-        switch ((CoreActionComparison) argumentComponent.getSelectedItem()) {
-            case INT_EQUALS:
-                return new ActionCondition(2,
-                        CoreActionComponent.STRINGARRAY_LENGTH,
-                        CoreActionComparison.INT_EQUALS,
-                        argumentNumber.getValue().toString());
-            case INT_GREATER:
-                return new ActionCondition(2,
-                        CoreActionComponent.STRINGARRAY_LENGTH,
-                        CoreActionComparison.INT_GREATER,
-                        argumentNumber.getValue().toString());
-            case INT_LESS:
-                return new ActionCondition(2,
-                        CoreActionComponent.STRINGARRAY_LENGTH,
-                        CoreActionComparison.INT_LESS,
-                        argumentNumber.getValue().toString());
-            default:
-                return null;
-        }
-    }
-
-    /**
-     * Returns the user response to the alias.
-     *
-     * @return Alias response
-     */
-    protected String[] getResponse() {
-        return response.getText().split("\n");
-    }
-
-    /**
-     * Returns the alias being shown in this panel.
-     *
-     * @return Alias
-     */
-    protected Alias getAlias() {
-        return alias;
-    }
-
-    /**
-     * Returns an alias reflecting the changes in this panel.
-     *
-     * @return New alias reflecting the edited alias.
-     */
-    protected Alias getNewAlias() {
-        final List<ActionCondition> conditions = new ArrayList<>();
-        conditions.add(new ActionCondition(1,
-                CoreActionComponent.STRING_STRING,
-                CoreActionComparison.STRING_EQUALS, getCommand()));
-        if (getArguments() != null) {
-            conditions.add(getArguments());
-        }
-        return new Alias(actionFactory, getCommand(), conditions, getResponse());
-    }
-
-    /** Focuses the command field. */
-    public void focusCommand() {
-        command.requestFocusInWindow();
-    }
-
-}

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

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.dialogs.aliases;
-
-import com.dmdirc.actions.ActionSubstitutor;
-import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
-import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionLabel;
-import com.dmdirc.addons.ui_swing.components.substitutions.SubstitutionsPanel;
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.util.ArrayList;
-import java.util.Map.Entry;
-
-import javax.swing.SwingUtilities;
-
-/**
- * Lists substitutions for aliases.
- */
-public class AliasSubstitutionsPanel extends SubstitutionsPanel<ActionType> {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Factory to use to create {@link ActionSubstitutor}s. */
-    private final ActionSubstitutorFactory substitutorFactory;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param substitutorFactory Factory to use to create {@link ActionSubstitutor}s.
-     */
-    public AliasSubstitutionsPanel(final ActionSubstitutorFactory substitutorFactory) {
-        super("Substitutions may be used in the response field",
-                SubstitutionsPanel.Alignment.VERTICAL,
-                CoreActionType.UNKNOWN_COMMAND);
-
-        this.substitutorFactory = substitutorFactory;
-    }
-
-    /**
-     * Sets the action type for this substitution panel.
-     *
-     * @param type New action type
-     */
-    @Override
-    public void setType(final ActionType type) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                substitutions = new ArrayList<>();
-
-                if (type != null) {
-                    final ActionSubstitutor sub = substitutorFactory.getActionSubstitutor(type);
-
-                    for (final Entry<String, String> entry : sub.getComponentSubstitutions().
-                            entrySet()) {
-                        substitutions.add(new SubstitutionLabel(new Substitution(entry.getValue(),
-                                entry.getKey())));
-                    }
-
-                    for (final String entry : sub.getConfigSubstitutions()) {
-                        substitutions.add(new SubstitutionLabel(new Substitution(entry,
-                                entry)));
-                    }
-
-                    for (final Entry<String, String> entry : sub.getServerSubstitutions().
-                            entrySet()) {
-                        substitutions.add(new SubstitutionLabel(new Substitution(entry.getValue(),
-                                entry.getKey())));
-                    }
-
-                    for (int i = 1; i < 4; i++) {
-                        substitutions.add(new SubstitutionLabel(new Substitution("Argument #" + i,
-                                Integer.toString(i))));
-                    }
-
-                    for (int i = 1; i < 4; i++) {
-                        substitutions.add(new SubstitutionLabel(new Substitution("Argument #" + i
-                                + " onwards", i + "-")));
-                    }
-                }
-
-                layoutComponents();
-                validate();
-                layoutComponents();
-            }
-        });
-    }
-
-}

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

@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.dialogs.aliases;
-
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.wrappers.Alias;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-/**
- * Table model for displaying aliases.
- */
-public final class AliasTableModel extends AbstractTableModel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 3;
-    /** Data list. */
-    private List<Alias> aliases;
-
-    /** Creates a new instance of AliasTableModel. */
-    public AliasTableModel() {
-        this(new ArrayList<Alias>());
-    }
-
-    /**
-     * Creates a new instance of AliasTableModel.
-     *
-     * @param aliases List of aliases
-     */
-    public AliasTableModel(final List<Alias> aliases) {
-        super();
-
-        this.aliases = new ArrayList<>(aliases);
-    }
-
-    /**
-     * Sets the alias list.
-     *
-     * @param aliases List of aliases
-     */
-    public void setAliases(final List<Alias> aliases) {
-        this.aliases = new ArrayList<>(aliases);
-
-        fireTableDataChanged();
-    }
-
-    public int getRowCount() {
-        return aliases.size();
-    }
-
-    public int getColumnCount() {
-        return 3;
-    }
-
-    public String getColumnName(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return "Command";
-            case 1:
-                return "# of Arguments";
-            case 2:
-                return "Response";
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-    }
-
-    public Class<?> getColumnClass(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return String.class;
-            case 1:
-                return ActionCondition.class;
-            case 2:
-                return String[].class;
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-    }
-
-    public boolean isCellEditable(final int rowIndex, final int columnIndex) {
-        return false;
-    }
-
-    public Object getValueAt(final int rowIndex, final int columnIndex) {
-        if (aliases.size() <= rowIndex) {
-            throw new IndexOutOfBoundsException(rowIndex + " >= " + aliases.size());
-        }
-        if (rowIndex < 0) {
-            throw new IllegalArgumentException("Must specify a positive integer");
-        }
-        switch (columnIndex) {
-            case 0:
-                return aliases.get(rowIndex).getCommand();
-            case 1:
-                return aliases.get(rowIndex).getArgsArgument();
-            case 2:
-                return aliases.get(rowIndex).getResponse();
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-    }
-
-    public void setValueAt(final Object aValue, final int rowIndex,
-            final int columnIndex) {
-        if (aliases.size() <= rowIndex) {
-            throw new IndexOutOfBoundsException(rowIndex + " >= " + aliases.size());
-        }
-        if (rowIndex < 0) {
-            throw new IllegalArgumentException("Must specify a positive integer");
-        }
-        switch (columnIndex) {
-            case 0:
-                aliases.get(rowIndex).setCommand((String) aValue);
-                break;
-            case 1:
-                aliases.get(rowIndex).getArguments().set(1, (ActionCondition) aValue);
-                break;
-            case 2:
-                aliases.get(rowIndex).setResponse((String[]) aValue);
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown column: "
-                        + columnIndex);
-        }
-        fireTableCellUpdated(rowIndex, columnIndex);
-    }
-
-    /**
-     * Gets the alias at the specified row.
-     *
-     * @param rowIndex Row to retrieve
-     *
-     * @return Specified Alias
-     */
-    public Alias getAlias(final int rowIndex) {
-        return aliases.get(rowIndex);
-    }
-
-    /**
-     * Gets a list of all aliases (including deleted ones).
-     *
-     * @return Complete alias list
-     */
-    public List<Alias> getAliases() {
-        return new ArrayList<>(aliases);
-    }
-
-    /**
-     * Adds an alias to the list.
-     *
-     * @param alias Alias to add
-     */
-    public void addRow(final Alias alias) {
-        aliases.add(alias);
-        fireTableRowsInserted(aliases.indexOf(alias), aliases.indexOf(alias));
-    }
-
-    /**
-     * Removes a specified row from the list.
-     *
-     * @param row Row to remove
-     */
-    public void removeRow(final int row) {
-        aliases.remove(row);
-        fireTableRowsDeleted(row, row);
-    }
-
-    /**
-     * Returns the index of the specified alias.
-     *
-     * @param alias Alias to get index of
-     *
-     * @return Index of the alias or -1 if not found.
-     */
-    public int indexOf(final Alias alias) {
-        return aliases.indexOf(alias);
-    }
-
-}

src/com/dmdirc/addons/ui_swing/dialogs/newaliases/UniqueAliasNameValidator.java → src/com/dmdirc/addons/ui_swing/dialogs/aliases/UniqueAliasNameValidator.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.dialogs.newaliases;
+package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
 import com.dmdirc.commandparser.aliases.Alias;
 import com.dmdirc.util.validators.ValidationResponse;

src/com/dmdirc/addons/ui_swing/dialogs/aliases/package-info.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.
- */
-
-/**
- * Alias manager.
- */
-package com.dmdirc.addons.ui_swing.dialogs.aliases;

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

@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * 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.dialogs.newaliases;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.ui.AliasDialogModel;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.validators.NotEmptyValidator;
-
-import java.awt.Dimension;
-import java.awt.Window;
-
-import javax.inject.Inject;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSpinner;
-import javax.swing.JSplitPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import net.miginfocom.layout.PlatformDefaults;
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Dialog to list and change command aliases.
- */
-public class AliasManagerDialog extends StandardDialog {
-
-    private static final long serialVersionUID = 1;
-    private final AliasManagerModel model;
-    private final AliasManagerController controller;
-    private final AliasManagerLinker linker;
-
-    @Inject
-    public AliasManagerDialog(@MainWindow final Window mainFrame,
-            final AliasDialogModel dialogModel,
-            @GlobalConfig final IconManager iconManager,
-            final CommandController commandController) {
-        super(mainFrame, ModalityType.DOCUMENT_MODAL);
-        this.model = new AliasManagerModel(dialogModel, commandController);
-        controller = new AliasManagerController(this, model);
-        linker = new AliasManagerLinker(controller, model, this, iconManager);
-        setTitle("Alias Manager");
-        final JTable aliasList = new JTable();
-        final JTextField command = new JTextField();
-        final JSpinner argumentsNumber = new JSpinner();
-        final JTextArea response = new JTextArea();
-        final JButton addAlias = new JButton("Add Alias");
-        final JButton deleteAlias = new JButton("Delete Alias");
-        getOkButton();
-        getCancelButton();
-        setLayout(new MigLayout("fill, pack"));
-        setMinimumSize(new Dimension(800, 400));
-        final JScrollPane scrollPane = new JScrollPane(aliasList);
-        aliasList.setPreferredScrollableViewportSize(new Dimension(800, 150));
-        scrollPane.setMinimumSize(new Dimension(750, 150));
-        final JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, scrollPane,
-                getAliasDetails(command, argumentsNumber, response, iconManager));
-        splitPane.setDividerSize((int) PlatformDefaults.getPanelInsets(0).getValue());
-
-        add(splitPane, "spanx 5, grow, push, wrap");
-        add(addAlias, "split 2, sgx button");
-        add(deleteAlias, "sgx button");
-        add(getLeftButton(), "sgx button");
-        add(getRightButton(), "sgx button");
-
-        linker.bindCommandList(aliasList);
-        linker.bindCommand(command);
-        linker.bindArgumentsNumber(argumentsNumber);
-        linker.bindResponse(response);
-        linker.bindAddAlias(addAlias);
-        linker.bindDeleteAlias(deleteAlias);
-        linker.bindOKButton(getOkButton());
-        linker.bindCancelButton(getCancelButton());
-        model.load();
-    }
-
-    /**
-     * Creates a panel showing all alias details.
-     *
-     * @param command         Command name
-     * @param argumentsNumber Number of arguments
-     * @param response        Alias substitution
-     *
-     * @return Panel to display
-     */
-    private JPanel getAliasDetails(final JTextField command, final JSpinner argumentsNumber,
-            final JTextArea response, final IconManager iconManager) {
-        final JPanel aliasDetails = new JPanel();
-        aliasDetails.setLayout(new MigLayout("fill, ins 0"));
-        aliasDetails.add(new JLabel("Command: "));
-        aliasDetails.add(ValidationFactory.getValidatorPanel(command,
-                model.getCommandValidator(), iconManager), "sgy args, growx, pushx");
-        aliasDetails.add(new JLabel("#Arguments: "));
-        aliasDetails.add(argumentsNumber, "sgy args, growx, pushx, wrap");
-        aliasDetails.add(new JLabel("Response: "));
-        aliasDetails.add(ValidationFactory.getValidatorPanel(new JScrollPane(response),
-                response, new NotEmptyValidator(), iconManager), "span 3, grow, push, wrap");
-        return aliasDetails;
-    }
-
-}

src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -32,10 +32,10 @@ import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
-import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
@@ -114,13 +114,6 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
-    @Provides
-    @Singleton
-    public DialogProvider<com.dmdirc.addons.ui_swing.dialogs.newaliases.AliasManagerDialog> getNewAliasManagerDialogProvider(
-            final Provider<com.dmdirc.addons.ui_swing.dialogs.newaliases.AliasManagerDialog> provider) {
-        return new DialogProvider<>(provider);
-    }
-
     @Provides
     @Singleton
     public DialogProvider<ErrorListDialog> getErrorListDialogProvider(