Merge pull request #235 from csmith/master

Remove first run actions extraction.

ui_swing/src/com/dmdirc/addons/ui_swing/wizard/firstrun/ExtractionStep.java

@@ -35,17 +35,13 @@ public abstract class ExtractionStep extends Step {
     private static final long serialVersionUID = 7431623190030730680L;
     /** Plugins checkbox. */
     protected final JCheckBox plugins;
-    /** Actions checkbox. */
-    protected final JCheckBox actions;
 
     /** Creates a new instance of StepOne. */
     public ExtractionStep() {
 
         plugins = new JCheckBox("Install core plugins?");
-        actions = new JCheckBox("Install core actions?");
 
         plugins.setSelected(true);
-        actions.setSelected(true);
 
         initComponents();
     }
@@ -64,15 +60,6 @@ public abstract class ExtractionStep extends Step {
         return plugins.isSelected();
     }
 
-    /**
-     * Returns the state of the actions checkbox.
-     *
-     * @return Actions checkbox state
-     */
-    public final boolean getActionsState() {
-        return actions.isSelected();
-    }
-
     @Override
     public String getTitle() {
         return "Core addon extraction";

ui_swing/src/com/dmdirc/addons/ui_swing/wizard/firstrun/FirstRunExtractionStep.java

@@ -38,9 +38,7 @@ public final class FirstRunExtractionStep extends ExtractionStep {
     protected void initComponents() {
         setLayout(new MigLayout("fillx, wrap 1"));
 
-        TextLabel infoLabel;
-
-        infoLabel = new TextLabel("It appears that this is the first time "
+        final TextLabel infoLabel = new TextLabel("It appears that this is the first time "
                 + "that you have run DMDirc. "
                 + "This short wizard will help you setup DMDirc.\n\n"
                 + "DMDirc comes with a set of core plugins that add "
@@ -50,13 +48,6 @@ public final class FirstRunExtractionStep extends ExtractionStep {
                 + "plugins for you, tick the box below.");
         add(infoLabel, "growx, pushx");
         add(plugins, "");
-        infoLabel = new TextLabel("DMDirc also comes with a set of core"
-                + " 'actions' that serve as examples and add some basic"
-                + " functionality such as highlighting. If you would like"
-                + " the wizard to copy the core actions for you, tick the"
-                + " box below.");
-        add(infoLabel, "growx, pushx");
-        add(actions, "");
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.actions.CoreActionExtractor;
 import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
@@ -55,8 +54,6 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
     private final CorePluginExtractor corePluginExtractor;
     /** Provider to use to obtain PMDs. */
     private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
-    /** Core Actions Extractor. */
-    private final CoreActionExtractor coreActionExtractor;
 
     /**
      * Instantiate the wizard.
@@ -71,12 +68,10 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
     public SwingFirstRunWizard(@MainWindow final Window parentWindow,
             @UserConfig final ConfigProvider config,
             final CorePluginExtractor pluginExtractor, @GlobalConfig final IconManager iconManager,
-            final DialogProvider<ProfileManagerDialog> profileDialogProvider,
-            final CoreActionExtractor coreActionExtractor) {
+            final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
         this.corePluginExtractor = pluginExtractor;
         this.config = config;
         this.profileDialogProvider = profileDialogProvider;
-        this.coreActionExtractor = coreActionExtractor;
 
         wizardDialog = new WizardDialog("Setup wizard", new ArrayList<>(), parentWindow,
                 ModalityType.APPLICATION_MODAL);
@@ -90,9 +85,6 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
         if (((ExtractionStep) wizardDialog.getStep(0)).getPluginsState()) {
             extractPlugins();
         }
-        if (((ExtractionStep) wizardDialog.getStep(0)).getActionsState()) {
-            extractActions();
-        }
 
         config.setOption("updater", "enable",
                 ((CommunicationStep) wizardDialog.getStep(1)).checkUpdates());
@@ -115,11 +107,6 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
         corePluginExtractor.extractCorePlugins(null);
     }
 
-    @Override
-    public void extractActions() {
-        coreActionExtractor.extractCoreActions();
-    }
-
     @Override
     public void display() {
         wizardDialog.addStep(new FirstRunExtractionStep());