Remove ActionManager from a bunch of plugins.

I think all that's left is the actions UI itself, and the perform
stuff.

sessionlock/src/com/dmdirc/addons/sessionlock/SessionLockManager.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.sessionlock;
 
-import com.dmdirc.actions.ActionManager;
-
 import javax.inject.Inject;
 
 import com.greboid.lock.LockAdapter;
@@ -31,16 +29,13 @@ import com.greboid.lock.LockListener;
 
 public class SessionLockManager implements LockListener {
 
-    /** Action manager. */
-    private final ActionManager actionManager;
     /** Have we registered our actions? */
     private static boolean registered;
     /** Lock Adapter to detect session events. */
     private LockAdapter lockAdapter;
 
     @Inject
-    public SessionLockManager(final ActionManager actionManager) {
-        this.actionManager = actionManager;
+    public SessionLockManager() {
     }
 
     /**
@@ -48,7 +43,6 @@ public class SessionLockManager implements LockListener {
      */
     public void load() {
         if (!registered) {
-            actionManager.registerTypes(SessionLockActionType.values());
             registered = true;
         }
 
@@ -66,12 +60,12 @@ public class SessionLockManager implements LockListener {
 
     @Override
     public void locked() {
-        actionManager.triggerEvent(SessionLockActionType.SESSION_LOCK, null);
+        // TODO: Raise an event
     }
 
     @Override
     public void unlocked() {
-        actionManager.triggerEvent(SessionLockActionType.SESSION_UNLOCK, null);
+        // TODO: Raise an event
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonFilter.java

@@ -38,7 +38,6 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
     private final ButtonModel notinstalledBox;
     private final ButtonModel pluginsBox;
     private final ButtonModel themesBox;
-    private final ButtonModel actionsBox;
     private final JTextField searchBox;
 
     /**
@@ -50,14 +49,12 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
      * @param notinstalledBox Not installed checkbox
      * @param pluginsBox      Plugins checkbox
      * @param themesBox       Themes checkbox
-     * @param actionsBox      Actions checkbox
      * @param searchBox       Search field
      */
     public AddonFilter(final ButtonModel verifiedBox,
             final ButtonModel unverifiedBox, final ButtonModel installedBox,
             final ButtonModel notinstalledBox, final ButtonModel pluginsBox,
-            final ButtonModel themesBox, final ButtonModel actionsBox,
-            final JTextField searchBox) {
+            final ButtonModel themesBox, final JTextField searchBox) {
 
         this.verifiedBox = verifiedBox;
         this.unverifiedBox = unverifiedBox;
@@ -65,7 +62,6 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
         this.notinstalledBox = notinstalledBox;
         this.pluginsBox = pluginsBox;
         this.themesBox = themesBox;
-        this.actionsBox = actionsBox;
         this.searchBox = searchBox;
     }
 
@@ -80,7 +76,6 @@ public class AddonFilter extends RowFilter<DefaultTableModel, Integer> {
                 || (!notinstalledBox.isSelected() && !info.isInstalled())
                 || (!pluginsBox.isSelected() && info.getType() == AddonType.TYPE_PLUGIN)
                 || (!themesBox.isSelected() && info.getType() == AddonType.TYPE_THEME)
-                || (!actionsBox.isSelected() && info.getType() == AddonType.TYPE_ACTION_PACK)
                 || (!searchBox.getText().isEmpty()
                 && !info.matches(searchBox.getText())));
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -84,8 +84,7 @@ public class AddonInfo {
         title = entry.get("title");
         author = entry.get("user");
         rating = Integer.parseInt(entry.get("rating"));
-        type = entry.get("type").equals("plugin") ? AddonType.TYPE_PLUGIN : entry.get("type").
-                equals("theme") ? AddonType.TYPE_THEME : AddonType.TYPE_ACTION_PACK;
+        type = entry.get("type").equals("plugin") ? AddonType.TYPE_PLUGIN : AddonType.TYPE_THEME;
         stableDownload = entry.containsKey("stable") ? entry.get("stable") : "";
         unstableDownload = entry.containsKey("unstable") ? entry
                 .get("unstable") : "";

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonType.java

@@ -30,9 +30,7 @@ public enum AddonType {
     /** Plugins. */
     TYPE_PLUGIN,
     /** Themes. */
-    TYPE_THEME,
-    /** Action packs. */
-    TYPE_ACTION_PACK;
+    TYPE_THEME;
 
     @Override
     public String toString() {

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -52,8 +52,6 @@ public class BrowserWindow extends JDialog implements ActionListener {
     private final JCheckBox pluginsBox = new JCheckBox("Plugins", true);
     /** The themes check box. */
     private final JCheckBox themesBox = new JCheckBox("Themes", true);
-    /** The actions check box. */
-    private final JCheckBox actionsBox = new JCheckBox("Action Packs", true);
     /** The verified check box. */
     private final JCheckBox verifiedBox = new JCheckBox("Verified", true);
     /** The unverified check box. */
@@ -115,7 +113,6 @@ public class BrowserWindow extends JDialog implements ActionListener {
                 "TitledBorder.border"), "Types"));
         panel.add(pluginsBox, "grow");
         panel.add(themesBox, "grow");
-        panel.add(actionsBox, "grow");
         add(panel, "wrap, pushy, growy, width 150!");
 
         panel = new JPanel(new MigLayout("fill, wrap"));
@@ -141,7 +138,7 @@ public class BrowserWindow extends JDialog implements ActionListener {
         final AddonFilter filter = new AddonFilter(verifiedBox.getModel(),
                 unverifiedBox.getModel(), installedBox.getModel(),
                 notinstalledBox.getModel(), pluginsBox.getModel(),
-                themesBox.getModel(), actionsBox.getModel(), searchBox);
+                themesBox.getModel(), searchBox);
         sorter = new AddonSorter(list.getModel(), dateButton.getModel(),
                 nameButton.getModel(), ratingButton.getModel(),
                 statusButton.getModel(), filter);
@@ -168,7 +165,6 @@ public class BrowserWindow extends JDialog implements ActionListener {
 
         pluginsBox.addActionListener(this);
         themesBox.addActionListener(this);
-        actionsBox.addActionListener(this);
 
         verifiedBox.addActionListener(this);
         unverifiedBox.addActionListener(this);

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.io.Downloader;
@@ -53,8 +52,6 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
     private final PluginManager pluginManager;
     /** Downloader to download files. */
     private final Downloader downloader;
-    /** Action controller to install actions with. */
-    private final ActionManager actionController;
 
     public InstallWorker(
             final Downloader downloader,
@@ -63,11 +60,9 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
             final String themeDirectory,
             final PluginManager pluginManager,
             final DMDircMBassador eventBus,
-            final ActionManager actionController,
             final AddonInfo info,
             final InstallerWindow window) {
         super(eventBus);
-        this.actionController = actionController;
         this.downloader = downloader;
         this.info = info;
         this.installer = window;
@@ -84,9 +79,6 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
             downloader.downloadPage(info.getDownload(), file);
 
             switch (info.getType()) {
-                case TYPE_ACTION_PACK:
-                    actionController.installActionPack(file);
-                    break;
                 case TYPE_PLUGIN:
                     final Path newFile = Paths.get(pluginDirectory, info.getTitle() + ".jar");
                     try {

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorkerFactory.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.plugins.PluginManager;
@@ -42,16 +41,13 @@ public class InstallWorkerFactory {
     private final String themeDirectory;
     private final PluginManager pluginManager;
     private final DMDircMBassador eventBus;
-    private final ActionManager actionManager;
 
     @Inject
     public InstallWorkerFactory(final Downloader downloader,
-            final ActionManager actionManager,
             @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
             @Directory(DirectoryType.PLUGINS) final String pluginDirectory,
             @Directory(DirectoryType.THEMES) final String themeDirectory,
             final PluginManager pluginManager, final DMDircMBassador eventBus) {
-        this.actionManager = actionManager;
         this.downloader = downloader;
         this.tempDirectory = tempDirectory;
         this.pluginDirectory = pluginDirectory;
@@ -61,6 +57,6 @@ public class InstallWorkerFactory {
     }
     public InstallWorker getInstallWorker(final AddonInfo info, final InstallerWindow installer) {
         return new InstallWorker(downloader, tempDirectory, pluginDirectory,
-                themeDirectory, pluginManager, eventBus, actionManager, info, installer);
+                themeDirectory, pluginManager, eventBus, info, installer);
     }
 }

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

@@ -26,7 +26,6 @@ import com.dmdirc.ClientModule;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.NoopClipboard;
@@ -192,7 +191,6 @@ public class SwingModule {
             final URLConfigPanel urlPanel,
             @GlobalConfig final AggregateConfigProvider configManager,
             @UserConfig final ConfigProvider identity,
-            final ActionManager actionManager,
             final PluginManager pluginManager,
             final DMDircMBassador eventBus) {
         return new PreferencesDialogModel(pluginPanel, themePanel, updatePanel, urlPanel,