Switch SSD to use AutoCommands.

ui_swing/src/com/dmdirc/addons/ui_swing/components/performpanel/PerformPanel.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.performpanel;
 
-import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
+import com.dmdirc.commandparser.auto.AutoCommand;
+import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
@@ -33,7 +33,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -54,11 +53,11 @@ public class PerformPanel extends JPanel {
     /** Text area that the perform is displayed in. */
     private final JTextArea performSpace;
     /** Perform wrapper to read/write performs to. */
-    private final PerformWrapper performWrapper;
-    /** Map of performs this panel can display. */
-    private final Map<PerformDescription, String[]> performs = new HashMap<>();
-    /** The perform that is displayed in the text area. */
-    private PerformDescription visiblePerform;
+    private final AutoCommandManager autoCommandManager;
+    /** Map of original auto commands to their modified forms. */
+    private final Map<AutoCommand, AutoCommand> autoCommands = new HashMap<>();
+    /** The auto command that is displayed in the text area. */
+    private AutoCommand visiblePerform;
 
     /**
      * Creates a new instance of PerformPanel that has no knowledge of any performs at the time of
@@ -68,15 +67,15 @@ public class PerformPanel extends JPanel {
      *
      * @param iconManager    Icon manager
      * @param config         Config to read settings from
-     * @param performWrapper Perform wrapper to read/write performs to.
+     * @param autoCommandManager Perform wrapper to read/write performs to.
      */
     public PerformPanel(
             final IconManager iconManager,
             final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
-            final PerformWrapper performWrapper) {
-        this(iconManager, colourManagerFactory, config, performWrapper,
-                Collections.<PerformDescription>emptyList());
+            final AutoCommandManager autoCommandManager) {
+        this(iconManager, colourManagerFactory, config, autoCommandManager,
+                Collections.<AutoCommand>emptyList());
     }
 
     /**
@@ -87,42 +86,31 @@ public class PerformPanel extends JPanel {
      *
      * @param iconManager    Icon manager
      * @param config         Config to read settings from
-     * @param performWrapper Perform wrapper to read/write performs to.
+     * @param autoCommandManager Perform wrapper to read/write performs to.
      * @param performs       Collection of PerformDescriptions to initialise
      */
     public PerformPanel(
             final IconManager iconManager,
             final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
-            final PerformWrapper performWrapper,
-            final Collection<PerformDescription> performs) {
+            final AutoCommandManager autoCommandManager,
+            final Collection<AutoCommand> performs) {
 
-        this.performWrapper = performWrapper;
+        this.autoCommandManager = autoCommandManager;
 
-        performs.forEach(this::addPerform);
+        performs.forEach(this::addCommand);
         setLayout(new MigLayout("ins 0, fill"));
         performSpace = new TextAreaInputField(iconManager, colourManagerFactory, config, "");
         add(new JScrollPane(performSpace), "grow, push");
     }
 
     /**
-     * This will add a perform to the internal cache so that switching performs is more efficient.
-     * Switching performs can be achieved using
-     * {@link #switchPerform(com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription) }
+     * This will add a command to the internal cache to track changes.
      *
-     * @param perform PerformDescription to add
+     * @param command Auto command to add
      */
-    public void addPerform(final PerformDescription perform) {
-        performs.put(perform, performWrapper.getPerform(perform));
-    }
-
-    /**
-     * Deletes a perform from the map of performs this PerformPanel can modify.
-     *
-     * @param perform PerformDescription to remove
-     */
-    public void delPerform(final PerformDescription perform) {
-        performs.remove(perform);
+    public void addCommand(final AutoCommand command) {
+        autoCommands.putIfAbsent(command, command);
     }
 
     /**
@@ -130,12 +118,13 @@ public class PerformPanel extends JPanel {
      */
     public void savePerform() {
         if (visiblePerform != null) {
-            performs.put(visiblePerform, performSpace.getText().split("\n"));
-        }
-        for (final Entry<PerformDescription, String[]> perform
-                : performs.entrySet()) {
-            performWrapper.setPerform(perform.getKey(), perform.getValue());
+            autoCommands.put(visiblePerform,
+                    createAutoCommand(visiblePerform, performSpace.getText()));
         }
+
+        autoCommands.entrySet().parallelStream()
+                .filter(e -> !e.getKey().equals(e.getValue()))
+                .forEach(e -> autoCommandManager.replaceAutoCommand(e.getKey(), e.getValue()));
     }
 
     /**
@@ -145,38 +134,33 @@ public class PerformPanel extends JPanel {
      *
      * @param perform Perform to display in the text area
      */
-    public void switchPerform(final PerformDescription perform) {
-        if (perform != null && !performs.containsKey(perform)) {
-            addPerform(perform);
+    public void switchPerform(final AutoCommand perform) {
+        if (perform != null && !autoCommands.containsKey(perform)) {
+            addCommand(perform);
         }
         if (visiblePerform != null) {
-            performs.put(visiblePerform, performSpace.getText().split("\n"));
+            autoCommands.put(visiblePerform,
+                    createAutoCommand(visiblePerform, performSpace.getText()));
         }
         if (perform == null) {
             performSpace.setText("");
         } else {
-            performSpace.setText(implode(performs.get(perform)));
+            performSpace.setText(perform.getResponse());
         }
         performSpace.setEnabled(perform != null);
         visiblePerform = perform;
     }
 
     /**
-     * Implodes the specified string array, joining each line with a LF.
-     *
-     * @param lines The lines to be joined together
+     * Creates a new auto command based on the existing one, but with a different response.
      *
-     * @return A string containing each element of lines, separated by a LF.
+     * @param existing The existing auto command to model on.
+     * @param text The new text to use for the response.
+     * @return A new AutoCommand with the same target as the existing one, and the given text.
      */
-    private String implode(final String... lines) {
-        final StringBuilder res = new StringBuilder();
-
-        for (final String line : lines) {
-            res.append('\n');
-            res.append(line);
-        }
-
-        return res.length() == 0 ? "" : res.substring(1);
+    private static AutoCommand createAutoCommand(final AutoCommand existing, final String text) {
+        return AutoCommand.create(existing.getServer(), existing.getNetwork(),
+                existing.getProfile(), text);
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/renderers/PerformRenderer.java

@@ -22,7 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
+import com.dmdirc.commandparser.auto.AutoCommand;
+
+import java.util.Optional;
 
 import javax.swing.JLabel;
 import javax.swing.ListCellRenderer;
@@ -32,7 +34,7 @@ import javax.swing.ListCellRenderer;
  *
  * @since 0.6.4
  */
-public class PerformRenderer extends DMDircListCellRenderer<PerformDescription> {
+public class PerformRenderer extends DMDircListCellRenderer<AutoCommand> {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -42,24 +44,19 @@ public class PerformRenderer extends DMDircListCellRenderer<PerformDescription>
      *
      * @param renderer Parent renderer
      */
-    public PerformRenderer(final ListCellRenderer<? super PerformDescription> renderer) {
+    public PerformRenderer(final ListCellRenderer<? super AutoCommand> renderer) {
         super(renderer);
     }
 
     @Override
-    protected void renderValue(final JLabel label, final PerformDescription value,
+    protected void renderValue(final JLabel label, final AutoCommand value,
             final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        final String target = value.getTarget();
-        final String profile = value.getProfile();
+        final String target = value.getServer().orElse(value.getNetwork().orElse(""));
+        final Optional<String> profile = value.getProfile();
         final String type = value.getType().toString();
-        String friendlyText = type + " perform (" + target + ") ";
-
-        if (profile == null) {
-            friendlyText += "Any profile";
-        } else {
-            friendlyText += "This profile (" + profile + ")";
-        }
+        final String friendlyText = type + " perform (" + target + ") "
+                + profile.map(p -> "This profile (" + p + ')').orElse("Any profile");
         label.setText(friendlyText);
     }
 

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

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
-import com.dmdirc.actions.wrappers.PerformType;
-import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
 import com.dmdirc.addons.ui_swing.components.renderers.PerformRenderer;
+import com.dmdirc.commandparser.auto.AutoCommand;
+import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
@@ -37,6 +36,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Optional;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
@@ -53,29 +53,20 @@ public class PerformTab extends JPanel implements ActionListener {
     private static final long serialVersionUID = 1;
     /** Parent connection. */
     private final Connection connection;
-    /** Perform wrapper to read/write performs to. */
-    private final PerformWrapper wrapper;
+    /** Command manager wrapper to read/write performs to. */
+    private final AutoCommandManager autoCommandManager;
     /** Network/server combo box. */
-    private JComboBox<PerformDescription> target;
+    private JComboBox<AutoCommand> target;
     /** Perform panel. */
     private PerformPanel performPanel;
 
-    /**
-     * Creates a new instance of IgnoreList.
-     *
-     * @param iconManager Icon manager
-     * @param config      Config to read settings from
-     * @param wrapper     Perform wrapper to read/write performs to.
-     * @param connection  Connection whose perform should be displayed.
-     */
     public PerformTab(
             final IconManager iconManager,
             final ColourManagerFactory colourManagerFactory,
             final AggregateConfigProvider config,
-            final PerformWrapper wrapper,
+            final AutoCommandManager autoCommandManager,
             final Connection connection) {
-
-        this.wrapper = wrapper;
+        this.autoCommandManager = autoCommandManager;
         this.connection = connection;
 
         setOpaque(UIUtilities.getTabbedPaneOpaque());
@@ -94,21 +85,23 @@ public class PerformTab extends JPanel implements ActionListener {
             final AggregateConfigProvider config) {
         setLayout(new MigLayout("fill"));
 
-        final DefaultComboBoxModel<PerformDescription> model = new DefaultComboBoxModel<>();
+        final DefaultComboBoxModel<AutoCommand> model = new DefaultComboBoxModel<>();
         target = new JComboBox<>(model);
 
         add(target, "growx, pushx, wrap");
 
-        final Collection<PerformDescription> performList = new ArrayList<>();
+        final Collection<AutoCommand> performList = new ArrayList<>();
 
-        final PerformDescription networkPerform = new PerformDescription(
-                PerformType.NETWORK, connection.getNetwork());
-        final PerformDescription networkProfilePerform = new PerformDescription(
-                PerformType.NETWORK, connection.getNetwork(), connection.getProfile().getName());
-        final PerformDescription serverPerform = new PerformDescription(
-                PerformType.SERVER, connection.getAddress());
-        final PerformDescription serverProfilePerform = new PerformDescription(
-                PerformType.SERVER, connection.getAddress(), connection.getProfile().getName());
+        final AutoCommand networkPerform = autoCommandManager.getOrCreateAutoCommand(
+                Optional.of(connection.getNetwork()), Optional.empty(), Optional.empty());
+        final AutoCommand networkProfilePerform = autoCommandManager.getOrCreateAutoCommand(
+                Optional.of(connection.getNetwork()), Optional.empty(),
+                Optional.of(connection.getProfile().getName()));
+        final AutoCommand serverPerform = autoCommandManager.getOrCreateAutoCommand(
+                Optional.empty(), Optional.of(connection.getAddress()), Optional.empty());
+        final AutoCommand serverProfilePerform = autoCommandManager.getOrCreateAutoCommand(
+                Optional.empty(), Optional.of(connection.getAddress()),
+                Optional.of(connection.getProfile().getName()));
 
         model.addElement(networkPerform);
         model.addElement(networkProfilePerform);
@@ -122,8 +115,8 @@ public class PerformTab extends JPanel implements ActionListener {
         performList.add(serverPerform);
         performList.add(serverProfilePerform);
 
-        performPanel = new PerformPanel(iconManager, colourManagerFactory, config, wrapper,
-                performList);
+        performPanel = new PerformPanel(iconManager, colourManagerFactory, config,
+                autoCommandManager, performList);
         performPanel.switchPerform(networkPerform);
         add(performPanel, "grow, push");
 
@@ -141,7 +134,7 @@ public class PerformTab extends JPanel implements ActionListener {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final PerformDescription perform = (PerformDescription) ((JComboBox<?>) e.getSource()).
+        final AutoCommand perform = (AutoCommand) ((JComboBox<?>) e.getSource()).
                 getSelectedItem();
         performPanel.switchPerform(perform);
     }

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

@@ -23,13 +23,13 @@
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
 import com.dmdirc.ServerState;
-import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.modes.UserModesPane;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -56,8 +56,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     private static final long serialVersionUID = 2;
     /** Parent connection. */
     private final Connection connection;
-    /** Perform wrapper for the perform panel. */
-    private final PerformWrapper performWrapper;
+    /** Mnaager for the perform panel. */
+    private final AutoCommandManager autoCommandManager;
     /** Preferences manager to retrieve settings from. */
     private final PreferencesManager preferencesManager;
     /** User modes panel. */
@@ -71,25 +71,16 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     /** The tabbed pane. */
     private JTabbedPane tabbedPane;
 
-    /**
-     * Creates a new instance of ServerSettingsDialog.
-     *
-     * @param preferencesManager Preferences manager to retrieve settings from
-     * @param compFactory        Preferences setting component factory
-     * @param performWrapper     Wrapper for the perform tab.
-     * @param connection         The server object that we're editing settings for
-     * @param parentWindow       Parent window
-     */
     public ServerSettingsDialog(
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
-            final PerformWrapper performWrapper,
+            final AutoCommandManager autoCommandManager,
             final Connection connection,
             final Window parentWindow,
             final ColourManagerFactory colourManagerFactory) {
         super(parentWindow, ModalityType.MODELESS);
         this.connection = connection;
-        this.performWrapper = performWrapper;
+        this.autoCommandManager = autoCommandManager;
         this.preferencesManager = preferencesManager;
 
         setTitle("Server settings");
@@ -122,7 +113,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
                 connection, parentWindow);
 
         performPanel = new PerformTab(connection.getWindowModel().getIconManager(),
-                colourManagerFactory, config, performWrapper, connection);
+                colourManagerFactory, config, autoCommandManager, connection);
 
         settingsPanel = new SettingsPanel(connection.getWindowModel().getIconManager(), compFactory,
                 "These settings are specific to this network, any settings specified here will "

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.injection;
 import com.dmdirc.Channel;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
@@ -41,6 +40,7 @@ import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
+import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -163,13 +163,13 @@ public class DialogModule {
     public KeyedDialogProvider<Connection, ServerSettingsDialog> getServerSettingsDialogProvider(
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
-            final PerformWrapper performWrapper,
+            final AutoCommandManager autoCommandManager,
             @MainWindow final Window parentWindow,
             final ColourManagerFactory colourManagerFactory) {
         return new KeyedDialogProvider<Connection, ServerSettingsDialog>() {
             @Override
             protected ServerSettingsDialog getInstance(final Connection key) {
-                return new ServerSettingsDialog(preferencesManager, compFactory, performWrapper,
+                return new ServerSettingsDialog(preferencesManager, compFactory, autoCommandManager,
                         key, parentWindow, colourManagerFactory);
             }
         };