From 9b73e303832d4113c466b88e54a4e4b92ce54f7d Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 13 May 2010 19:18:00 +0400 Subject: [PATCH] use interface RunnerAndConfigurationSettings where possible in order to move RuntimeConfigurationProducer and Ko -> lang-api --- .../run/PythonRunConfigurationProducer.java | 7 +++---- .../PythonUnitTestConfigurationProducer.java | 19 +++++++++---------- .../pytest/PyTestConfigurationProducer.java | 11 +++++------ 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/python/src/com/jetbrains/python/run/PythonRunConfigurationProducer.java b/python/src/com/jetbrains/python/run/PythonRunConfigurationProducer.java index 8257687d7e7e..d778b07aad50 100644 --- a/python/src/com/jetbrains/python/run/PythonRunConfigurationProducer.java +++ b/python/src/com/jetbrains/python/run/PythonRunConfigurationProducer.java @@ -1,8 +1,8 @@ package com.jetbrains.python.run; import com.intellij.execution.Location; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; @@ -27,7 +27,7 @@ public class PythonRunConfigurationProducer extends RuntimeConfigurationProducer return mySourceFile; } - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { PsiFile script = location.getPsiElement().getContainingFile(); if (script == null || script.getFileType() != PythonFileType.INSTANCE) { return null; @@ -43,7 +43,7 @@ public class PythonRunConfigurationProducer extends RuntimeConfigurationProducer mySourceFile = script; final Project project = mySourceFile.getProject(); - RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context); + RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context); PythonRunConfiguration configuration = (PythonRunConfiguration) settings.getConfiguration(); final VirtualFile vFile = mySourceFile.getVirtualFile(); if (vFile == null) return null; @@ -57,7 +57,6 @@ public class PythonRunConfigurationProducer extends RuntimeConfigurationProducer configuration.setUseModuleSdk(true); configuration.setModule(module); } - copyStepsBeforeRun(project, configuration); return settings; } diff --git a/python/src/com/jetbrains/python/testing/PythonUnitTestConfigurationProducer.java b/python/src/com/jetbrains/python/testing/PythonUnitTestConfigurationProducer.java index 94a41bfba677..34d1af3c39ca 100644 --- a/python/src/com/jetbrains/python/testing/PythonUnitTestConfigurationProducer.java +++ b/python/src/com/jetbrains/python/testing/PythonUnitTestConfigurationProducer.java @@ -9,7 +9,6 @@ import com.intellij.execution.RunManager; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.ConfigurationTypeUtil; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.facet.Facet; import com.intellij.facet.FacetManager; @@ -41,7 +40,7 @@ public class PythonUnitTestConfigurationProducer extends RuntimeConfigurationPro } @Override - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { RunnerAndConfigurationSettings settings; Module module = location.getModule(); @@ -54,19 +53,19 @@ public class PythonUnitTestConfigurationProducer extends RuntimeConfigurationPro } settings = createConfigurationFromFolder(location); - if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings; + if (settings != null) return settings; final PyElement pyElement = PsiTreeUtil.getParentOfType(location.getPsiElement(), PyElement.class); if (pyElement != null) { settings = createConfigurationFromFunction(location, pyElement); - if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings; + if (settings != null) return settings; settings = createConfigurationFromClass(location, pyElement); - if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings; + if (settings != null) return settings; } settings = createConfigurationFromFile(location, location.getPsiElement()); - if (settings != null) return (RunnerAndConfigurationSettingsImpl)settings; + if (settings != null) return settings; return null; } @@ -198,13 +197,13 @@ public class PythonUnitTestConfigurationProducer extends RuntimeConfigurationPro } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { - final RunnerAndConfigurationSettingsImpl settings = createConfigurationByElement(location, null); + final RunnerAndConfigurationSettings settings = createConfigurationByElement(location, null); if (settings != null) { final PythonUnitTestRunConfiguration configuration = (PythonUnitTestRunConfiguration)settings.getConfiguration(); - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { if (configuration.compareSettings((PythonUnitTestRunConfiguration)existingConfiguration.getConfiguration())) { return existingConfiguration; } diff --git a/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationProducer.java b/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationProducer.java index 8635949f4a36..a18798900148 100644 --- a/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationProducer.java +++ b/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationProducer.java @@ -10,7 +10,6 @@ import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.ConfigurationTypeUtil; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.util.Comparing; @@ -37,7 +36,7 @@ public class PyTestConfigurationProducer extends RuntimeConfigurationProducer { } @Override - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { PsiElement element = location.getPsiElement(); PsiFileSystemItem file = element instanceof PsiDirectory ? (PsiDirectory)element : element.getContainingFile(); if (file == null) return null; @@ -63,7 +62,7 @@ public class PyTestConfigurationProducer extends RuntimeConfigurationProducer { configuration.setKeywords(name); configuration.setName(name + " in " + configuration.getName()); } - return (RunnerAndConfigurationSettingsImpl)result; + return result; } @Nullable @@ -79,10 +78,10 @@ public class PyTestConfigurationProducer extends RuntimeConfigurationProducer { } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { final RunConfiguration configuration = existingConfiguration.getConfiguration(); PyTestRunConfiguration pyTestRunConfiguration = (PyTestRunConfiguration)configuration; final PsiElement element = location.getPsiElement();