Merge pull request #230 from csmith/master

Kill the actions UI. With fire.

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.addons.ui_swing.Apple;
-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.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
@@ -44,8 +43,6 @@ public class SettingsMenu extends JMenu {
     private static final long serialVersionUID = 1;
     /** Provider of profile manager dialogs. */
     private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
-    /** Provider of action manager dialogs. */
-    private final DialogProvider<ActionsManagerDialog> actionsDialogProvider;
     /** Provider of preferences dialogs. */
     private final DialogProvider<SwingPreferencesDialog> prefsDialogProvider;
     /** Provider of alias manager dialogs. */
@@ -54,12 +51,10 @@ public class SettingsMenu extends JMenu {
     @Inject
     public SettingsMenu(
             final DialogProvider<ProfileManagerDialog> profileDialogProvider,
-            final DialogProvider<ActionsManagerDialog> actionsDialogProvider,
             final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
             final DialogProvider<AliasManagerDialog> aliasDialogProvider) {
         super("Settings");
         this.profileDialogProvider = profileDialogProvider;
-        this.actionsDialogProvider = actionsDialogProvider;
         this.prefsDialogProvider = prefsDialogProvider;
         this.aliasDialogProvider = aliasDialogProvider;
 
@@ -89,12 +84,6 @@ public class SettingsMenu extends JMenu {
 
         menuItem = new JMenuItem();
         menuItem.setMnemonic('a');
-        menuItem.setText("Actions Manager");
-        menuItem.addActionListener(e -> actionsDialogProvider.displayOrRequestFocus());
-        add(menuItem);
-
-        menuItem = new JMenuItem();
-        menuItem.setMnemonic('l');
         menuItem.setText("Alias Manager");
         menuItem.addActionListener(e -> aliasDialogProvider.displayOrRequestFocus());
         add(menuItem);

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

@@ -1,134 +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.actioneditor;
-
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.UIManager;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Advanced options panel, show concurrency groups and enabled states.
- */
-public class ActionAdvancedPanel extends JPanel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    private JLabel enabledLabel;
-    private JCheckBox enabled;
-    private JLabel groupLabel;
-    private JTextField group;
-    private JLabel stopLabel;
-    private JCheckBox stop;
-
-    /**
-     * Creates a new panel to configure advanced options for actions.
-     */
-    public ActionAdvancedPanel() {
-        initComponents();
-        layoutComponents();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Advanced"));
-        enabled = new JCheckBox("", true);
-        enabled.setName("enabled");
-        group = new JTextField();
-        stop = new JCheckBox("", false);
-        stop.setName("stop");
-        enabledLabel = new JLabel("Enabled: ");
-        groupLabel = new JLabel("Concurrency group: ");
-        stopLabel = new JLabel("Stop default behaviour: ");
-    }
-
-    private void layoutComponents() {
-        setLayout(new MigLayout("fillx, pack"));
-        add(enabledLabel, "");
-        add(enabled, "growx");
-        add(stopLabel, "");
-        add(stop, "growx, pushx, wrap");
-        add(groupLabel, "");
-        add(group, "growx, pushx, spanx");
-    }
-
-    /**
-     * Gets the concurrency group for this action.
-     *
-     * @return Current concurrency group
-     */
-    public String getConcurrencyGroup() {
-        return group.getText();
-    }
-
-    /**
-     * Is the action currently enabled?
-     *
-     * @return true iif enabled
-     */
-    public boolean isActionEnabled() {
-        return enabled.isSelected();
-    }
-
-    /**
-     * Sets whether this action should be enabled.
-     *
-     * @param actionEnabled true to enable, false to disable
-     */
-    public void setActionEnabled(final boolean actionEnabled) {
-        enabled.setSelected(actionEnabled);
-    }
-
-    /**
-     * Sets this actions concurrency group.
-     *
-     * @param actionGroup New concurrency group
-     */
-    public void setConcurrencyGroup(final String actionGroup) {
-        group.setText(actionGroup);
-    }
-
-    /**
-     * Does the action currently stop the default behaviour?
-     *
-     * @return true iif stopped
-     */
-    public boolean isActionStopped() {
-        return stop.isSelected();
-    }
-
-    /**
-     * Sets whether this action should be enabled.
-     *
-     * @param actionStopped true to enable, false to disable
-     */
-    public void setActionStopped(final boolean actionStopped) {
-        stop.setSelected(actionStopped);
-    }
-
-}

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

@@ -1,290 +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.actioneditor;
-
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.collections.ListenerList;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.JPanel;
-import javax.swing.JToggleButton;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action condition display panel.
- */
-public class ActionConditionDisplayPanel extends JPanel implements
-        ActionListener, PropertyChangeListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    private final ActionManager actionManager;
-    /** Info label. */
-    private TextLabel label;
-    /** Edit button. */
-    private JToggleButton editButton;
-    /** Delete button. */
-    private ImageButton<Object> deleteButton;
-    /** Edit panel. */
-    private ActionConditionEditorPanel editPanel;
-    /** Listeners. */
-    private ListenerList listeners;
-    /** Action condition. */
-    private ActionCondition condition;
-    /** Action trigger. */
-    private ActionType trigger;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon Manager
-     * @param condition   Action condition
-     * @param trigger     Action trigger
-     */
-    public ActionConditionDisplayPanel(final ActionManager actionManager,
-            final IconManager  iconManager,final ActionCondition condition,
-            final ActionType trigger) {
-
-        this.actionManager = actionManager;
-        this.trigger = trigger;
-        this.condition = new ActionCondition(condition.getArg(),
-                condition.getComponent(), condition.getComparison(),
-                condition.getTarget());
-
-        initComponents(iconManager);
-        addListeners();
-        layoutComponents();
-        setTrigger(trigger);
-        validate();
-        layoutComponents();
-
-        if (condition.getArg() == -1 && condition.getComponent() == null && condition.
-                getComparison() == null
-                && condition.getTarget().isEmpty()) {
-            editPanel.setVisible(true);
-            editButton.setSelected(true);
-        }
-    }
-
-    /**
-     * Sets the action trigger.
-     *
-     * @param trigger new trigger
-     */
-    void setTrigger(final ActionType trigger) {
-        this.trigger = trigger;
-        editPanel.setTrigger(trigger);
-
-        editPanel.setVisible(trigger == null);
-        editButton.setSelected(trigger == null);
-
-        label.setText(updateSentence());
-    }
-
-    /**
-     * Sets the action condition.
-     *
-     * @param condition new condition
-     */
-    protected void setCondition(final ActionCondition condition) {
-        this.condition = condition;
-
-        label.setText(updateSentence());
-    }
-
-    /**
-     * Initialises the components.
-     *
-     * @param iconManager Icon Manager
-     */
-    private void initComponents(final IconManager iconManager) {
-        label = new TextLabel("", false);
-        editButton = new ImageToggleButton("edit", iconManager.
-                getIcon("edit-inactive"), iconManager.getIcon("edit"));
-        deleteButton = new ImageButton<>("delete", iconManager.
-                getIcon("close-inactive"), iconManager.
-                getIcon("close-inactive"), iconManager.getIcon("close-active"));
-
-        editPanel = new ActionConditionEditorPanel(actionManager, condition, trigger);
-        listeners = new ListenerList();
-
-        editPanel.setVisible(trigger == null);
-        editButton.setSelected(trigger == null);
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        editButton.addActionListener(this);
-        deleteButton.addActionListener(this);
-        editPanel.addPropertyChangeListener("edit", this);
-        editPanel.addPropertyChangeListener("validationResult", this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("ins 0, fillx, hidemode 3, pack, wmax 90%"));
-        add(label, "grow, push, wmax 85%");
-        add(editButton, "right");
-        add(deleteButton, "right, wrap");
-        add(editPanel, "alignx right");
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource().equals(deleteButton)) {
-            fireConditionRemoved(this);
-        } else if (e.getSource().equals(editButton)) {
-            editPanel.setVisible(editButton.getModel().isSelected());
-        }
-    }
-
-    /**
-     * Adds an ActionConditionRemovalListener to the listener list.
-     *
-     * @param listener Listener to add
-     */
-    public void addConditionListener(
-            final ActionConditionRemovalListener listener) {
-        if (listener == null) {
-            return;
-        }
-
-        listeners.add(ActionConditionRemovalListener.class, listener);
-    }
-
-    /**
-     * Removes an ActionConditionRemovalListener from the listener list.
-     *
-     * @param listener Listener to remove
-     */
-    public void removeConditionListener(
-            final ActionConditionRemovalListener listener) {
-        listeners.remove(ActionConditionRemovalListener.class, listener);
-    }
-
-    /**
-     * Fired when the an action condition is removed.
-     *
-     * @param condition Removed condition
-     */
-    protected void fireConditionRemoved(
-            final ActionConditionDisplayPanel condition) {
-        for (final ActionConditionRemovalListener listener : listeners
-                .get(ActionConditionRemovalListener.class)) {
-            listener.conditionRemoved(condition);
-        }
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        editPanel.setEnabled(enabled);
-        editButton.setEnabled(enabled);
-        deleteButton.setEnabled(enabled);
-    }
-
-    /**
-     * Updates the condition sentence.
-     *
-     * @return Updated sentence
-     */
-    private String updateSentence() {
-        if (trigger == null) {
-            return "...";
-        } else {
-            final StringBuilder sb = new StringBuilder("The ");
-
-            if (condition.getArg() == -1) {
-                sb.append(" ...");
-                return sb.toString();
-            }
-
-            sb.append(trigger.getType().getArgNames()[condition.getArg()]);
-            sb.append("'s ");
-
-            if (condition.getComponent() == null) {
-                sb.append(" ...");
-                return sb.toString();
-            }
-
-            sb.append(condition.getComponent().getName());
-            sb.append(' ');
-
-            if (condition.getComparison() == null) {
-                sb.append(" ...");
-                return sb.toString();
-            }
-
-            sb.append(condition.getComparison().getName());
-            sb.append(" '");
-
-            if (condition.getTarget() == null) {
-                sb.append(" ...");
-                return sb.toString();
-            }
-
-            sb.append(condition.getTarget().replace("<", "&lt;"));
-            sb.append('\'');
-            return sb.toString();
-        }
-    }
-
-    /**
-     * Returns the action condition represented by this panel.
-     *
-     * @return Action condition
-     */
-    public ActionCondition getCondition() {
-        return condition;
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        if ("edit".equals(evt.getPropertyName())) {
-            label.setText(updateSentence());
-        } else {
-            firePropertyChange("validationResult", evt.getOldValue(),
-                    evt.getNewValue());
-        }
-    }
-
-    /**
-     * Checks if this editor panel has errored.
-     *
-     * @return true iif the content it valid
-     */
-    public boolean checkError() {
-        return editPanel.checkError();
-    }
-
-}

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

@@ -1,315 +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.actioneditor;
-
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
-import com.dmdirc.addons.ui_swing.components.renderers.ToStringListCellRenderer;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.MutableComboBoxModel;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action condition editor panel.
- */
-public class ActionConditionEditorPanel extends JPanel implements
-        ActionListener, DocumentListener, PropertyChangeListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Condition. */
-    private final ActionCondition condition;
-    /** Action manager to manage actions. */
-    private final ActionController actionManager;
-    /** Trigger. */
-    private ActionType trigger;
-    /** Argument. */
-    private JComboBox<String> arguments;
-    /** Component. */
-    private JComboBox<ActionComponent> components;
-    /** Comparison. */
-    private JComboBox<ActionComparison> comparisons;
-    /** Target. */
-    private JTextField target;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param condition Action condition
-     * @param trigger   Action trigger
-     */
-    public ActionConditionEditorPanel(final ActionController actionManager,
-            final ActionCondition condition, final ActionType trigger) {
-
-        this.actionManager = actionManager;
-        this.condition = condition;
-        this.trigger = trigger;
-
-        initComponents();
-
-        if (trigger == null) {
-            setEnabled(false);
-        } else {
-            populateArguments();
-            populateComponents();
-            populateComparisons();
-            populateTarget();
-        }
-
-        firePropertyChange("edit", null, null);
-
-        addListeners();
-        layoutComponents();
-        setEnabled(trigger != null);
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        arguments = new JComboBox<>(new DefaultComboBoxModel<>());
-        arguments.putClientProperty("JComboBox.isTableCellEditor",
-                Boolean.TRUE);
-        arguments.setName("argument");
-        UIUtilities.addComboBoxWidthModifier(arguments);
-        components = new JComboBox<>(new DefaultComboBoxModel<>());
-        components.putClientProperty("JComboBox.isTableCellEditor",
-                Boolean.TRUE);
-        components.setName("component");
-        UIUtilities.addComboBoxWidthModifier(components);
-        comparisons = new JComboBox<>(new DefaultComboBoxModel<>());
-        comparisons.putClientProperty("JComboBox.isTableCellEditor",
-                Boolean.TRUE);
-        comparisons.setName("comparison");
-        UIUtilities.addComboBoxWidthModifier(comparisons);
-
-        target = new JTextField() {
-            /** Serial version UID. */
-            private static final long serialVersionUID = 1;
-
-            @Override
-            public void setEnabled(final boolean enabled) {
-                firePropertyChange("validationResult", target.isEnabled(),
-                        enabled);
-                super.setEnabled(enabled);
-            }
-        };
-
-        arguments.setRenderer(new ToStringListCellRenderer<>(arguments.getRenderer(), String.class));
-        components.setRenderer(new PropertyListCellRenderer<>(components.getRenderer(),
-                ActionComponent.class, "name"));
-        comparisons.setRenderer(new PropertyListCellRenderer<>(comparisons.getRenderer(),
-                ActionComparison.class, "name"));
-
-        components.setEnabled(false);
-        comparisons.setEnabled(false);
-        target.setEnabled(false);
-    }
-
-    /** Populates the arguments combo box. */
-    private void populateArguments() {
-        ((DefaultComboBoxModel<String>) arguments.getModel()).removeAllElements();
-
-        for (String arg : trigger.getType().getArgNames()) {
-            ((MutableComboBoxModel<String>) arguments.getModel()).addElement(arg);
-        }
-        arguments.setSelectedIndex(condition.getArg());
-    }
-
-    /** Populates the components combo box. */
-    private void populateComponents() {
-        ((DefaultComboBoxModel<ActionComponent>) components.getModel()).removeAllElements();
-
-        if (condition.getArg() != -1) {
-            actionManager.findCompatibleComponents(trigger.getType()
-                    .getArgTypes()[condition.getArg()])
-                    .forEach(((MutableComboBoxModel<ActionComponent>) components.getModel())
-                            ::addElement);
-        }
-        components.setSelectedItem(condition.getComponent());
-    }
-
-    /** Populates the comparisons combo box. */
-    private void populateComparisons() {
-        ((DefaultComboBoxModel<ActionComparison>) comparisons.getModel()).removeAllElements();
-
-        if (condition.getComponent() != null) {
-            actionManager.findCompatibleComparisons(condition.getComponent().getType())
-                    .forEach(((MutableComboBoxModel<ActionComparison>) comparisons.getModel())
-                            ::addElement);
-        }
-        comparisons.setSelectedItem(condition.getComparison());
-    }
-
-    /** Populates the target textfield. */
-    private void populateTarget() {
-        target.setText(condition.getTarget());
-    }
-
-    /** Handles the argument changing. */
-    private void handleArgumentChange() {
-        condition.setArg(arguments.getSelectedIndex());
-        populateComponents();
-        components.setEnabled(true);
-        components.setSelectedItem(null);
-        comparisons.setSelectedItem(null);
-        comparisons.setEnabled(false);
-        target.setText(null);
-        target.setEnabled(false);
-    }
-
-    /** Handles the component changing. */
-    private void handleComponentChange() {
-        condition.setComponent((ActionComponent) components.getSelectedItem());
-        populateComparisons();
-        comparisons.setEnabled(true);
-        comparisons.setSelectedItem(null);
-        target.setText(null);
-        target.setEnabled(false);
-    }
-
-    /** Handles the comparison changing. */
-    private void handleComparisonChange() {
-        condition.setComparison((ActionComparison) comparisons
-                .getSelectedItem());
-        populateTarget();
-        target.setEnabled(true);
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        arguments.addActionListener(this);
-        components.addActionListener(this);
-        comparisons.addActionListener(this);
-        target.getDocument().addDocumentListener(this);
-        target.addPropertyChangeListener("validationResult", this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("wrap 2, pack"));
-
-        add(new JLabel("Argument:"), "align right");
-        add(arguments, "growx, wmax 200");
-        add(new JLabel("Component:"), "align right");
-        add(components, "growx, wmax 200");
-        add(new JLabel("Comparison:"), "align right");
-        add(comparisons, "growx, wmax 200");
-        add(new JLabel("Target:"), "align right");
-        add(target, "growx");
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == arguments) {
-            handleArgumentChange();
-        } else if (e.getSource() == components) {
-            handleComponentChange();
-        } else if (e.getSource() == comparisons) {
-            handleComparisonChange();
-        }
-        firePropertyChange("edit", null, null);
-    }
-
-    @Override
-    public void insertUpdate(final DocumentEvent e) {
-        synchronized (condition) {
-            condition.setTarget(target.getText());
-        }
-        firePropertyChange("edit", null, null);
-    }
-
-    @Override
-    public void removeUpdate(final DocumentEvent e) {
-        synchronized (condition) {
-            condition.setTarget(target.getText());
-        }
-        firePropertyChange("edit", null, null);
-    }
-
-    @Override
-    public void changedUpdate(final DocumentEvent e) {
-        //Ignore
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        super.setEnabled(enabled);
-        arguments.setEnabled(enabled);
-        if (enabled) {
-            components.setEnabled(arguments.getSelectedIndex() != -1);
-            comparisons.setEnabled(components.getSelectedIndex() != -1);
-            target.setEnabled(comparisons.getSelectedIndex() != -1);
-        } else {
-            components.setEnabled(false);
-            comparisons.setEnabled(false);
-            target.setEnabled(false);
-        }
-    }
-
-    /**
-     * Sets the action trigger.
-     *
-     * @param trigger new trigger
-     */
-    public void setTrigger(final ActionType trigger) {
-        this.trigger = trigger;
-
-        setEnabled(trigger != null);
-        if (trigger != null && !trigger.equals(this.trigger)) {
-            populateArguments();
-        }
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        firePropertyChange("validationResult", evt.getOldValue(),
-                evt.getNewValue());
-    }
-
-    /**
-     * Checks if this editor panel has errored.
-     *
-     * @return true iif the content it valid
-     */
-    public boolean checkError() {
-        return target.isEnabled();
-    }
-
-}

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

@@ -1,37 +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.actioneditor;
-
-/**
- * Action condition removal listener.
- */
-public interface ActionConditionRemovalListener {
-
-    /**
-     * A condition was removed from the list.
-     *
-     * @param condition Condition to be removed
-     */
-    void conditionRemoved(ActionConditionDisplayPanel condition);
-
-}

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

@@ -1,275 +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.actioneditor;
-
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.ui.IconManager;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action conditions list panel.
- */
-public class ActionConditionsListPanel extends JPanel implements
-        ActionConditionRemovalListener,
-        PropertyChangeListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    /** Conditions list. */
-    private final List<ActionConditionDisplayPanel> conditions;
-    /** Condition tree panel. */
-    private final ActionConditionsTreePanel treePanel;
-    /** Condition validation results. */
-    private final Map<ActionConditionDisplayPanel, Boolean> validations;
-    /** Icon manager. */
-    private final IconManager iconManager;
-    private final ActionManager actionManager;
-    /** Action trigger. */
-    private ActionType trigger;
-    /** validates. */
-    private boolean validates = true;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     * @param treePanel   Condition tree panel.
-     */
-    public ActionConditionsListPanel(final ActionManager actionManager,
-            final IconManager iconManager,
-            final ActionConditionsTreePanel treePanel) {
-        this(actionManager, iconManager, null, new ArrayList<>(),
-                treePanel);
-    }
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager to retrieve icons
-     * @param trigger     Action trigger
-     * @param conditions  List of existing conditions;
-     * @param treePanel   Condition tree panel.
-     */
-    public ActionConditionsListPanel(final ActionManager actionManager,
-            final IconManager iconManager,
-            final ActionType trigger,
-            final List<ActionConditionDisplayPanel> conditions,
-            final ActionConditionsTreePanel treePanel) {
-
-        validations = new HashMap<>();
-
-        this.actionManager = actionManager;
-        this.iconManager = iconManager;
-        this.trigger = trigger;
-        this.conditions = new ArrayList<>(conditions);
-        this.treePanel = treePanel;
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        setLayout(new MigLayout("fillx, wrap 2, pack"));
-
-        if (trigger == null) {
-            setEnabled(false);
-        }
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        for (final ActionConditionDisplayPanel condition : conditions) {
-            condition.addConditionListener(this);
-        }
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setVisible(false);
-        removeAll();
-        if (trigger == null) {
-            add(new TextLabel(
-                    "You must add at least one trigger before you can add conditions."),
-                    "alignx center, aligny top, grow, push, w 90%!");
-        } else if (trigger.getType().getArgNames().length == 0) {
-            add(new TextLabel("Trigger does not have any arguments."),
-                    "alignx center, aligny top, grow, push, w 90%!");
-        } else {
-            int index = 0;
-            synchronized (conditions) {
-                for (final ActionConditionDisplayPanel condition : conditions) {
-                    add(new JLabel(index + "."), "aligny top");
-                    add(condition, "growx, pushx, aligny top");
-                    index++;
-                }
-            }
-            if (index == 0) {
-                add(new JLabel("No conditions."),
-                        "alignx center, aligny top, growx, pushx");
-            }
-        }
-        setVisible(true);
-
-    }
-
-    /**
-     * Adds an action condition to the list.
-     *
-     * @param condition Action condition
-     */
-    public void addCondition(final ActionCondition condition) {
-        final ActionConditionDisplayPanel panel = new ActionConditionDisplayPanel(actionManager,
-                iconManager, condition, trigger);
-        panel.addConditionListener(this);
-        panel.addPropertyChangeListener("validationResult", this);
-        validations.put(panel, panel.checkError());
-        propertyChange(null);
-        synchronized (conditions) {
-            conditions.add(panel);
-        }
-        treePanel.setConditionCount(conditions.size());
-        layoutComponents();
-    }
-
-    /**
-     * Deletes an action condition from the list.
-     *
-     * @param condition Action condition
-     */
-    public void delCondition(final ActionCondition condition) {
-        ActionConditionDisplayPanel removeCondition = null;
-
-        synchronized (conditions) {
-            for (final ActionConditionDisplayPanel localCondition : conditions) {
-                if (localCondition.getCondition().equals(condition)) {
-                    removeCondition = localCondition;
-                    break;
-                }
-            }
-        }
-
-        treePanel.setConditionCount(conditions.size());
-
-        if (removeCondition != null) {
-            conditionRemoved(removeCondition);
-        }
-    }
-
-    /**
-     * Clear conditions.
-     */
-    public void clearConditions() {
-        for (final ActionConditionDisplayPanel condition : conditions) {
-            delCondition(condition.getCondition());
-        }
-    }
-
-    /**
-     * Returns the condition list.
-     *
-     * @return condition list
-     */
-    public List<ActionCondition> getConditions() {
-        final List<ActionCondition> conditionList = new ArrayList<>();
-
-        synchronized (conditions) {
-            conditionList.addAll(conditions.stream()
-                    .map(ActionConditionDisplayPanel::getCondition)
-                    .collect(Collectors.toList()));
-        }
-
-        return conditionList;
-    }
-
-    /**
-     * Sets the action trigger for the panel.
-     *
-     * @param trigger Action trigger
-     */
-    public void setTrigger(final ActionType trigger) {
-        if (this.trigger == null) {
-            conditions.clear();
-        }
-
-        for (final ActionConditionDisplayPanel panel : conditions) {
-            panel.setTrigger(trigger);
-        }
-        this.trigger = trigger;
-        setEnabled(trigger != null);
-        layoutComponents();
-    }
-
-    @Override
-    public void conditionRemoved(final ActionConditionDisplayPanel condition) {
-        synchronized (conditions) {
-            conditions.remove(condition);
-            validations.remove(condition);
-        }
-        propertyChange(null);
-        layoutComponents();
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        for (final ActionConditionDisplayPanel condition : conditions) {
-            condition.setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        if (evt != null) {
-            validations.put((ActionConditionDisplayPanel) evt.getSource(),
-                    (Boolean) evt.getNewValue());
-        }
-
-        boolean pass = true;
-        for (final boolean validation : validations.values()) {
-            if (!validation) {
-                pass = false;
-                break;
-            }
-        }
-
-        firePropertyChange("validationResult", validates, pass);
-        validates = pass;
-    }
-
-}

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

@@ -1,217 +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.actioneditor;
-
-import com.dmdirc.actions.ActionCondition;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ConditionTree;
-import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.UIManager;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action conditions panel.
- */
-public class ActionConditionsPanel extends JPanel implements ActionListener,
-        PropertyChangeListener {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    private final ActionManager actionManager;
-    /** Tree panel. */
-    private ActionConditionsTreePanel tree;
-    /** List Panel. */
-    private ActionConditionsListPanel list;
-    /** Add button. */
-    private JButton add;
-    /** tree validates? */
-    private boolean treeValidates = true;
-    /** list validates? */
-    private boolean listValidates = true;
-    /** Icon manager. */
-    private final IconManager iconManager;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     */
-    public ActionConditionsPanel(final ActionManager actionManager, final IconManager iconManager) {
-        this(actionManager, iconManager, null);
-    }
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     * @param trigger     Action trigger
-     */
-    public ActionConditionsPanel(final ActionManager actionManager, final IconManager iconManager,
-            final ActionType trigger) {
-
-        this.actionManager = actionManager;
-        this.iconManager = iconManager;
-        initComponents();
-        addListeners();
-        layoutComponents();
-
-        if (trigger == null) {
-            setEnabled(false);
-            add.setEnabled(false);
-        }
-    }
-
-    /** Validates the conditions. */
-    public void validateConditions() {
-        tree.validateConditions();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        tree = new ActionConditionsTreePanel(iconManager);
-        list = new ActionConditionsListPanel(actionManager, iconManager, tree);
-        add = new JButton("Add");
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        add.addActionListener(this);
-        tree.addPropertyChangeListener("validationResult", this);
-        list.addPropertyChangeListener("validationResult", this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 1, pack"));
-
-        setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Conditions"));
-
-        final JScrollPane sp = new JScrollPane(list);
-        sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-        sp.getVerticalScrollBar().setUnitIncrement(10);
-
-        add(tree, "growx, pushx");
-        add(new JSeparator(JSeparator.HORIZONTAL), "growx, pushx");
-        add(sp, "grow, push");
-        add(add, "right, gaptop push");
-    }
-
-    /**
-     * Sets the trigger for this conditions panel.
-     *
-     * @param trigger Action trigger.
-     */
-    public void setActionTrigger(final ActionType trigger) {
-        list.setTrigger(trigger);
-        add.setEnabled(trigger != null);
-        add.setEnabled(trigger != null && trigger.getType().getArgNames().length != 0);
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        tree.setEnabled(enabled);
-        list.setEnabled(enabled);
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        list.addCondition(new ActionCondition(-1, null, null, ""));
-    }
-
-    /**
-     * Sets the conditions.
-     *
-     * @param conditions conditions list
-     */
-    public void setConditions(final List<ActionCondition> conditions) {
-        list.clearConditions();
-
-        conditions.forEach(list::addCondition);
-    }
-
-    /**
-     * Sets the condition tree.
-     *
-     * @param conditionTree new condition tree
-     */
-    public void setConditionTree(final ConditionTree conditionTree) {
-        tree.setRule(list.getConditions().size(), conditionTree);
-    }
-
-    /**
-     * Gets the condition type.
-     *
-     * @return condition type
-     */
-    public ConditionTreeFactoryType getConditionTreeType() {
-        return tree.getRuleType(list.getConditions().size());
-    }
-
-    /**
-     * Gets the condition tree.
-     *
-     * @return condition tree
-     */
-    public ConditionTree getConditionTree() {
-        return tree.getRule(list.getConditions().size());
-    }
-
-    /**
-     * Returns the condition list.
-     *
-     * @return condition list
-     */
-    public List<ActionCondition> getConditions() {
-        return list.getConditions();
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        final boolean currentlyValidates = listValidates && treeValidates;
-        if (evt.getSource() == list) {
-            listValidates = (Boolean) evt.getNewValue();
-        } else {
-            treeValidates = (Boolean) evt.getNewValue();
-        }
-
-        firePropertyChange("validationResult", currentlyValidates,
-                listValidates && treeValidates);
-    }
-
-}

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

@@ -1,269 +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.actioneditor;
-
-import com.dmdirc.actions.ConditionTree;
-import com.dmdirc.actions.ConditionTreeFactory;
-import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
-import com.dmdirc.actions.validators.ConditionRuleValidator;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.ui.IconManager;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action conditions tree panel.
- */
-public class ActionConditionsTreePanel extends JPanel implements ActionListener,
-        PropertyChangeListener, DocumentListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Icon manager. */
-    private final IconManager iconManager;
-    /** Button group. */
-    private ButtonGroup group;
-    /** All triggers button. */
-    private JRadioButton allButton;
-    /** One trigger button. */
-    private JRadioButton oneButton;
-    /** Custom rule button. */
-    private JRadioButton customButton;
-    /** Custom rule field. */
-    private ValidatingJTextField rule;
-    /** Condition tree factory. */
-    private ConditionTreeFactory treeFactory;
-    /** Condition count. */
-    private int conditionCount = 0;
-    /** Condition rule validator. */
-    private ConditionRuleValidator treeValidator;
-    /** validates. */
-    private boolean validates = true;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     */
-    public ActionConditionsTreePanel(final IconManager iconManager) {
-
-        this.iconManager = iconManager;
-        initComponents();
-        addListeners();
-        layoutComponents();
-
-        selectTreeButton();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        group = new ButtonGroup();
-        allButton = new JRadioButton("All of the conditions are true");
-        oneButton = new JRadioButton("At least one of the conditions is true");
-        customButton = new JRadioButton("The conditions match a custom rule");
-        treeValidator = new ConditionRuleValidator(conditionCount);
-
-        rule = new ValidatingJTextField(iconManager, treeValidator);
-
-        group.add(allButton);
-        group.add(oneButton);
-        group.add(customButton);
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        allButton.addActionListener(this);
-        oneButton.addActionListener(this);
-        customButton.addActionListener(this);
-        rule.addPropertyChangeListener("validationResult", this);
-        rule.getDocument().addDocumentListener(this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 1, pack, hidemode 3"));
-        add(new TextLabel("Only execute this action if..."), "growx, pushx");
-        add(allButton, "growx, pushx");
-        add(oneButton, "growx, pushx");
-        add(customButton, "growx, pushx");
-        add(rule, "growx, pushx");
-    }
-
-    /**
-     * Selects the appropriate radio button for the tree.
-     */
-    private void selectTreeButton() {
-        group.clearSelection();
-        final ConditionTreeFactoryType type;
-        if (treeFactory == null) {
-            type = ConditionTreeFactoryType.CONJUNCTION;
-        } else {
-            type = treeFactory.getType();
-        }
-
-        switch (type) {
-            case CONJUNCTION:
-                allButton.setSelected(true);
-                rule.setText("");
-                rule.setEnabled(false);
-                break;
-            case DISJUNCTION:
-                oneButton.setSelected(true);
-                rule.setText("");
-                rule.setEnabled(false);
-                break;
-            case CUSTOM:
-                customButton.setSelected(true);
-                rule.setText(treeFactory.getConditionTree(conditionCount).
-                        toString());
-                rule.setEnabled(true);
-                break;
-            default:
-                allButton.setSelected(true);
-                rule.setText("");
-                rule.setEnabled(false);
-                break;
-        }
-
-        sortTreeFactory();
-    }
-
-    /** Sorts the tree factory out. */
-    private void sortTreeFactory() {
-        if (group.getSelection().equals(allButton.getModel())) {
-            treeFactory = new ConditionTreeFactory.ConjunctionFactory();
-            firePropertyChange("validationResult", validates, true);
-        } else if (group.getSelection().equals(oneButton.getModel())) {
-            treeFactory = new ConditionTreeFactory.DisjunctionFactory();
-            firePropertyChange("validationResult", validates, true);
-            validates = true;
-        } else {
-            treeFactory = new ConditionTreeFactory.CustomFactory(ConditionTree.parseString(rule.
-                    getText()));
-            rule.checkError();
-        }
-
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        rule.setEnabled(e.getSource().equals(customButton));
-        sortTreeFactory();
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        allButton.setEnabled(enabled);
-        oneButton.setEnabled(enabled);
-        customButton.setEnabled(enabled);
-    }
-
-    /**
-     * Returns the selected rule type.
-     *
-     * @param conditionCount Condition count
-     *
-     * @return Selected rule type
-     */
-    public ConditionTreeFactoryType getRuleType(final int conditionCount) {
-        return treeFactory.getType();
-    }
-
-    /**
-     * Returns the current custom rule.
-     *
-     * @param conditionCount number of conditions
-     *
-     * @return Custom rule
-     */
-    public ConditionTree getRule(final int conditionCount) {
-        treeFactory.getConditionTree(conditionCount);
-        return treeFactory.getConditionTree(conditionCount);
-    }
-
-    /**
-     * Sets the tree rule.
-     *
-     * @param conditionCount condition count
-     * @param tree           new condition tree
-     */
-    public void setRule(final int conditionCount, final ConditionTree tree) {
-        if (tree != null) {
-            this.conditionCount = conditionCount;
-            treeFactory = ConditionTreeFactory.getFactory(tree, conditionCount);
-            selectTreeButton();
-        }
-    }
-
-    /**
-     * Sets the new condition count.
-     *
-     * @param conditionCount new condition count.
-     */
-    public void setConditionCount(final int conditionCount) {
-        this.conditionCount = conditionCount;
-        treeValidator.setArgs(conditionCount);
-        rule.checkError();
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        firePropertyChange("validationResult", validates, evt.getNewValue());
-        validates = (Boolean) evt.getNewValue();
-    }
-
-    /** Validates the conditions. */
-    public void validateConditions() {
-        selectTreeButton();
-    }
-
-    @Override
-    public void insertUpdate(final DocumentEvent e) {
-        treeFactory = new ConditionTreeFactory.CustomFactory(ConditionTree.parseString(rule.
-                getText()));
-    }
-
-    @Override
-    public void removeUpdate(final DocumentEvent e) {
-        treeFactory = new ConditionTreeFactory.CustomFactory(ConditionTree.parseString(rule.
-                getText()));
-    }
-
-    @Override
-    public void changedUpdate(final DocumentEvent e) {
-        //Ignore
-    }
-
-}

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

@@ -1,315 +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.actioneditor;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ActionStatus;
-import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
-
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.JButton;
-import javax.swing.SwingUtilities;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Action editor dialog.
- */
-public class ActionEditorDialog extends StandardDialog implements ActionListener,
-        PropertyChangeListener {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ActionEditorDialog.class);
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    private final ActionManager actionManager;
-    /** Name panel. */
-    private ActionNamePanel name;
-    /** Triggers panel. */
-    private ActionTriggersPanel triggers;
-    /** Response panel. */
-    private ActionResponsePanel response;
-    /** Conditions panel. */
-    private ActionConditionsPanel conditions;
-    /** Substitutions panel. */
-    private ActionSubstitutionsPanel substitutions;
-    /** Advanced panel. */
-    private ActionAdvancedPanel advanced;
-    /** Show substitutions button. */
-    private JButton showSubstitutions;
-    /** Show advanced button. */
-    private JButton showAdvanced;
-    /** Is the name valid? */
-    private boolean nameValid = false;
-    /** Are the triggers valid? */
-    private boolean triggersValid = false;
-    /** Are the conditions valid? */
-    private boolean conditionsValid = false;
-    /** Action to be edited. */
-    private final Action action;
-    /** Action group. */
-    private final String group;
-    /** Factory to use to create new actions. */
-    private final ActionFactory actionFactory;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager   Icon manager
-     * @param config        Config
-     * @param subsFactory   Actions substitution factory
-     * @param actionFactory Actions factory
-     * @param parentWindow  Parent window
-     * @param group         Action's group
-     */
-    public ActionEditorDialog(
-            final ActionManager actionManager,
-            final IconManager iconManager,
-            final ColourManagerFactory colourManagerFactory,
-            final AggregateConfigProvider config,
-            final ActionSubstitutorFactory subsFactory,
-            final ActionFactory actionFactory,
-            final ActionsManagerDialog parentWindow,
-            final String group) {
-        super(parentWindow, ModalityType.DOCUMENT_MODAL);
-        LOG.debug("loading with group: " + group);
-        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        setTitle("Action Editor");
-
-        this.actionManager = actionManager;
-        this.group = group;
-        this.action = null;
-        this.actionFactory = actionFactory;
-
-        initComponents(iconManager, config, subsFactory, colourManagerFactory);
-        addListeners();
-        doComponents();
-        layoutComponents();
-
-        setResizable(false);
-    }
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager   Icon manager
-     * @param config        Config
-     * @param subsFactory   Actions substitution factory
-     * @param actionFactory Actions factory
-     * @param parentWindow  Parent window
-     * @param action        Action to be edited
-     */
-    public ActionEditorDialog(
-            final ActionManager actionManager,
-            final IconManager iconManager,
-            final ColourManagerFactory colourManagerFactory,
-            final AggregateConfigProvider config,
-            final ActionSubstitutorFactory subsFactory,
-            final ActionFactory actionFactory,
-            final ActionsManagerDialog parentWindow,
-            final Action action) {
-        super(parentWindow, ModalityType.DOCUMENT_MODAL);
-        LOG.debug("loading with action: " + action);
-        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        setTitle("Action Editor");
-
-        this.actionManager = actionManager;
-        this.group = action.getGroup();
-        this.action = action;
-        this.actionFactory = actionFactory;
-
-        initComponents(iconManager, config, subsFactory, colourManagerFactory);
-        addListeners();
-        doComponents();
-        layoutComponents();
-
-        setResizable(false);
-    }
-
-    /** Sets components initial states and stuff. */
-    private void doComponents() {
-        triggers.setEnabled(action != null);
-        response.setEnabled(action != null);
-        conditions.setEnabled(action != null);
-        substitutions.setVisible(false);
-        advanced.setVisible(false);
-
-        triggersValid = action != null;
-        conditionsValid = true;
-        nameValid = action != null;
-        getOkButton().setEnabled(action != null);
-
-        if (action != null) {
-            name.setActionName(action.getName());
-            triggers.setTriggers(action.getTriggers());
-            response.setResponse(action.getResponse());
-            response.setFormatter(action.getNewFormat());
-            conditions.setActionTrigger(action.getTriggers()[0]);
-            conditions.setConditions(action.getConditions());
-            conditions.setConditionTree(action.getRealConditionTree());
-            advanced.setActionEnabled(action.getStatus() != ActionStatus.DISABLED);
-            advanced.setConcurrencyGroup(action.getConcurrencyGroup());
-            advanced.setActionStopped(action.isStopping());
-        }
-    }
-
-    /** Initialises the components. */
-    private void initComponents(final IconManager iconManager,
-            final AggregateConfigProvider config, final ActionSubstitutorFactory subsFactory,
-            final ColourManagerFactory colourManagerFactory) {
-        orderButtons(new JButton(), new JButton());
-        name = new ActionNamePanel(actionManager, iconManager, "", group);
-        triggers = new ActionTriggersPanel(actionManager, iconManager);
-        response = new ActionResponsePanel(iconManager, colourManagerFactory, config);
-        conditions = new ActionConditionsPanel(actionManager, iconManager);
-        substitutions = new ActionSubstitutionsPanel(subsFactory);
-        advanced = new ActionAdvancedPanel();
-        showSubstitutions = new JButton("Show Substitutions");
-        showAdvanced = new JButton("Show Advanced Options");
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        showSubstitutions.addActionListener(this);
-        showAdvanced.addActionListener(this);
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
-
-        name.addPropertyChangeListener("validationResult", this);
-        triggers.addPropertyChangeListener("validationResult", this);
-        conditions.addPropertyChangeListener("validationResult", this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setMinimumSize(new Dimension(800, 600));
-        setLayout(new MigLayout("fill, hidemode 3, wrap 2, pack, hmax 80sp," + "wmin 800, wmax 800"));
-
-        add(name, "grow, w 50%");
-        add(conditions, "spany 3, grow, pushx, w 50%");
-        add(triggers, "grow, w 50%");
-        add(response, "grow, pushy, w 50%");
-        add(substitutions, "spanx, grow, push");
-        add(advanced, "spanx, grow, push");
-        add(showSubstitutions, "left, sgx button, split 2");
-        add(showAdvanced, "left, sgx button");
-        add(getLeftButton(), "right, sgx button, gapleft push, split");
-        add(getRightButton(), "right, sgx button");
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource().equals(showSubstitutions)) {
-            substitutions.setVisible(!substitutions.isVisible());
-            showSubstitutions
-                    .setText(substitutions.isVisible() ? "Hide Substitutions"
-                            : "Show Substitutions");
-            pack();
-        } else if (e.getSource().equals(showAdvanced)) {
-            advanced.setVisible(!advanced.isVisible());
-            showAdvanced.setText(advanced.isVisible() ? "Hide Advanced Options"
-                    : "Show Advanced Options");
-        } else if (e.getSource().equals(getOkButton())) {
-            save();
-            dispose();
-        } else if (e.getSource().equals(getCancelButton())) {
-            dispose();
-        }
-    }
-
-    @Override
-    public void validate() {
-        super.validate();
-
-        SwingUtilities.invokeLater(this::centreOnOwner);
-    }
-
-    /** Saves the action being edited. */
-    private void save() {
-        name.getActionName();
-        triggers.getTriggers();
-        response.getResponse();
-        response.getFormatter();
-        conditions.getConditions();
-        conditions.getConditionTree();
-        if (action == null) {
-            final Action newAction = actionFactory.getAction(group, name.getActionName(),
-                    triggers.getTriggers(), response.getResponse(),
-                    conditions.getConditions(), conditions.getConditionTree(),
-                    response.getFormatter());
-            newAction.setConcurrencyGroup(advanced.getConcurrencyGroup());
-            newAction.setEnabled(advanced.isActionEnabled());
-            newAction.setStopping(advanced.isActionStopped());
-        } else {
-            action.setName(name.getActionName());
-            action.setConditionTree(conditions.getConditionTree());
-            action.setConditions(conditions.getConditions());
-            action.setNewFormat(response.getFormatter());
-            action.setResponse(response.getResponse());
-            action.setTriggers(triggers.getTriggers());
-            action.setConcurrencyGroup(advanced.getConcurrencyGroup());
-            action.setEnabled(advanced.isActionEnabled());
-            action.setStopping(advanced.isActionStopped());
-            action.save();
-        }
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        if (evt.getSource().equals(name)) {
-            nameValid = (Boolean) evt.getNewValue();
-            triggers.setEnabled((Boolean) evt.getNewValue());
-            conditions.setEnabled((Boolean) evt.getNewValue());
-            response.setEnabled((Boolean) evt.getNewValue());
-        } else if (evt.getSource().equals(triggers)) {
-            triggersValid = (Boolean) evt.getNewValue();
-
-            response.setEnabled((Boolean) evt.getNewValue());
-            conditions.setEnabled((Boolean) evt.getNewValue());
-            substitutions.setEnabled((Boolean) evt.getNewValue());
-            advanced.setEnabled((Boolean) evt.getNewValue());
-
-            substitutions.setType(triggers.getPrimaryTrigger());
-            conditions.setActionTrigger(triggers.getPrimaryTrigger());
-        } else if (evt.getSource().equals(conditions)) {
-            conditionsValid = (Boolean) evt.getNewValue();
-        }
-
-        getOkButton().setEnabled(triggersValid && conditionsValid && nameValid);
-    }
-
-}

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

@@ -1,81 +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.actioneditor;
-
-import com.dmdirc.ClientModule;
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * Factory for {@link ActionEditorDialog}s.
- */
-@Singleton
-public class ActionEditorDialogFactory {
-
-    private final IconManager iconManager;
-    private final AggregateConfigProvider config;
-    private final ActionSubstitutorFactory subsFactory;
-    private final ActionFactory actionFactory;
-    private final ColourManagerFactory colourManagerFactory;
-    private final ActionManager actionManager;
-
-    @Inject
-    public ActionEditorDialogFactory(
-            final ActionManager actionManager,
-            @ClientModule.GlobalConfig final IconManager iconManager,
-            @ClientModule.GlobalConfig final AggregateConfigProvider config,
-            final ActionSubstitutorFactory subsFactory,
-            final ActionFactory actionFactory,
-            final ColourManagerFactory colourManagerFactory) {
-        this.actionManager = actionManager;
-        this.iconManager = iconManager;
-        this.config = config;
-        this.subsFactory = subsFactory;
-        this.actionFactory = actionFactory;
-        this.colourManagerFactory = colourManagerFactory;
-    }
-
-    public ActionEditorDialog getActionEditorDialog(
-            final ActionsManagerDialog parentWindow,
-            final String group) {
-        return new ActionEditorDialog(actionManager, iconManager, colourManagerFactory, config,
-                subsFactory, actionFactory, parentWindow, group);
-    }
-
-    public ActionEditorDialog getActionEditorDialog(
-            final ActionsManagerDialog parentWindow,
-            final Action action) {
-        return new ActionEditorDialog(actionManager, iconManager, colourManagerFactory, config,
-                subsFactory, actionFactory, parentWindow, action);
-    }
-
-}

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

@@ -1,173 +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.actioneditor;
-
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.validators.ActionNameValidator;
-import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.validators.FileNameValidator;
-import com.dmdirc.util.validators.ValidatorChain;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action name panel.
- */
-public class ActionNamePanel extends JPanel implements PropertyChangeListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Original name. */
-    private String existingName;
-    /** Action name field. */
-    private ValidatingJTextField name;
-    /** Action group. */
-    private final ActionGroup group;
-    /** Icon manager. */
-    private final IconManager iconManager;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     * @param group       Associated group for this action
-     */
-    public ActionNamePanel(final ActionController actionManager, final IconManager iconManager,
-            final String group) {
-        this(actionManager, iconManager, "", group);
-    }
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     * @param name        Initial name of the action
-     * @param group       Associated group for this action
-     */
-    public ActionNamePanel(final ActionController actionManager, final IconManager iconManager,
-            final String name, final String group) {
-
-        if (name == null) {
-            this.existingName = "";
-        } else {
-            this.existingName = name;
-        }
-        this.iconManager = iconManager;
-        this.group = actionManager.getOrCreateGroup(group);
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-        this.name.checkError();
-    }
-
-    /**
-     * Sets the action name.
-     *
-     * @param newName new name
-     */
-    void setActionName(final String newName) {
-        if (newName == null) {
-            this.existingName = "";
-        } else {
-            this.existingName = newName;
-        }
-        name.setValidator(ValidatorChain.<String>builder()
-                .addValidator(new FileNameValidator())
-                .addValidator(new ActionNameValidator(group, existingName))
-                .build());
-        this.name.setText(newName);
-    }
-
-    /** Validates the name. */
-    public void validateName() {
-        name.checkError();
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        name = new ValidatingJTextField(iconManager,
-                existingName,
-                ValidatorChain.<String>builder()
-                .addValidator(new FileNameValidator())
-                .addValidator(new ActionNameValidator(group, existingName))
-                .build());
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        name.addPropertyChangeListener("validationResult", this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("wrap 1"));
-
-        setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Name"));
-
-        add(new JLabel("This action's name:"));
-        add(name, "growx, pushx");
-    }
-
-    /**
-     * Has the action's name changed.
-     *
-     * @return true if the action name has changed.
-     *
-     */
-    public boolean hasNameChanged() {
-        return getActionName().equals(existingName);
-    }
-
-    /**
-     * Returns the name represented by this component.
-     *
-     * @return Current name of this action
-     */
-    public String getActionName() {
-        return name.getText();
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        name.setEnabled(enabled);
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        firePropertyChange("validationResult", evt.getOldValue(), evt.
-                getNewValue());
-    }
-
-}

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

@@ -1,179 +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.actioneditor;
-
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.ColourManagerFactory;
-
-import java.util.Collection;
-import java.util.TreeSet;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.MutableComboBoxModel;
-import javax.swing.UIManager;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action response panel.
- */
-public class ActionResponsePanel extends JPanel {
-
-    /** Serial version UID. */
-    private static final long serialVersionUID = 1;
-    /** Response text area. */
-    private JTextArea response;
-    /** Formatter combo box. */
-    private JComboBox<String> formatter;
-    /** Response scrollpane. */
-    private JScrollPane scrollPane;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon manager
-     * @param config      Config
-     */
-    public ActionResponsePanel(final IconManager iconManager,
-            final ColourManagerFactory colourManagerFactory, final AggregateConfigProvider config) {
-        initComponents(iconManager, colourManagerFactory, config);
-        addListeners();
-        layoutComponents();
-    }
-
-    private void initComponents(final IconManager iconManager,
-            final ColourManagerFactory colourManagerFactory, final AggregateConfigProvider config) {
-        response = new TextAreaInputField(iconManager, colourManagerFactory, config, "");
-        scrollPane = new JScrollPane(response);
-        response.setRows(4);
-        formatter = new JComboBox<>(new DefaultComboBoxModel<>());
-
-        final MutableComboBoxModel<String> model =
-                (MutableComboBoxModel<String>) formatter.getModel();
-        model.addElement("No change");
-        model.addElement("No response");
-
-        final Collection<String> formatters = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-        formatters.addAll(config.getOptions("formatter").keySet());
-
-        formatters.forEach(model::addElement);
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Response"));
-        setLayout(new MigLayout("fill, wrap 1"));
-
-        add(new JLabel("Execute these commands: "));
-        add(scrollPane, "grow, push");
-        add(new JLabel("Alter the event's formatter"));
-        add(formatter, "growx, pushx");
-    }
-
-    /**
-     * Sets the response.
-     *
-     * @param response new response
-     */
-    public void setResponse(final String... response) {
-        if (response == null) {
-            this.response.setText("");
-        } else {
-            final StringBuilder sb = new StringBuilder();
-            for (String responseLine : response) {
-                responseLine = responseLine.replace("\n", "\\n");
-                sb.append(responseLine).append('\n');
-            }
-            if (sb.length() > 0) {
-                this.response.setText(sb.substring(0, sb.length() - 1));
-            }
-        }
-        UIUtilities.resetScrollPane(scrollPane);
-    }
-
-    /**
-     * Sets the new formatter for the response panel.
-     *
-     * @param newFormat new formatter.
-     */
-    public void setFormatter(final String newFormat) {
-        if (newFormat == null) {
-            formatter.setSelectedIndex(0);
-        } else if (newFormat.isEmpty()) {
-            formatter.setSelectedIndex(1);
-        } else {
-            formatter.setSelectedItem(newFormat);
-        }
-    }
-
-    /**
-     * Returns the current response.
-     *
-     * @return Response text
-     */
-    public String[] getResponse() {
-        final String[] text = response.getText().split("\n");
-        for (int i = 0; i < text.length; i++) {
-            text[i] = text[i].replace("\\n", "\n");
-        }
-        return text;
-    }
-
-    /**
-     * Returns the current formatter.
-     *
-     * @return Formatter text
-     */
-    public String getFormatter() {
-        final String newFormat = (String) formatter.getSelectedItem();
-        switch (newFormat) {
-            case "No change":
-                return null;
-            case "No response":
-                return "";
-            default:
-                return newFormat;
-        }
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        response.setEnabled(enabled);
-        formatter.setEnabled(enabled);
-    }
-
-}

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

@@ -1,95 +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.actioneditor;
-
-import com.dmdirc.actions.ActionSubstitutor;
-import com.dmdirc.actions.ActionSubstitutorFactory;
-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.stream.Collectors;
-
-import javax.swing.SwingUtilities;
-
-/**
- * Action substitutions panel
- */
-public class ActionSubstitutionsPanel 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 ActionSubstitutionsPanel(final ActionSubstitutorFactory substitutorFactory) {
-        super("Substitutions may be used in the response and target fields",
-                SubstitutionsPanel.Alignment.VERTICAL,
-                null);
-
-        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(() -> {
-            substitutions = new ArrayList<>();
-
-            if (type != null) {
-                final ActionSubstitutor sub = substitutorFactory.getActionSubstitutor(type);
-
-                substitutions.addAll(sub.getComponentSubstitutions().
-                        entrySet().stream()
-                        .map(entry -> new SubstitutionLabel(
-                                new Substitution(entry.getValue(), entry.getKey())))
-                        .collect(Collectors.toList()));
-
-                substitutions.addAll(sub.getConfigSubstitutions().stream()
-                        .map(entry -> new SubstitutionLabel(new Substitution(entry, entry)))
-                        .collect(Collectors.toList()));
-
-                substitutions.addAll(sub.getServerSubstitutions().entrySet().stream()
-                        .map(entry -> new SubstitutionLabel(
-                                new Substitution(entry.getValue(), entry.getKey())))
-                        .collect(Collectors.toList()));
-            }
-
-            layoutComponents();
-            validate();
-            layoutComponents();
-        });
-    }
-
-}

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

@@ -1,39 +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.actioneditor;
-
-import com.dmdirc.interfaces.actions.ActionType;
-
-/**
- * Action trigger removal listener.
- */
-public interface ActionTriggerRemovalListener {
-
-    /**
-     * A trigger was removed from the list.
-     *
-     * @param trigger Removed trigger
-     */
-    void triggerRemoved(ActionType trigger);
-
-}

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

@@ -1,239 +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.actioneditor;
-
-import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.collections.ListenerList;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action triggers list panel.
- */
-public class ActionTriggersListPanel extends JPanel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Trigger list. */
-    private final List<ActionType> triggers;
-    /** Listeners. */
-    private final ListenerList listeners = new ListenerList();
-    /** Icon manager. */
-    private final IconManager iconManager;
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon Manager
-     */
-    public ActionTriggersListPanel(final IconManager iconManager) {
-        this(iconManager, new ArrayList<>());
-    }
-
-    /**
-     * Instantiates the panel.
-     *
-     * @param iconManager Icon Manager
-     * @param triggers    Trigger list
-     */
-    public ActionTriggersListPanel(final IconManager iconManager,
-            final List<ActionType> triggers) {
-
-        this.iconManager = iconManager;
-        this.triggers = new ArrayList<>(triggers);
-
-        initComponents();
-        layoutComponents();
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents() {
-        setOpaque(false);
-        setLayout(new MigLayout("fillx, wrap 2"));
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        synchronized (triggers) {
-            setVisible(false);
-
-            removeAll();
-
-            for (final ActionType trigger : triggers) {
-                final ImageButton<?> button = new ImageButton<>(
-                        "delete", iconManager.getIcon("close-inactive"),
-                        iconManager.getIcon("close-active"));
-                button.addActionListener(e -> delTrigger(trigger));
-
-                button.setEnabled(isEnabled());
-
-                add(new JLabel(trigger.getName()), "growx, pushx");
-                add(button, "right");
-            }
-
-            if (triggers.isEmpty()) {
-                if (isEnabled()) {
-                    add(new TextLabel("<b>Select a trigger and click Add.</b>"));
-                } else {
-                    add(new TextLabel("No Triggers."));
-                }
-            }
-            setVisible(true);
-        }
-    }
-
-    /**
-     * Adds a trigger to the list.
-     *
-     * @param trigger Trigger to add
-     */
-    public void addTrigger(final ActionType trigger) {
-        SwingUtilities.invokeLater(() -> {
-            synchronized (triggers) {
-                triggers.add(trigger);
-                firePropertyChange("triggerCount", triggers.size() - 1,
-                        triggers.size());
-
-                layoutComponents();
-            }
-        });
-    }
-
-    /**
-     * Deletes a trigger from the list.
-     *
-     * @param trigger Trigger to delete
-     */
-    public void delTrigger(final ActionType trigger) {
-        SwingUtilities.invokeLater(() -> {
-            synchronized (triggers) {
-                triggers.remove(trigger);
-                fireTriggerRemoved(trigger);
-                firePropertyChange("triggerCount", triggers.size() + 1,
-                        triggers.size());
-
-                layoutComponents();
-            }
-        });
-    }
-
-    /**
-     * Clears the trigger list.
-     */
-    public void clearTriggers() {
-        triggers.forEach(this::delTrigger);
-    }
-
-    /**
-     * Returns the current list of triggers.
-     *
-     * @return Trigger list
-     */
-    public List<ActionType> getTriggers() {
-        synchronized (triggers) {
-            return triggers;
-        }
-    }
-
-    /**
-     * Gets the trigger at the specified index.
-     *
-     * @param index Index to retrieve
-     *
-     * @return Requested action trigger
-     */
-    public ActionType getTrigger(final int index) {
-        return triggers.get(index);
-    }
-
-    /**
-     * Returns the number of triggers.
-     *
-     * @return Trigger count
-     */
-    public int getTriggerCount() {
-        synchronized (triggers) {
-            return triggers.size();
-        }
-    }
-
-    /**
-     * Adds an ActionTriggerRemovalListener to the listener list.
-     *
-     * @param listener Listener to add
-     */
-    public void addTriggerListener(
-            final ActionTriggerRemovalListener listener) {
-        if (listener == null) {
-            return;
-        }
-
-        listeners.add(ActionTriggerRemovalListener.class, listener);
-    }
-
-    /**
-     * Removes an ActionTriggerRemovalListener from the listener list.
-     *
-     * @param listener Listener to remove
-     */
-    public void removeTriggerListener(
-            final ActionTriggerRemovalListener listener) {
-        listeners.remove(ActionTriggerRemovalListener.class, listener);
-    }
-
-    /**
-     * Fired when the an action trigger is removed.
-     *
-     * @param type Removed trigger
-     */
-    protected void fireTriggerRemoved(final ActionType type) {
-        for (final ActionTriggerRemovalListener listener : listeners.get(
-                ActionTriggerRemovalListener.class)) {
-            listener.triggerRemoved(type);
-        }
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        super.setEnabled(enabled);
-        SwingUtilities.invokeLater(this::layoutComponents);
-    }
-
-    /** Validates the triggers. */
-    public void validateTriggers() {
-        firePropertyChange("triggerCount", triggers.size(), triggers.size());
-    }
-
-}

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

@@ -1,305 +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.actioneditor;
-
-import com.dmdirc.actions.ActionTypeComparator;
-import com.dmdirc.addons.ui_swing.ComboBoxWidthModifier;
-import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.collections.MapList;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.MutableComboBoxModel;
-import javax.swing.UIManager;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action triggers panel.
- */
-public class ActionTriggersPanel extends JPanel implements ActionListener,
-        ActionTriggerRemovalListener, PropertyChangeListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Action controller. */
-    private final ActionController actionController;
-    /** Trigger combo box. */
-    private JComboBox<Object> triggerGroup;
-    /** Trigger combo box. */
-    private JComboBox<Object> triggerItem;
-    /** Triggers list. */
-    private ActionTriggersListPanel triggerList;
-    /** Are we internally changing the combo boxes? */
-    private boolean comboChange;
-    /** Triggers compatible with the currently added triggers. */
-    private final List<ActionType> compatibleTriggers;
-
-    /**
-     * Instantiates the panel.
-     */
-    public ActionTriggersPanel(final ActionController actionController,
-            final IconManager iconManager) {
-
-        this.actionController = actionController;
-        compatibleTriggers = new ArrayList<>();
-
-        initComponents(iconManager);
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Initialises the components.
-     *
-     * @param iconManager Icon manager
-     * */
-    private void initComponents(final IconManager iconManager) {
-        setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Triggers"));
-
-        triggerGroup = new JComboBox<>(new DefaultComboBoxModel<>());
-        // Only fire events on selection not on highlight
-        triggerGroup.putClientProperty("JComboBox.isTableCellEditor",
-                Boolean.TRUE);
-        triggerGroup.setRenderer(new ActionTypeRenderer(triggerGroup.getRenderer()));
-        triggerGroup.addPopupMenuListener(new ComboBoxWidthModifier());
-
-        triggerItem = new JComboBox<>(new DefaultComboBoxModel<>());
-        // Only fire events on selection not on highlight
-        triggerItem.putClientProperty("JComboBox.isTableCellEditor",
-                Boolean.TRUE);
-        triggerItem.setRenderer(new ActionTypeRenderer(triggerItem.getRenderer()));
-        triggerItem.addPopupMenuListener(new ComboBoxWidthModifier());
-
-        triggerList = new ActionTriggersListPanel(iconManager);
-        addAll(actionController.getGroupedTypes());
-    }
-
-    /** Adds the listeners. */
-    private void addListeners() {
-        triggerGroup.addActionListener(this);
-        triggerItem.addActionListener(this);
-        triggerList.addTriggerListener(this);
-
-        triggerList.addPropertyChangeListener("triggerCount", this);
-    }
-
-    /** Lays out the components. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, pack, wmax 50%"));
-
-        add(new TextLabel("This action will be triggered when any of these "
-                + "events occurs: "), "growx, pushx, wrap, spanx");
-        add(triggerList, "grow, push, wrap, spanx");
-        add(triggerGroup, "growx, wmax 50%-(4*rel), wmin 50%-(4*rel)");
-        add(triggerItem, "growx, wmax 50%-(4*rel), wmin 50%-(4*rel)");
-    }
-
-    /**
-     * Returns the primary trigger for this panel.
-     *
-     * @return Primary trigger or null
-     */
-    public ActionType getPrimaryTrigger() {
-        if (triggerList.getTriggerCount() == 0) {
-            return null;
-        }
-        return triggerList.getTrigger(0);
-    }
-
-    /**
-     * Returns the list of triggers.
-     *
-     * @return Trigger list
-     */
-    public ActionType[] getTriggers() {
-        final List<ActionType> triggers = triggerList.getTriggers();
-        return triggers.toArray(new ActionType[triggers.size()]);
-    }
-
-    /**
-     * Sets the triggers.
-     *
-     * @param triggers Sets the triggers.
-     */
-    public void setTriggers(final ActionType... triggers) {
-        triggerList.clearTriggers();
-
-        for (final ActionType localTrigger : triggers) {
-            triggerList.addTrigger(localTrigger);
-        }
-
-        if (triggers.length > 0) {
-            addCompatible(triggers[0]);
-            setEnabled(true);
-        }
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (comboChange) {
-            return;
-        }
-        if (e.getSource() == triggerGroup) {
-            if (triggerList.getTriggerCount() == 0) {
-                addList(actionController.getGroupedTypes()
-                        .get((String) triggerGroup.getSelectedItem()));
-            } else {
-                addList(compatibleTriggers);
-            }
-        } else {
-            triggerList.addTrigger((ActionType) triggerItem.getSelectedItem());
-            addCompatible((ActionType) triggerItem.getSelectedItem());
-        }
-    }
-
-    @Override
-    public void triggerRemoved(final ActionType trigger) {
-        if (triggerList.getTriggerCount() == 0) {
-            addAll(actionController.getGroupedTypes());
-        } else {
-            addCompatible(triggerList.getTrigger(0));
-        }
-    }
-
-    private void addAll(final MapList<String, ActionType> mapList) {
-        comboChange = true;
-        compatibleTriggers.clear();
-        final DefaultComboBoxModel<Object> triggerModel
-                = (DefaultComboBoxModel<Object>) triggerGroup.getModel();
-        triggerModel.removeAllElements();
-        ((DefaultComboBoxModel<Object>) triggerItem.getModel()).removeAllElements();
-        for (final Map.Entry<String, List<ActionType>> entry : mapList
-                .entrySet()) {
-            triggerModel.addElement(entry.getKey());
-        }
-        triggerGroup.setSelectedIndex(-1);
-        triggerGroup.setEnabled(triggerGroup.getModel().getSize() > 0);
-        triggerItem.setEnabled(triggerItem.getModel().getSize() > 0);
-        comboChange = false;
-    }
-
-    /**
-     * Populates the combo boxes with triggers compatible with the specified type.
-     *
-     * @param primaryType Primary type
-     */
-    private void addCompatible(final ActionType primaryType) {
-        final DefaultComboBoxModel<Object> groupModel = (DefaultComboBoxModel<Object>) triggerGroup.
-                getModel();
-        final DefaultComboBoxModel<Object> itemModel = (DefaultComboBoxModel<Object>) triggerItem.
-                getModel();
-
-        comboChange = true;
-        compatibleTriggers.clear();
-        groupModel.removeAllElements();
-        itemModel.removeAllElements();
-        final List<ActionType> types = triggerList.getTriggers();
-
-        actionController.findCompatibleTypes(primaryType).stream()
-                .filter(thisType -> !types.contains(thisType))
-                .forEach(thisType -> {
-                    compatibleTriggers.add(thisType);
-                    itemModel.addElement(thisType);
-                    if (groupModel.getIndexOf(thisType.getType().getGroup()) == -1) {
-                        groupModel.addElement(thisType.getType().getGroup());
-                    }
-                });
-        triggerGroup.setSelectedIndex(-1);
-        triggerItem.setSelectedIndex(-1);
-        if (itemModel.getSize() == 0) {
-            groupModel.removeAllElements();
-        }
-        triggerGroup.setEnabled(groupModel.getSize() > 0);
-        if (groupModel.getSize() == 1) {
-            triggerGroup.setSelectedIndex(0);
-        }
-
-        triggerItem.setEnabled(itemModel.getSize() > 0);
-        triggerItem.setEnabled(triggerGroup.getSelectedIndex() != -1);
-
-        comboChange = false;
-    }
-
-    /**
-     * Adds the specified list of triggers to the items list.
-     *
-     * @param list List of triggers to add
-     */
-    private void addList(final List<ActionType> list) {
-        comboChange = true;
-        ((DefaultComboBoxModel<Object>) triggerItem.getModel()).removeAllElements();
-        Collections.sort(list, new ActionTypeComparator());
-        list.stream()
-                .filter(entry -> compatibleTriggers.isEmpty() || compatibleTriggers.contains(entry))
-                .forEach(((MutableComboBoxModel<Object>) triggerItem.getModel())::addElement);
-        triggerItem.setSelectedIndex(-1);
-        triggerGroup.setEnabled(triggerGroup.getModel().getSize() > 0);
-        triggerItem.setEnabled(triggerItem.getModel().getSize() > 0);
-        comboChange = false;
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        triggerList.setEnabled(enabled);
-        if (enabled) {
-            if (triggerGroup.getModel().getSize() > 0) {
-                triggerGroup.setEnabled(true);
-            }
-            if (triggerItem.getModel().getSize() > 0) {
-                triggerItem.setEnabled(true);
-            }
-        } else {
-            triggerGroup.setEnabled(false);
-            triggerItem.setEnabled(false);
-        }
-    }
-
-    @Override
-    public void propertyChange(final PropertyChangeEvent evt) {
-        firePropertyChange("validationResult", (Integer) evt.getOldValue() > 0,
-                (Integer) evt.getNewValue() > 0);
-    }
-
-    /** Validates the triggers. */
-    public void validateTriggers() {
-        triggerList.validateTriggers();
-    }
-
-}

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

@@ -1,116 +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.actioneditor;
-
-import com.dmdirc.actions.ActionTypeComparator;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.util.collections.MapList;
-
-import java.awt.FontMetrics;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.SwingUtilities;
-
-/**
- * Model for the "trigger" list of the actions editor. Adds type group headers, and ensures they
- * can't be selected.
- */
-public final class ActionTypeModel extends DefaultComboBoxModel<Object> {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Font metrics. */
-    private final FontMetrics fm;
-    /** Max Width. */
-    private int maxWidth = -1;
-
-    /**
-     * Creates a new instance of ActionTypeModel.
-     *
-     * @param fm         Font metrics
-     * @param typeGroups The action type groups to use
-     */
-    public ActionTypeModel(final FontMetrics fm, final MapList<String, ActionType> typeGroups) {
-
-        this.fm = fm;
-
-        for (Map.Entry<String, List<ActionType>> entry : typeGroups.entrySet()) {
-            addElement(entry.getKey());
-
-            final List<ActionType> types = entry.getValue();
-            Collections.sort(types, new ActionTypeComparator());
-
-            types.forEach(this::addElement);
-        }
-    }
-
-    @Override
-    public void addElement(final Object anObject) {
-        super.addElement(anObject);
-        int width = maxWidth;
-        if (anObject instanceof String) {
-            width = SwingUtilities.computeStringWidth(fm, (String) anObject);
-        } else if (anObject instanceof ActionType) {
-            width = SwingUtilities.computeStringWidth(fm, ((ActionType) anObject).getName());
-        }
-        maxWidth = Math.max(width, maxWidth);
-    }
-
-    @Override
-    public void setSelectedItem(final Object anObject) {
-        if (!(anObject instanceof String)) {
-            super.setSelectedItem(anObject);
-        }
-    }
-
-    /**
-     * Sets the type group for this model.
-     *
-     * @param typeGroup New type group
-     */
-    public void setTypeGroup(final MapList<String, ActionType> typeGroup) {
-        removeAllElements();
-
-        for (Map.Entry<String, List<ActionType>> entry : typeGroup.entrySet()) {
-            addElement(entry.getKey());
-
-            final List<ActionType> types = entry.getValue();
-            Collections.sort(types, new ActionTypeComparator());
-
-            types.forEach(this::addElement);
-        }
-    }
-
-    /**
-     * Returns the maximum width of a string in this model.
-     *
-     * @return String max width
-     */
-    public int getMaxWidth() {
-        return maxWidth;
-    }
-
-}

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

@@ -1,136 +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.actionsmanager;
-
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action group information panel.
- */
-public final class ActionGroupInformationPanel extends JPanel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Action group. */
-    private ActionGroup group;
-    /** Description field. */
-    private TextLabel infoLabel;
-    /** Version label label. */
-    private JLabel versionLabel;
-    /** Version label. */
-    private JLabel version;
-    /** Author label label. */
-    private JLabel authorLabel;
-    /** Author label. */
-    private JLabel author;
-
-    /**
-     * Initialises a new action group information panel.
-     *
-     * @param group Action group
-     */
-    public ActionGroupInformationPanel(final ActionGroup group) {
-
-        this.group = group;
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents() {
-        infoLabel = new TextLabel("");
-        versionLabel = new JLabel("Version: ");
-        version = new JLabel();
-        authorLabel = new JLabel("Author: ");
-        author = new JLabel();
-
-        setActionGroup(group);
-    }
-
-    /**
-     * Adds listeners.
-     */
-    private void addListeners() {
-        //Empty
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill, wrap 2, hidemode 2"));
-
-        add(infoLabel, "spanx 2, grow, push");
-        add(authorLabel, "");
-        add(author, "growx, pushx");
-        add(versionLabel, "");
-        add(version, "growx, pushx");
-    }
-
-    /**
-     * Sets the action group for the panel.
-     *
-     * @param group New action group
-     */
-    public void setActionGroup(final ActionGroup group) {
-        this.group = group;
-
-        if (shouldDisplay()) {
-            //Prevent HTML text displaying, replace newlines with <br>
-            infoLabel.setText(group.getDescription().replace("<", "&lt;")
-                    .replace("\n", "<br>"));
-            author.setText(group.getAuthor());
-            version.setText(group.getVersion() == null ? "" : group.getVersion().toString());
-
-            author.setVisible(group.getAuthor() != null);
-            version.setVisible(group.getVersion() != null);
-            authorLabel.setVisible(group.getAuthor() != null);
-            versionLabel.setVisible(group.getVersion() != null);
-        } else {
-            //Value require for mig/swing layouting bug
-            infoLabel.setText("Non empty string");
-            author.setText("");
-            version.setText("");
-        }
-    }
-
-    /**
-     * Should the info panel be shown?
-     *
-     * @return true iif the panel should be shown
-     */
-    public boolean shouldDisplay() {
-        return group != null && group.getDescription() != null;
-    }
-
-}

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

@@ -1,39 +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.actionsmanager;
-
-import com.dmdirc.actions.ActionGroup;
-
-import java.util.Comparator;
-
-/**
- * Action group name comparator.
- */
-public class ActionGroupNameComparator implements Comparator<ActionGroup> {
-
-    @Override
-    public int compare(final ActionGroup o1, final ActionGroup o2) {
-        return o1.getName().toLowerCase().compareTo(o2.getName().toLowerCase());
-    }
-
-}

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

@@ -1,77 +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.actionsmanager;
-
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.addons.ui_swing.components.validating.NoDuplicatesInListValidator;
-
-import javax.swing.DefaultListModel;
-import javax.swing.JList;
-
-/**
- * No duplicates list validator, overridden to work with action groups.
- */
-class ActionGroupNoDuplicatesInListValidator extends NoDuplicatesInListValidator<ActionGroup> {
-
-    /**
-     * Creates a new validator.
-     *
-     * @param list  List
-     * @param model Model to validate
-     */
-    public ActionGroupNoDuplicatesInListValidator(final JList<ActionGroup> list,
-            final DefaultListModel<ActionGroup> model) {
-        super(true, list, model);
-    }
-
-    /**
-     * Creates a new validator.
-     *
-     * @param list          List
-     * @param caseSensitive Case sensitive check?
-     * @param model         Model to validate
-     */
-    public ActionGroupNoDuplicatesInListValidator(final boolean caseSensitive,
-            final JList<ActionGroup> list, final DefaultListModel<ActionGroup> model) {
-        super(caseSensitive, list, model);
-    }
-
-    @Override
-    public String listValueToString(final Object object) {
-        return ((ActionGroup) object).getName();
-    }
-
-    @Override
-    public int indexOfString(final String string) {
-        final String value = caseSensitive ? string : string.toLowerCase();
-        int index = -1;
-        for (int i = 0; i < model.getSize(); i++) {
-            if (((ActionGroup) model.get(i)).getName().equals(value)) {
-                index = i;
-                break;
-            }
-        }
-        return index;
-    }
-
-}

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

@@ -1,177 +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.actionsmanager;
-
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
-import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
-import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
-import com.dmdirc.config.prefs.PreferencesSetting;
-
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Action group settings panel.
- */
-public final class ActionGroupSettingsPanel extends JPanel implements ActionListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Settings list. */
-    private Collection<PreferencesSetting> settings;
-    /** Button to Component map. */
-    private Map<JButton, PreferencesSetting> settingMap;
-    /** Parent dialog. */
-    private final Window window;
-    /** Prefs component factory. */
-    private final PrefsComponentFactory factory;
-
-    /**
-     * Initialises a new action group information panel.
-     *
-     * @param factory Prefs component factory
-     * @param group   Action group
-     */
-    public ActionGroupSettingsPanel(final PrefsComponentFactory factory,
-            final ActionGroup group) {
-        this(factory, group, null);
-    }
-
-    /**
-     * Initialises a new action group information panel.
-     *
-     * @param factory Prefs component factory
-     * @param group   Action group
-     * @param window  Parent window
-     *
-     * @since 0.6
-     */
-    public ActionGroupSettingsPanel(final PrefsComponentFactory factory,
-            final ActionGroup group, final Window window) {
-
-        this.factory = factory;
-        this.window = window;
-
-        initComponents();
-        addListeners();
-
-        setActionGroup(group);
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents() {
-        settingMap = new HashMap<>();
-    }
-
-    /**
-     * Adds listeners.
-     */
-    private void addListeners() {
-        //Empty
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-        removeAll();
-        setLayout(new MigLayout("fill, hidemode 3"));
-
-        for (PreferencesSetting setting : settings) {
-            final JLabel label = new JLabel(setting.getTitle());
-            label.setToolTipText(setting.getTitle());
-            final JComponent component = factory.getComponent(setting);
-
-            if (component instanceof DurationDisplay) {
-                ((DurationDisplay) component).setWindow(window);
-            } else if (component instanceof ColourChooser) {
-                ((ColourChooser) component).setWindow(window);
-            } else if (component instanceof OptionalColourChooser) {
-                ((OptionalColourChooser) component).setWindow(window);
-            }
-
-            final JButton button = new SettingsRevertButton(setting);
-            settingMap.put(button, setting);
-            button.addActionListener(this);
-            add(label, "newline");
-            add(component, "growx, pushx");
-            add(button, "");
-        }
-    }
-
-    /**
-     * Sets the action group for the panel.
-     *
-     * @param group New action group
-     */
-    public void setActionGroup(final ActionGroup group) {
-        if (group == null || group.getSettings().isEmpty()) {
-            this.settings = new ArrayList<>();
-        } else {
-            this.settings = group.getSettings().values();
-        }
-
-        layoutComponents();
-    }
-
-    /**
-     * Should the settings panel be shown?
-     *
-     * @return true iif the panel should be shown
-     */
-    public boolean shouldDisplay() {
-        return !settings.isEmpty();
-    }
-
-    /**
-     * Saves the changes to the settings.
-     */
-    public void save() {
-        settings.forEach(PreferencesSetting::save);
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        setVisible(false);
-        settingMap.get(e.getSource()).dismiss();
-        layoutComponents();
-        setVisible(true);
-    }
-
-}

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

@@ -1,220 +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.actionsmanager;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.interfaces.actions.ActionType;
-
-import com.google.common.base.Preconditions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.swing.table.AbstractTableModel;
-
-/**
- * Action table model.
- */
-public class ActionTableModel extends AbstractTableModel {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Action list. */
-    private final List<Action> actions;
-
-    /**
-     * Instantiates a new table model.
-     *
-     * @param actions Actions to show
-     */
-    public ActionTableModel(final Collection<Action> actions) {
-        Preconditions.checkNotNull(actions);
-        this.actions = new ArrayList<>(actions);
-    }
-
-    @Override
-    public int getRowCount() {
-        synchronized (actions) {
-            return actions.size();
-        }
-    }
-
-    @Override
-    public int getColumnCount() {
-        return 3;
-    }
-
-    @Override
-    public String getColumnName(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return "Name";
-            case 1:
-                return "Trigger";
-            case 2:
-                return "Response";
-            default:
-                throw new IllegalArgumentException("Unknown column: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Class<?> getColumnClass(final int columnIndex) {
-        switch (columnIndex) {
-            case 0:
-                return String.class;
-            case 1:
-                return ActionType.class;
-            case 2:
-                return String[].class;
-            default:
-                throw new IllegalArgumentException("Unknown column: " + columnIndex);
-        }
-    }
-
-    @Override
-    public Object getValueAt(final int rowIndex, final int columnIndex) {
-        synchronized (actions) {
-            switch (columnIndex) {
-                case 0:
-                    return actions.get(rowIndex).getName();
-                case 1:
-                    return actions.get(rowIndex).getTriggers()[0];
-                case 2:
-                    return actions.get(rowIndex).getResponse();
-                default:
-                    throw new IllegalArgumentException("Unknown column: " + columnIndex);
-            }
-        }
-    }
-
-    /**
-     * Returns the action at the specified row.
-     *
-     * @param rowIndex Row index
-     *
-     * @return Action
-     */
-    public Action getAction(final int rowIndex) {
-        synchronized (actions) {
-            return actions.get(rowIndex);
-        }
-    }
-
-    /**
-     * Returns the row index of the specified index.
-     *
-     * @param action Action to get
-     *
-     * @return Action row index or -1 if not found.
-     */
-    public int getAction(final Action action) {
-        synchronized (actions) {
-            return actions.indexOf(action);
-        }
-    }
-
-    /**
-     * Replaces the model data with the specified action group.
-     *
-     * @param group New Action group
-     */
-    public void setActionGroup(final ActionGroup group) {
-        synchronized (actions) {
-            actions.clear();
-            if (group != null) {
-                actions.addAll(group.getActions());
-            }
-            fireTableDataChanged();
-        }
-    }
-
-    /**
-     * Adds an action to the model.
-     *
-     * @param action Action to add
-     */
-    public void add(final Action action) {
-        synchronized (actions) {
-            if (action == null) {
-                return;
-            }
-            actions.add(action);
-            fireTableRowsInserted(actions.size() - 1, actions.size() - 1);
-        }
-    }
-
-    /**
-     * Removes an action from the model.
-     *
-     * @param action Action to remove
-     */
-    public void remove(final Action action) {
-        if (action == null) {
-            return;
-        }
-        remove(actions.indexOf(action));
-    }
-
-    /**
-     * Removes an action from the model.
-     *
-     * @param index Index of the action to remove
-     */
-    public void remove(final int index) {
-        synchronized (actions) {
-            if (index != -1) {
-                actions.remove(index);
-                fireTableRowsDeleted(index, index);
-            }
-        }
-    }
-
-    /**
-     * Checks if this model contains the specified action.
-     *
-     * @param action Action to check for
-     *
-     * @return true if the action exists
-     */
-    public boolean contains(final Action action) {
-        synchronized (actions) {
-            return actions.contains(action);
-        }
-    }
-
-    public int findAction(final String name) {
-        int location = -1;
-        synchronized (actions) {
-            for (Action action : actions) {
-                if (action.getName().equals(name)) {
-                    location = actions.indexOf(action);
-                }
-            }
-        }
-        return location;
-    }
-
-}

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

@@ -1,55 +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.actionsmanager;
-
-import com.dmdirc.interfaces.actions.ActionType;
-
-import java.awt.Color;
-import java.awt.Font;
-
-import javax.swing.table.DefaultTableCellRenderer;
-
-/**
- * Displays actions types and headers in a pretty fashion.
- */
-public final class ActionTypeTableCellRenderer extends DefaultTableCellRenderer {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    @Override
-    public void setValue(final Object value) {
-        if (value == null) {
-            setText("");
-        } else if (value instanceof String && !((String) value).isEmpty()) {
-            setBackground(Color.GRAY);
-            setFont(getFont().deriveFont(Font.BOLD));
-            setText(value.toString());
-        } else if (value instanceof ActionType) {
-            setText(((ActionType) value).getName());
-        } else {
-            setText(value.toString());
-        }
-    }
-
-}

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

@@ -1,256 +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.actionsmanager;
-
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.actions.ActionTypeComparator;
-import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
-import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialogFactory;
-
-import java.awt.Dialog.ModalityType;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-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 net.miginfocom.swing.MigLayout;
-
-/**
- * The actions group panel is the control displayed within the tabbed control of the actions manager
- * dialog. It shows the user all actions belonging to a particular group.
- */
-public class ActionsGroupPanel extends JPanel implements ActionListener,
-        ListSelectionListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Factory to use to create editor dialogs. */
-    private final ActionEditorDialogFactory editorDialogFactory;
-    /** Parent dialog. */
-    private final ActionsManagerDialog parent;
-    /** Table scrollpane. */
-    private JScrollPane scrollPane;
-    /** Actions table. */
-    private PackingTable table;
-    /** Table mode. */
-    private ActionTableModel model;
-    /** Add button. */
-    private JButton add;
-    /** Edit button. */
-    private JButton edit;
-    /** Delete button. */
-    private JButton delete;
-    /** Action group. */
-    private ActionGroup group;
-
-    /**
-     * Creates a new instance of ActionsManagerDialog.
-     *
-     * @param editorDialogFactory Factory to use to create editor dialogs.
-     * @param parent              Parent window
-     * @param group               Action group to display
-     */
-    public ActionsGroupPanel(
-            final ActionEditorDialogFactory editorDialogFactory,
-            final ActionsManagerDialog parent,
-            final ActionGroup group) {
-
-        this.editorDialogFactory = editorDialogFactory;
-        this.parent = parent;
-        this.group = group;
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-    }
-
-    /**
-     * Updates or creates the new action.
-     *
-     * @param action Action changed or created
-     */
-    public void actionChanged(final Action action) {
-        if (model.contains(action)) {
-            final int row = model.getAction(action);
-            model.fireTableCellUpdated(row, 0);
-            model.fireTableCellUpdated(row, 1);
-            model.fireTableCellUpdated(row, 2);
-        } else {
-            model.add(action);
-        }
-    }
-
-    /**
-     * Deletes an action from the group.
-     *
-     * @param name Name of the action
-     */
-    public void actionDeleted(final String name) {
-        final int location = model.findAction(name);
-        if (location != -1) {
-            model.remove(location);
-        }
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents() {
-        scrollPane = new JScrollPane();
-        model = new ActionTableModel(group == null ? new ArrayList<>() : group.getActions());
-        table = new PackingTable(model, scrollPane, false) {
-            /** A version number for this class. */
-            private static final long serialVersionUID = 1;
-            /** Action type renderer. */
-            private final TableCellRenderer typeRenderer = new ActionTypeTableCellRenderer();
-            /** Action response renderer. */
-            private final TableCellRenderer arrayRenderer = new ArrayCellRenderer();
-
-            @Override
-            public TableCellRenderer getCellRenderer(final int row, final int column) {
-                switch (column) {
-                    case 1:
-                        return typeRenderer;
-                    case 2:
-                        return arrayRenderer;
-                    default:
-                        return super.getCellRenderer(row, column);
-                }
-            }
-        };
-
-        final TableRowSorter<ActionTableModel> sorter = new TableRowSorter<>(model);
-        sorter.setComparator(1, new ActionTypeComparator());
-        sorter.setComparator(2, new StringArrayComparator());
-
-        table.setRowSorter(sorter);
-        table.addMouseListener(new MouseAdapter() {
-
-            @Override
-            public void mouseClicked(final MouseEvent e) {
-                if (e.getClickCount() == 2) {
-                    edit.doClick();
-                }
-            }
-        });
-        add = new JButton("Add");
-        edit = new JButton("Edit");
-        delete = new JButton("Delete");
-
-        scrollPane.setViewportView(table);
-
-        table.setAutoCreateColumnsFromModel(true);
-        table.setColumnSelectionAllowed(false);
-        table.setCellSelectionEnabled(false);
-        table.setFillsViewportHeight(false);
-        table.setRowSelectionAllowed(true);
-        table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        table.getRowSorter().toggleSortOrder(0);
-
-        edit.setEnabled(false);
-        delete.setEnabled(false);
-        add.setEnabled(group != null);
-    }
-
-    /**
-     * Adds listeners.
-     */
-    private void addListeners() {
-        add.addActionListener(this);
-        edit.addActionListener(this);
-        delete.addActionListener(this);
-        table.getSelectionModel().addListSelectionListener(this);
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-        setLayout(new MigLayout("fill"));
-
-        add(scrollPane, "grow, push, span 3, wrap");
-        add(add, "right, sgx button");
-        add(edit, "right, sgx button");
-        add(delete, "right, sgx button");
-    }
-
-    /**
-     * Sets the action group for the panel.
-     *
-     * @param group New action group
-     */
-    public void setActionGroup(final ActionGroup group) {
-        this.group = group;
-
-        model.setActionGroup(group);
-        add.setEnabled(group != null);
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == add) {
-            editorDialogFactory.getActionEditorDialog(parent, group.getName()).display();
-        } else if (e.getSource() == edit) {
-            editorDialogFactory.getActionEditorDialog(parent,
-                    model.getAction(table.getRowSorter().convertRowIndexToModel(
-                                    table.getSelectedRow()))).display();
-        } else if (e.getSource() == delete) {
-            final Action action = model.getAction(
-                    table.getRowSorter().convertRowIndexToModel(table.
-                            getSelectedRow()));
-            new StandardQuestionDialog(parent,
-                    ModalityType.APPLICATION_MODAL, "Confirm deletion",
-                    "Are you sure you wish to delete the action '" + action.
-                    getName() + "'?", () -> group.deleteAction(action)).display();
-        }
-    }
-
-    @Override
-    public void valueChanged(final ListSelectionEvent e) {
-        if (e.getValueIsAdjusting()) {
-            return;
-        }
-
-        if (table.getSelectedRow() == -1) {
-            edit.setEnabled(false);
-            delete.setEnabled(false);
-        } else {
-            edit.setEnabled(true);
-            delete.setEnabled(true);
-        }
-    }
-
-}

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

@@ -1,49 +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.actionsmanager;
-
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialogFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * Factory for {@link ActionsGroupPanel}s.
- */
-@Singleton
-public class ActionsGroupPanelFactory {
-
-    private final ActionEditorDialogFactory editorDialogFactory;
-
-    @Inject
-    public ActionsGroupPanelFactory(final ActionEditorDialogFactory editorDialogFactory) {
-        this.editorDialogFactory = editorDialogFactory;
-    }
-
-    public ActionsGroupPanel getActionsGroupPanel(
-            final ActionsManagerDialog parent,
-            final ActionGroup group) {
-        return new ActionsGroupPanel(editorDialogFactory, parent, group);
-    }
-}

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

@@ -1,424 +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.actionsmanager;
-
-import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.actions.Action;
-import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.components.ListScroller;
-import com.dmdirc.addons.ui_swing.components.SortedListModel;
-import com.dmdirc.addons.ui_swing.components.frames.AppleJFrame;
-import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.events.ActionCreatedEvent;
-import com.dmdirc.events.ActionDeletedEvent;
-import com.dmdirc.events.ActionUpdatedEvent;
-import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.ui.IconManager;
-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.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.inject.Inject;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.UIManager;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import net.miginfocom.swing.MigLayout;
-
-import net.engio.mbassy.listener.Handler;
-
-/**
- * Allows the user to manage actions.
- */
-public class ActionsManagerDialog extends StandardDialog implements
-        ActionListener, ListSelectionListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-    /** Config instance. */
-    private final ConfigProvider config;
-    /** Preferences setting component factory. */
-    private final PrefsComponentFactory compFactory;
-    /** Are we saving? */
-    private final AtomicBoolean saving = new AtomicBoolean(false);
-    /** Duplicate action group validator. */
-    private final ValidatorChain<String> validator;
-    /** Event bus to post events to and subscribe to events on. */
-    private final DMDircMBassador eventbus;
-    /** Action manager to manage actions with. */
-    private final ActionController actionManager;
-    /** Info label. */
-    private TextLabel infoLabel;
-    /** Group list. */
-    private JList<ActionGroup> groups;
-    /** Add button. */
-    private JButton add;
-    /** Edit button. */
-    private JButton edit;
-    /** Delete button. */
-    private JButton delete;
-    /** Info panel. */
-    private ActionGroupInformationPanel info;
-    /** Actions panel. */
-    private ActionsGroupPanel actions;
-    /** Settings panels. */
-    private Map<ActionGroup, ActionGroupSettingsPanel> settings;
-    /** Active s panel. */
-    private ActionGroupSettingsPanel activeSettings;
-    /** Group panel. */
-    private JPanel groupPanel;
-    /** The icon manager to use for validating text fields. */
-    private final IconManager iconManager;
-    /** Factory to use to create group panels. */
-    private final ActionsGroupPanelFactory groupPanelFactory;
-
-    /**
-     * Creates a new instance of ActionsManagerDialog.
-     */
-    @Inject
-    public ActionsManagerDialog(
-            final ActionController actionManager,
-            final DMDircMBassador eventBus,
-            final Apple apple,
-            final MainFrame parentWindow,
-            @UserConfig final ConfigProvider config,
-            final PrefsComponentFactory compFactory,
-            @GlobalConfig final IconManager iconManager,
-            final ActionsGroupPanelFactory groupPanelFactory) {
-        super(Apple.isAppleUI() ? new AppleJFrame(apple, parentWindow)
-                : parentWindow, ModalityType.MODELESS);
-        this.actionManager = actionManager;
-        this.eventbus = eventBus;
-        this.config = config;
-        this.compFactory = compFactory;
-        this.iconManager = iconManager;
-        this.groupPanelFactory = groupPanelFactory;
-
-        initComponents();
-        validator = ValidatorChain.<String>builder().addValidator(
-                new ActionGroupNoDuplicatesInListValidator(
-                        groups, (DefaultListModel<ActionGroup>) groups.getModel()))
-                .addValidator(new FileNameValidator()).build();
-        addListeners();
-        layoutGroupPanel();
-        layoutComponents();
-
-        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        setTitle("Actions Manager");
-        setResizable(false);
-    }
-
-    /**
-     * Initialises the components.
-     */
-    private void initComponents() {
-        orderButtons(new JButton(), new JButton());
-        infoLabel = new TextLabel("Actions allow you to make DMDirc"
-                + " intelligently respond to various events.  Action groups are"
-                + " there for you to organise groups, add or remove them"
-                + " to suit your needs.");
-        groups = new JList<>(new SortedListModel<>(new ActionGroupNameComparator()));
-        actions = groupPanelFactory.getActionsGroupPanel(this, null);
-        info = new ActionGroupInformationPanel(null);
-        settings = new HashMap<>();
-        activeSettings = new ActionGroupSettingsPanel(compFactory, null, this);
-        settings.put(null, activeSettings);
-        add = new JButton("Add");
-        edit = new JButton("Edit");
-        delete = new JButton("Delete");
-        groupPanel = new JPanel();
-        groupPanel.setName("Groups");
-
-        groupPanel.setBorder(BorderFactory.createTitledBorder(UIManager.
-                getBorder("TitledBorder.border"), "Groups"));
-        info.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Information"));
-        actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), "Actions"));
-
-        groups.setCellRenderer(new PropertyListCellRenderer<>(groups.getCellRenderer(),
-                ActionGroup.class, "name"));
-        groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        edit.setEnabled(false);
-        delete.setEnabled(false);
-
-        info.setVisible(false);
-        activeSettings.setVisible(false);
-
-        ListScroller.register(groups);
-
-        reloadGroups();
-    }
-
-    /**
-     * Adds listeners.
-     */
-    private void addListeners() {
-        getOkButton().addActionListener(this);
-        getCancelButton().addActionListener(this);
-        add.addActionListener(this);
-        edit.addActionListener(this);
-        delete.addActionListener(this);
-        groups.getSelectionModel().addListSelectionListener(this);
-        eventbus.subscribe(this);
-    }
-
-    /**
-     * Lays out the group panel.
-     */
-    private void layoutGroupPanel() {
-        groupPanel.setLayout(new MigLayout("fill, wrap 1"));
-
-        groupPanel.add(new JScrollPane(groups), "growy, pushy, w 150!");
-        groupPanel.add(add, "sgx button, w 150!");
-        groupPanel.add(edit, "sgx button, w 150!");
-        groupPanel.add(delete, "sgx button, w 150!");
-    }
-
-    /**
-     * Lays out the components.
-     */
-    private void layoutComponents() {
-
-        getContentPane().setLayout(new MigLayout(
-                "fill, wrap 2, hidemode 3, wmax 800"));
-
-        getContentPane().add(infoLabel, "spanx 2, growx");
-        if (info.isVisible() && activeSettings.isVisible()) {
-            getContentPane().add(groupPanel, "growy, pushy, spany 3");
-        } else if (info.isVisible() || activeSettings.isVisible()) {
-            getContentPane().add(groupPanel, "growy, pushy, spany 2");
-        } else {
-            getContentPane().add(groupPanel, "growy, pushy");
-        }
-        getContentPane().add(info, "growx, pushx");
-        getContentPane().add(actions, "grow, push");
-        getContentPane().add(activeSettings, "growx, pushx");
-        getContentPane().add(getOkButton(), "skip, right, sgx button");
-    }
-
-    /**
-     * Reloads the action groups.
-     */
-    private void reloadGroups() {
-        reloadGroups(null);
-    }
-
-    /**
-     * Reloads the action groups.
-     *
-     * @param selectedGroup Newly selected group
-     */
-    private void reloadGroups(final ActionGroup selectedGroup) {
-        ((DefaultListModel<ActionGroup>) groups.getModel()).clear();
-        actionManager.getGroupsMap().values()
-                .forEach(((DefaultListModel<ActionGroup>) groups.getModel())::addElement);
-        groups.setSelectedValue(selectedGroup, true);
-    }
-
-    /**
-     * Changes the active group.
-     *
-     * @param group New group
-     */
-    private void changeActiveGroup(final ActionGroup group) {
-        info.setActionGroup(group);
-        actions.setActionGroup(group);
-        if (!settings.containsKey(group)) {
-            final ActionGroupSettingsPanel currentSettings = new ActionGroupSettingsPanel(
-                    compFactory, group, this);
-            settings.put(group, currentSettings);
-            currentSettings.setBorder(BorderFactory.createTitledBorder(
-                    UIManager.getBorder("TitledBorder.border"), "Settings"));
-        }
-        activeSettings = settings.get(group);
-
-        info.setVisible(info.shouldDisplay());
-        activeSettings.setVisible(activeSettings.shouldDisplay());
-
-        getContentPane().setVisible(false);
-        getContentPane().removeAll();
-        layoutComponents();
-        validate();
-        layoutComponents();
-        getContentPane().setVisible(true);
-    }
-
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == add) {
-            addGroup();
-        } else if (e.getSource() == edit) {
-            editGroup();
-        } else if (e.getSource() == delete) {
-            delGroup();
-        } else if ((e.getSource() == getOkButton() || e.getSource()
-                == getCancelButton()) && !saving.getAndSet(true)) {
-            settings.values().forEach(ActionGroupSettingsPanel::save);
-            config.setOption("dialogstate", "actionsmanagerdialog", groups.getSelectedIndex());
-            dispose();
-        }
-    }
-
-    /**
-     * Prompts then adds an action group.
-     */
-    private void addGroup() {
-        final int index = groups.getSelectedIndex();
-        groups.getSelectionModel().clearSelection();
-        new StandardInputDialog(this, ModalityType.DOCUMENT_MODAL, iconManager, "New action group",
-                "Please enter the name of the new action group", validator,
-                (String s) -> doSaveAddGroup(s, index), () -> doCancelledAddGroup(index))
-                .display(this);
-    }
-
-    private boolean doSaveAddGroup(final String text, final int index) {
-        if (!saving.getAndSet(true)) {
-            groups.setSelectedIndex(index);
-            if (text == null || text.isEmpty()
-                    && !actionManager.getGroupsMap().containsKey(text)) {
-                return false;
-            } else {
-                final ActionGroup group = actionManager.createGroup(text);
-                reloadGroups(group);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void doCancelledAddGroup(final int index) {
-        groups.setSelectedIndex(index);
-    }
-
-    /**
-     * Prompts then edits an action group.
-     */
-    private void editGroup() {
-        final String oldName = groups.getSelectedValue().getName();
-        final StandardInputDialog inputDialog = new StandardInputDialog(
-                this, ModalityType.DOCUMENT_MODAL, iconManager, "Edit action group",
-                "Please enter the new name of the action group", validator,
-                (String s) -> doSaveEditGroup(oldName, s), () -> {});
-        inputDialog.setText(oldName);
-        inputDialog.display(this);
-    }
-
-    private boolean doSaveEditGroup(final String oldText, final String text) {
-        if (!saving.getAndSet(true)) {
-            if (text == null || text.isEmpty()) {
-                return false;
-            } else {
-                actionManager.changeGroupName(oldText, text);
-                reloadGroups();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Prompts then deletes an action group.
-     */
-    private void delGroup() {
-        final String group = groups.getSelectedValue().getName();
-        new StandardQuestionDialog(this, ModalityType.APPLICATION_MODAL, "Confirm deletion",
-                "Are you sure you wish to delete the '" + group +
-                        "' group and all actions within it?", () -> {
-            int location = ((DefaultListModel<ActionGroup>) groups.getModel())
-                    .indexOf(actionManager.getOrCreateGroup(group));
-            actionManager.deleteGroup(group);
-            reloadGroups();
-            if (groups.getModel().getSize() == 0) {
-                location = -1;
-            } else if (location >= groups.getModel().getSize()) {
-                location = groups.getModel().getSize();
-            } else if (location <= 0) {
-                location = 0;
-            }
-            groups.setSelectedIndex(location);
-        }).display();
-    }
-
-    @Override
-    public void valueChanged(final ListSelectionEvent e) {
-        if (e.getValueIsAdjusting()) {
-            return;
-        }
-
-        changeActiveGroup(groups.getSelectedValue());
-        if (groups.getSelectedIndex() == -1 || !groups.getSelectedValue().isDelible()) {
-            edit.setEnabled(false);
-            delete.setEnabled(false);
-        } else {
-            edit.setEnabled(true);
-            delete.setEnabled(true);
-        }
-    }
-
-    @Handler
-    public void handleActionCreated(final ActionCreatedEvent event) {
-        handleActionCreatedOrUpdated(event.getAction());
-    }
-
-    @Handler
-    public void handleActionUpdated(final ActionUpdatedEvent event) {
-        handleActionCreatedOrUpdated(event.getAction());
-    }
-
-    private void handleActionCreatedOrUpdated(final Action action) {
-        if (action.getGroup().equals(groups.getSelectedValue().getName())) {
-            actions.actionChanged(action);
-        }
-    }
-
-    @Handler
-    public void handleActionDeleted(final ActionDeletedEvent event) {
-        if (event.getGroup().getName().equals(groups.getSelectedValue().getName())) {
-            actions.actionDeleted(event.getName());
-        }
-    }
-
-}

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

@@ -1,43 +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.actionsmanager;
-
-import java.util.Arrays;
-
-import javax.swing.table.DefaultTableCellRenderer;
-
-/**
- * Renders an array as an inline string.
- */
-public final class ArrayCellRenderer extends DefaultTableCellRenderer {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    @Override
-    public void setValue(final Object value) {
-        final String response = Arrays.toString((String[]) value);
-        setText(response.substring(1, response.length() - 1));
-    }
-
-}

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

@@ -1,58 +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.actionsmanager;
-
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.SettingChangeListener;
-
-import java.awt.Insets;
-
-import javax.swing.JButton;
-
-/**
- * Settings revert button.
- */
-public class SettingsRevertButton extends JButton implements SettingChangeListener {
-
-    /** A version number for this class. */
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Instantiates a new settings revert button.
-     *
-     * @param setting Setting to revert
-     */
-    public SettingsRevertButton(final PreferencesSetting setting) {
-        super("Revert");
-
-        setting.registerChangeListener(this);
-        setMargin(new Insets(0, 2, 0, 2));
-        setVisible(false);
-    }
-
-    @Override
-    public void settingChanged(final PreferencesSetting setting) {
-        setVisible(setting.needsSaving());
-    }
-
-}

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 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;
@@ -131,13 +130,6 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
-    @Provides
-    @Singleton
-    public DialogProvider<ActionsManagerDialog> getActionsManagerDialogProvider(
-            final Provider<ActionsManagerDialog> provider) {
-        return new DialogProvider<>(provider);
-    }
-
     @Provides
     @Singleton
     public DialogProvider<AliasManagerDialog> getAliasManagerDialogProvider(