Merge pull request #23 from derkork/idea14

Fixed issue #22
rkhmelyuk · Aug 31, 2014 · 4e235e9 · 4e235e9
2 parents 6793a7c + 5740f57
commit 4e235e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 44 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -32,6 +32,11 @@
 
     <change-notes>
         <![CDATA[
+        <p><strong>0.9</strong>:</p>
+        <ul>
+            <li>Fixed API issues with using Multirun from IntellijIDEA 14.</li>
+        </ul>
+
         <p><strong>0.8</strong>:</p>
         <ul>
             <li>Fixed API issues with using Multirun from IntellijIDEA 13 (thanks jgindin!)</li>
@@ -95,7 +100,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="107.105" until-build="129.9999"/>
+    <idea-version since-build="138.0000" until-build="139.9999"/>
 
     <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->

diff --git a/src/main/java/com/khmelyuk/multirun/MultirunRunConfiguration.java b/src/main/java/com/khmelyuk/multirun/MultirunRunConfiguration.java
@@ -9,7 +9,6 @@
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.JDOMExternalizable;
 import com.intellij.openapi.util.WriteExternalException;
 import com.khmelyuk.multirun.ui.MultirunRunConfigurationEditor;
 import org.jdom.Element;
@@ -158,18 +157,6 @@ public void writeExternal(Element element) throws WriteExternalException {
         element.setContent(configurations);
     }
 
-    @Nullable
-    @Override
-    public JDOMExternalizable createRunnerSettings(ConfigurationInfoProvider configurationInfoProvider) {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public SettingsEditor<JDOMExternalizable> getRunnerSettingsEditor(ProgramRunner programRunner) {
-        return null;
-    }
-
     @Nullable
     @Override
     public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment executionEnvironment) throws ExecutionException {

diff --git a/src/main/java/com/khmelyuk/multirun/MultirunRunnerState.java b/src/main/java/com/khmelyuk/multirun/MultirunRunnerState.java
@@ -1,7 +1,9 @@
 package com.khmelyuk.multirun;
 
 import com.intellij.execution.*;
-import com.intellij.execution.configurations.*;
+import com.intellij.execution.configurations.ConfigurationType;
+import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.execution.configurations.RunnableState;
 import com.intellij.execution.impl.RunDialog;
 import com.intellij.execution.impl.RunManagerImpl;
 import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
@@ -23,7 +25,6 @@
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.LayeredIcon;
 import com.intellij.ui.content.Content;
-import com.intellij.util.NotNullFunction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -87,12 +88,11 @@ private void runConfigurations(final Executor executor, final List<RunConfigurat
             if (!checkRunConfiguration(executor, project, configuration)) return;
 
             runTriggers(executor, configuration);
-            RunContentDescriptor runContentDescriptor = getRunContentDescriptor(runConfiguration, project);
             ExecutionEnvironment executionEnvironment = new ExecutionEnvironment(
-                    runner, DefaultExecutionTarget.INSTANCE,
-                    configuration, runContentDescriptor, project);
+                    executor, runner, DefaultExecutionTarget.INSTANCE,
+                    configuration, project);
 
-            runner.execute(executor, executionEnvironment, new ProgramRunner.Callback() {
+            runner.execute(executionEnvironment, new ProgramRunner.Callback() {
                 @SuppressWarnings("ConstantConditions")
                 @Override
                 public void processStarted(final RunContentDescriptor descriptor) {
@@ -248,28 +248,4 @@ private boolean checkRunConfiguration(Executor executor, Project project, Runner
         }
         return true;
     }
-
-    private RunContentDescriptor getRunContentDescriptor(final RunConfiguration runConfiguration, Project project) {
-        List<RunContentDescriptor> runContentDescriptors = ExecutionHelper.collectConsolesByDisplayName(
-                project,
-                new NotNullFunction<String, Boolean>() {
-                    @NotNull
-                    @Override
-                    public Boolean fun(String name) {
-                        return runConfiguration.getName().equals(name);
-                    }
-                });
-
-        return !runContentDescriptors.isEmpty() ? runContentDescriptors.get(0) : null;
-    }
-
-    @Override
-    public RunnerSettings getRunnerSettings() {
-        return null;
-    }
-
-    @Override
-    public ConfigurationPerRunnerSettings getConfigurationSettings() {
-        return null;
-    }
 }