diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java index b91b358e9c71..640656aae5b9 100644 --- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java +++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java @@ -25,7 +25,6 @@ import com.intellij.execution.Location; import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.JUnitUtil; import com.intellij.execution.junit.JavaRuntimeConfigurationProducerBase; import com.intellij.openapi.module.Module; @@ -52,7 +51,7 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce } @Override - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { location = JavaExecutionUtil.stepIntoSingleClass(location); final Project project = location.getProject(); final PsiElement element = location.getPsiElement(); @@ -63,7 +62,7 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(myPsiClass); configuration.setModule(new JUnitUtil.ModuleOfClass().convert(myPsiClass)); configuration.setName(configuration.getGeneratedName()); - return (RunnerAndConfigurationSettingsImpl)settings; + return settings; } public int compareTo(Object o) { @@ -104,12 +103,12 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { final PsiClass aClass = getAppletClass(location.getPsiElement(), PsiManager.getInstance(location.getProject())); if (aClass != null) { - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { if (Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), ((AppletConfiguration)existingConfiguration.getConfiguration()).MAIN_CLASS_NAME)) { return existingConfiguration; diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java index 527c976b0e60..e57da79ece4c 100644 --- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java +++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java @@ -15,14 +15,10 @@ */ package com.intellij.execution.application; -import com.intellij.execution.JavaExecutionUtil; -import com.intellij.execution.Location; -import com.intellij.execution.RunConfigurationExtension; -import com.intellij.execution.RunManagerEx; +import com.intellij.execution.*; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.ConfigurationUtil; import com.intellij.execution.impl.RunManagerImpl; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.JavaRuntimeConfigurationProducerBase; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.module.Module; @@ -47,7 +43,7 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr return myPsiElement; } - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, final ConfigurationContext context) { location = JavaExecutionUtil.stepIntoSingleClass(location); final PsiElement element = location.getPsiElement(); @@ -67,15 +63,14 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr return createConfiguration(aClass, context); } - private RunnerAndConfigurationSettingsImpl createConfiguration(final PsiClass aClass, final ConfigurationContext context) { + private RunnerAndConfigurationSettings createConfiguration(final PsiClass aClass, final ConfigurationContext context) { final Project project = aClass.getProject(); - RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context); + RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context); final ApplicationConfiguration configuration = (ApplicationConfiguration)settings.getConfiguration(); configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(aClass); configuration.setName(configuration.getGeneratedName()); setupConfigurationModule(context, configuration); RunConfigurationExtension.patchCreatedConfiguration(configuration); - copyStepsBeforeRun(project, configuration); return settings; } @@ -93,8 +88,8 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { final PsiClass aClass = ApplicationConfigurationType.getMainClass(location.getPsiElement()); if (aClass == null) { @@ -104,7 +99,7 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr ((ApplicationConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject())) .getConfigurationTemplate(getConfigurationFactory()) .getConfiguration()).getConfigurationModule().getModule(); - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { final ApplicationConfiguration appConfiguration = (ApplicationConfiguration)existingConfiguration.getConfiguration(); if (Comparing.equal(JavaExecutionUtil.getRuntimeQualifiedName(aClass), appConfiguration.MAIN_CLASS_NAME)) { if (Comparing.equal(location.getModule(), appConfiguration.getConfigurationModule().getModule())) { diff --git a/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java b/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java index df8dbb4a4236..012c7cd5cc75 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java @@ -15,11 +15,11 @@ */ package com.intellij.execution.junit; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.ModuleBasedConfiguration; import com.intellij.execution.impl.RunManagerImpl; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.testframework.TestSearchScope; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; @@ -74,7 +74,6 @@ public abstract class JavaRuntimeConfigurationProducerBase extends RuntimeConfig } protected TestSearchScope setupPackageConfiguration(ConfigurationContext context, Project project, ModuleBasedConfiguration configuration, TestSearchScope scope) { - copyStepsBeforeRun(project, configuration); if (scope != TestSearchScope.WHOLE_PROJECT) { if (!setupConfigurationModule(context, configuration)) { return TestSearchScope.WHOLE_PROJECT; @@ -85,7 +84,7 @@ public abstract class JavaRuntimeConfigurationProducerBase extends RuntimeConfig protected boolean setupConfigurationModule(@Nullable ConfigurationContext context, ModuleBasedConfiguration configuration) { if (context != null) { - final RunnerAndConfigurationSettingsImpl template = + final RunnerAndConfigurationSettings template = ((RunManagerImpl)context.getRunManager()).getConfigurationTemplate(getConfigurationFactory()); final Module contextModule = context.getModule(); final Module predefinedModule = ((ModuleBasedConfiguration)template.getConfiguration()).getConfigurationModule().getModule(); diff --git a/platform/lang-api/src/com/intellij/execution/LocatableConfigurationType.java b/platform/lang-api/src/com/intellij/execution/LocatableConfigurationType.java index 3f3590f36e40..fdc84e359eed 100644 --- a/platform/lang-api/src/com/intellij/execution/LocatableConfigurationType.java +++ b/platform/lang-api/src/com/intellij/execution/LocatableConfigurationType.java @@ -20,6 +20,10 @@ import com.intellij.execution.configurations.RunConfiguration; import org.jetbrains.annotations.Nullable; +/** + * Implement {@link com.intellij.execution.junit.RuntimeConfigurationProducer} instead + */ +@Deprecated public interface LocatableConfigurationType extends ConfigurationType{ @Nullable RunnerAndConfigurationSettings createConfigurationByLocation(Location location); diff --git a/platform/lang-api/src/com/intellij/execution/RunManager.java b/platform/lang-api/src/com/intellij/execution/RunManager.java index 448b9a47bfd2..58f8098acd39 100644 --- a/platform/lang-api/src/com/intellij/execution/RunManager.java +++ b/platform/lang-api/src/com/intellij/execution/RunManager.java @@ -19,6 +19,7 @@ import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -46,4 +47,9 @@ public abstract class RunManager { public abstract RunnerAndConfigurationSettings getSelectedConfiguration(); public abstract RunnerAndConfigurationSettings createRunConfiguration(String name, ConfigurationFactory type); + + @NotNull + public abstract RunnerAndConfigurationSettings createConfiguration(RunConfiguration runConfiguration, ConfigurationFactory factory); + + public abstract RunnerAndConfigurationSettings[] getConfigurationSettings(ConfigurationType type); } diff --git a/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java b/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java index b7a82c6aee05..572f7ead1c0d 100644 --- a/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java +++ b/platform/lang-api/src/com/intellij/execution/RunnerAndConfigurationSettings.java @@ -17,6 +17,7 @@ package com.intellij.execution; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ProgramRunner; +import com.intellij.openapi.util.Factory; import org.jetbrains.annotations.Nullable; /** @@ -45,4 +46,10 @@ public interface RunnerAndConfigurationSettings { ConfigurationType getType(); void checkSettings() throws RuntimeConfigurationException; + + void checkSettings(@Nullable Executor executor) throws RuntimeConfigurationException; + + void setTemporary(boolean temporary); + + Factory createFactory(); } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java similarity index 91% rename from platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java rename to platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java index cf7c494deac1..6a42497221d3 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java +++ b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java @@ -19,7 +19,6 @@ package com.intellij.execution.actions; import com.intellij.execution.*; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RuntimeConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; @@ -45,7 +44,7 @@ import java.util.Set; public class ConfigurationContext { private static final Logger LOG = Logger.getInstance("#com.intellij.execution.actions.ConfigurationContext"); private final Location myLocation; - private RunnerAndConfigurationSettingsImpl myConfiguration; + private RunnerAndConfigurationSettings myConfiguration; private final Module myModule; private final RuntimeConfiguration myRuntimeConfiguration; private final Component myContextComponent; @@ -73,7 +72,7 @@ public class ConfigurationContext { myLocation = new PsiLocation(project, myModule, element); } - public RunnerAndConfigurationSettingsImpl getConfiguration() { + public RunnerAndConfigurationSettings getConfiguration() { if (myConfiguration == null) createConfiguration(); return myConfiguration; } @@ -97,7 +96,7 @@ public class ConfigurationContext { } @Nullable - public RunnerAndConfigurationSettingsImpl findExisting() { + public RunnerAndConfigurationSettings findExisting() { if (myLocation == null) { return null; } @@ -116,8 +115,8 @@ public class ConfigurationContext { for (ConfigurationType type : types) { if (!(type instanceof LocatableConfigurationType)) continue; final LocatableConfigurationType factoryLocatable = (LocatableConfigurationType)type; - final RunnerAndConfigurationSettingsImpl[] configurations = getRunManager().getConfigurationSettings(type); - for (final RunnerAndConfigurationSettingsImpl existingConfiguration : configurations) { + final RunnerAndConfigurationSettings[] configurations = getRunManager().getConfigurationSettings(type); + for (final RunnerAndConfigurationSettings existingConfiguration : configurations) { if (factoryLocatable.isConfigurationByLocation(existingConfiguration.getConfiguration(), myLocation)) { return existingConfiguration; } @@ -148,8 +147,8 @@ public class ConfigurationContext { return element; } - public RunManagerEx getRunManager() { - return RunManagerEx.getInstanceEx(getProject()); + public RunManager getRunManager() { + return RunManager.getInstance(getProject()); } public Project getProject() { return myLocation.getProject(); } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/PreferedProducerFind.java b/platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java similarity index 90% rename from platform/lang-impl/src/com/intellij/execution/actions/PreferedProducerFind.java rename to platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java index 49a1c28985bb..97284c476e5a 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/PreferedProducerFind.java +++ b/platform/lang-api/src/com/intellij/execution/actions/PreferedProducerFind.java @@ -19,8 +19,8 @@ package com.intellij.execution.actions; import com.intellij.execution.LocatableConfigurationType; import com.intellij.execution.Location; import com.intellij.execution.RunManager; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.ConfigurationType; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -39,7 +39,7 @@ class PreferedProducerFind { private PreferedProducerFind() {} @Nullable - public static RunnerAndConfigurationSettingsImpl createConfiguration(@NotNull Location location, final ConfigurationContext context) { + public static RunnerAndConfigurationSettings createConfiguration(@NotNull Location location, final ConfigurationContext context) { final RuntimeConfigurationProducer preferredProducer = findPreferredProducer(location, context); return preferredProducer != null ? preferredProducer.getConfiguration() : null; } @@ -109,9 +109,9 @@ class PreferedProducerFind { } @Nullable - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { myPsiElement = location.getPsiElement(); - return (RunnerAndConfigurationSettingsImpl)((LocatableConfigurationType)getConfigurationType()).createConfigurationByLocation(location); + return ((LocatableConfigurationType)getConfigurationType()).createConfigurationByLocation(location); } public int compareTo(final Object o) { diff --git a/platform/lang-impl/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java similarity index 72% rename from platform/lang-impl/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java rename to platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java index f088aa243e0e..25ff1553e1bf 100644 --- a/platform/lang-impl/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java @@ -16,17 +16,11 @@ package com.intellij.execution.junit; -import com.intellij.execution.LocatableConfigurationType; -import com.intellij.execution.Location; -import com.intellij.execution.PsiLocation; -import com.intellij.execution.RunManagerEx; +import com.intellij.execution.*; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.execution.configurations.ConfigurationType; -import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.configurations.RuntimeConfiguration; -import com.intellij.execution.impl.RunManagerImpl; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; @@ -42,7 +36,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable { public static final Comparator COMPARATOR = new ProducerComparator(); protected static final int PREFERED = -1; private final ConfigurationFactory myConfigurationFactory; - private RunnerAndConfigurationSettingsImpl myConfiguration; + private RunnerAndConfigurationSettings myConfiguration; public RuntimeConfigurationProducer(final ConfigurationType configurationType) { this(configurationType.getConfigurationFactories()[0]); @@ -61,10 +55,10 @@ public abstract class RuntimeConfigurationProducer implements Comparable { final Location _location = PsiLocation.fromPsiElement(psiElement, location != null ? location.getModule() : null); if (_location != null) { // replace with existing configuration if any - final RunManagerEx runManager = RunManagerEx.getInstanceEx(context.getProject()); + final RunManager runManager = RunManager.getInstance(context.getProject()); final ConfigurationType type = result.myConfiguration.getType(); - final RunnerAndConfigurationSettingsImpl[] configurations = runManager.getConfigurationSettings(type); - final RunnerAndConfigurationSettingsImpl configuration = findExistingByElement(_location, configurations); + final RunnerAndConfigurationSettings[] configurations = runManager.getConfigurationSettings(type); + final RunnerAndConfigurationSettings configuration = findExistingByElement(_location, configurations); if (configuration != null) { result.myConfiguration = configuration; } @@ -76,20 +70,20 @@ public abstract class RuntimeConfigurationProducer implements Comparable { public abstract PsiElement getSourceElement(); - public RunnerAndConfigurationSettingsImpl getConfiguration() { + public RunnerAndConfigurationSettings getConfiguration() { return myConfiguration; } @Nullable - protected abstract RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context); + protected abstract RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context); @Nullable - protected RunnerAndConfigurationSettingsImpl findExistingByElement(final Location location, - @NotNull final RunnerAndConfigurationSettingsImpl[] existingConfigurations) { + protected RunnerAndConfigurationSettings findExistingByElement(final Location location, + @NotNull final RunnerAndConfigurationSettings[] existingConfigurations) { if (existingConfigurations.length > 0) { ConfigurationType type = existingConfigurations[0].getType(); if (type instanceof LocatableConfigurationType) { - for (final RunnerAndConfigurationSettingsImpl configuration : existingConfigurations) { + for (final RunnerAndConfigurationSettings configuration : existingConfigurations) { if (((LocatableConfigurationType)type).isConfigurationByLocation(configuration.getConfiguration(), location)) { return configuration; } @@ -109,20 +103,14 @@ public abstract class RuntimeConfigurationProducer implements Comparable { } } - protected RunnerAndConfigurationSettingsImpl cloneTemplateConfiguration(final Project project, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings cloneTemplateConfiguration(final Project project, final ConfigurationContext context) { if (context != null) { final RuntimeConfiguration original = context.getOriginalConfiguration(myConfigurationFactory.getType()); if (original != null){ - return RunManagerEx.getInstanceEx(project).createConfiguration(original.clone(), myConfigurationFactory); + return RunManager.getInstance(project).createConfiguration(original.clone(), myConfigurationFactory); } } - return RunManagerEx.getInstanceEx(project).createConfiguration("", myConfigurationFactory); - } - - // todo: looks like may be removed safely - protected void copyStepsBeforeRun(Project project, RunConfiguration runConfiguration) { - final RunManagerImpl manager = RunManagerImpl.getInstanceImpl(project); - final RunnerAndConfigurationSettingsImpl template = manager.getConfigurationTemplate(myConfigurationFactory); + return RunManager.getInstance(project).createRunConfiguration("", myConfigurationFactory); } protected ConfigurationFactory getConfigurationFactory() { diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java index cd0020967024..292405449be9 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java @@ -17,7 +17,6 @@ package com.intellij.execution; import com.intellij.execution.actions.RunContextAction; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.runners.ProgramRunner; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; @@ -161,7 +160,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry { return; } - final RunnerAndConfigurationSettingsImpl selectedConfiguration = getConfiguration(project); + final RunnerAndConfigurationSettings selectedConfiguration = getConfiguration(project); if (selectedConfiguration != null) { final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(myExecutor.getId(), selectedConfiguration.getConfiguration()); @@ -179,7 +178,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry { } @Nullable - private static RunnerAndConfigurationSettingsImpl getConfiguration(@NotNull final Project project) { + private static RunnerAndConfigurationSettings getConfiguration(@NotNull final Project project) { return RunManagerEx.getInstanceEx(project).getSelectedConfiguration(); } diff --git a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java index 0d3089a5977d..5de0d7753bd9 100644 --- a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java @@ -46,11 +46,11 @@ public class ProgramRunnerUtil { } @Nullable - public static ProgramRunner getRunner(final String executorId, final RunnerAndConfigurationSettingsImpl configuration) { + public static ProgramRunner getRunner(final String executorId, final RunnerAndConfigurationSettings configuration) { return RunnerRegistry.getInstance().getRunner(executorId, configuration.getConfiguration()); } - public static void executeConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettingsImpl configuration, @NotNull final Executor executor, @NotNull final DataContext dataContext) { + public static void executeConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings configuration, @NotNull final Executor executor, @NotNull final DataContext dataContext) { ProgramRunner runner = getRunner(executor.getId(), configuration); if (runner == null) { LOG.error("Runner MUST not be null! Cannot find runner for " + executor.getId() + " and " + configuration); diff --git a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java index 3b39633d514e..e282aacb8cdf 100644 --- a/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java +++ b/platform/lang-impl/src/com/intellij/execution/RunManagerEx.java @@ -16,9 +16,7 @@ package com.intellij.execution; import com.intellij.execution.configurations.ConfigurationFactory; -import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; @@ -39,31 +37,26 @@ public abstract class RunManagerEx extends RunManager { } @Nullable - public abstract RunnerAndConfigurationSettingsImpl getSelectedConfiguration(); + public abstract RunnerAndConfigurationSettings getSelectedConfiguration(); - public abstract boolean isTemporary(RunnerAndConfigurationSettingsImpl configuration); + public abstract boolean isTemporary(RunnerAndConfigurationSettings configuration); - public abstract void setActiveConfiguration(RunnerAndConfigurationSettingsImpl configuration); + public abstract void setActiveConfiguration(RunnerAndConfigurationSettings configuration); - public abstract void setSelectedConfiguration(RunnerAndConfigurationSettingsImpl configuration); + public abstract void setSelectedConfiguration(RunnerAndConfigurationSettings configuration); - public abstract void setTemporaryConfiguration(RunnerAndConfigurationSettingsImpl tempConfiguration); + public abstract void setTemporaryConfiguration(RunnerAndConfigurationSettings tempConfiguration); public abstract RunManagerConfig getConfig(); @NotNull - public abstract RunnerAndConfigurationSettingsImpl createConfiguration(String name, ConfigurationFactory type); + public abstract RunnerAndConfigurationSettings createConfiguration(String name, ConfigurationFactory type); - @NotNull - public abstract RunnerAndConfigurationSettingsImpl createConfiguration(RunConfiguration runConfiguration, ConfigurationFactory factory); + public abstract void addConfiguration(RunnerAndConfigurationSettings settings, boolean isShared, Map, BeforeRunTask> tasks); - public abstract RunnerAndConfigurationSettingsImpl[] getConfigurationSettings(ConfigurationType type); + public abstract void addConfiguration(final RunnerAndConfigurationSettings settings, final boolean isShared); - public abstract void addConfiguration(RunnerAndConfigurationSettingsImpl settings, boolean isShared, Map, BeforeRunTask> tasks); - - public abstract void addConfiguration(final RunnerAndConfigurationSettingsImpl settings, final boolean isShared); - - public abstract boolean isConfigurationShared(RunnerAndConfigurationSettingsImpl settings); + public abstract boolean isConfigurationShared(RunnerAndConfigurationSettings settings); @NotNull public abstract Map, BeforeRunTask> getBeforeRunTasks(RunConfiguration settings); @@ -74,11 +67,11 @@ public abstract class RunManagerEx extends RunManager { @NotNull public abstract Collection getBeforeRunTasks(Key taskProviderID, boolean includeOnlyActiveTasks); - public abstract RunnerAndConfigurationSettingsImpl findConfigurationByName(@NotNull final String name); + public abstract RunnerAndConfigurationSettings findConfigurationByName(@NotNull final String name); - public abstract Collection getSortedConfigurations(); + public abstract Collection getSortedConfigurations(); - public abstract void removeConfiguration(RunnerAndConfigurationSettingsImpl settings); + public abstract void removeConfiguration(RunnerAndConfigurationSettings settings); public abstract void addRunManagerListener(RunManagerListener listener); public abstract void removeRunManagerListener(RunManagerListener listener); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java index e8344eefabbf..9a1cdd30f994 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/BaseRunConfigurationAction.java @@ -22,7 +22,6 @@ import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.LocatableConfiguration; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; @@ -61,7 +60,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { private AnAction[] getChildren(DataContext dataContext) { final ConfigurationContext context = new ConfigurationContext(dataContext); - final RunnerAndConfigurationSettingsImpl existing = context.findExisting(); + final RunnerAndConfigurationSettings existing = context.findExisting(); if (existing == null) { final List producers = getEnabledProducers(context); if (producers.size() > 1) { @@ -109,7 +108,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { @Override public boolean canBePerformed(DataContext dataContext) { final ConfigurationContext context = new ConfigurationContext(dataContext); - final RunnerAndConfigurationSettingsImpl existing = context.findExisting(); + final RunnerAndConfigurationSettings existing = context.findExisting(); if (existing == null) { final List producers = getEnabledProducers(context); return producers.size() <= 1; @@ -120,7 +119,7 @@ public abstract class BaseRunConfigurationAction extends ActionGroup { public void actionPerformed(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); final ConfigurationContext context = new ConfigurationContext(dataContext); - final RunnerAndConfigurationSettingsImpl existing = context.findExisting(); + final RunnerAndConfigurationSettings existing = context.findExisting(); if (existing == null) { final List producers = PreferedProducerFind.findPreferredProducers(context.getLocation(), context, true); if (producers == null) return; diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java index 2d2ab18af240..0d36965482f5 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java @@ -91,7 +91,7 @@ public class ChooseRunConfigurationAction extends AnAction { return "run.configuration.alternate.action.ad"; } - protected static boolean canRun(@NotNull final Executor executor, final RunnerAndConfigurationSettingsImpl settings) { + protected static boolean canRun(@NotNull final Executor executor, final RunnerAndConfigurationSettings settings) { return ProgramRunnerUtil.getRunner(executor.getId(), settings) != null; } @@ -212,7 +212,7 @@ public class ChooseRunConfigurationAction extends AnAction { } } - void editConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettingsImpl configuration) { + void editConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings configuration) { final Executor executor = getCurrentExecutor(); assert executor != null; @@ -223,7 +223,7 @@ public class ChooseRunConfigurationAction extends AnAction { } } - private static void deleteConfiguration(final Project project, @NotNull final RunnerAndConfigurationSettingsImpl configurationSettings) { + private static void deleteConfiguration(final Project project, @NotNull final RunnerAndConfigurationSettings configurationSettings) { final RunManagerEx manager = RunManagerEx.getInstanceEx(project); manager.removeConfiguration(configurationSettings); } @@ -352,15 +352,15 @@ public class ChooseRunConfigurationAction extends AnAction { } public static ItemWrapper wrap(@NotNull final Project project, - @NotNull final RunnerAndConfigurationSettingsImpl settings, + @NotNull final RunnerAndConfigurationSettings settings, final boolean dynamic) { final ItemWrapper result = wrap(project, settings); result.setDynamic(dynamic); return result; } - public static ItemWrapper wrap(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettingsImpl settings) { - return new ItemWrapper(settings) { + public static ItemWrapper wrap(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings settings) { + return new ItemWrapper(settings) { @Override public void perform(@NotNull Project project, @NotNull Executor executor, @NotNull DataContext context) { RunManagerEx.getInstanceEx(project).setSelectedConfiguration(getValue()); @@ -447,13 +447,13 @@ public class ChooseRunConfigurationAction extends AnAction { final List result = new ArrayList(); - final RunnerAndConfigurationSettingsImpl selectedConfiguration = manager.getSelectedConfiguration(); + final RunnerAndConfigurationSettings selectedConfiguration = manager.getSelectedConfiguration(); - final Map wrappedExisting = new LinkedHashMap(); + final Map wrappedExisting = new LinkedHashMap(); final ConfigurationType[] factories = manager.getConfigurationFactories(); for (final ConfigurationType factory : factories) { - final RunnerAndConfigurationSettingsImpl[] configurations = manager.getConfigurationSettings(factory); - for (final RunnerAndConfigurationSettingsImpl configuration : configurations) { + final RunnerAndConfigurationSettings[] configurations = manager.getConfigurationSettings(factory); + for (final RunnerAndConfigurationSettings configuration : configurations) { final ItemWrapper wrapped = ItemWrapper.wrap(project, configuration); if (configuration == selectedConfiguration) { wrapped.setMnemonic(1); @@ -496,8 +496,8 @@ public class ChooseRunConfigurationAction extends AnAction { public void run() { final RunnerAndConfigurationSettings configuration = RunManager.getInstance(project).getSelectedConfiguration(); if (configuration instanceof RunnerAndConfigurationSettingsImpl) { - if (canRun(executor, (RunnerAndConfigurationSettingsImpl) configuration)) { - ProgramRunnerUtil.executeConfiguration(project, (RunnerAndConfigurationSettingsImpl) configuration, executor, DataManager.getInstance().getDataContext()); + if (canRun(executor, configuration)) { + ProgramRunnerUtil.executeConfiguration(project, configuration, executor, DataManager.getInstance().getDataContext()); } } } @@ -518,12 +518,12 @@ public class ChooseRunConfigurationAction extends AnAction { } @NotNull - private static List populateWithDynamicRunners(final List result, - Map existing, + private static List populateWithDynamicRunners(final List result, + Map existing, final Project project, final RunManagerEx manager, - final RunnerAndConfigurationSettingsImpl selectedConfiguration) { + final RunnerAndConfigurationSettings selectedConfiguration) { - final ArrayList contextConfigurations = new ArrayList(); + final ArrayList contextConfigurations = new ArrayList(); final DataContext dataContext = DataManager.getInstance().getDataContext(); final ConfigurationContext context = new ConfigurationContext(dataContext); @@ -536,11 +536,11 @@ public class ChooseRunConfigurationAction extends AnAction { } }); - final RunnerAndConfigurationSettingsImpl[] preferred = {null}; + final RunnerAndConfigurationSettings[] preferred = {null}; int i = 2; // selectedConfiguration == null ? 1 : 2; for (final RuntimeConfigurationProducer producer : producers) { - final RunnerAndConfigurationSettingsImpl configuration = producer.getConfiguration(); + final RunnerAndConfigurationSettings configuration = producer.getConfiguration(); if (configuration != null) { if (existing.keySet().contains(configuration)) { final ItemWrapper wrapper = existing.get(configuration); @@ -636,7 +636,7 @@ public class ChooseRunConfigurationAction extends AnAction { } return currentConfiguration instanceof RunnerAndConfigurationSettingsImpl ? getValues() - .indexOf(ItemWrapper.wrap(myProject, (RunnerAndConfigurationSettingsImpl)currentConfiguration)) : -1; + .indexOf(ItemWrapper.wrap(myProject, currentConfiguration)) : -1; } @Override @@ -646,7 +646,7 @@ public class ChooseRunConfigurationAction extends AnAction { if (o instanceof RunnerAndConfigurationSettingsImpl) { return doFinalStep(new Runnable() { public void run() { - myAction.editConfiguration(myProject, (RunnerAndConfigurationSettingsImpl)o); + myAction.editConfiguration(myProject, (RunnerAndConfigurationSettings)o); } }); } @@ -691,13 +691,13 @@ public class ChooseRunConfigurationAction extends AnAction { private static final class ConfigurationActionsStep extends BaseListPopupStep { private ConfigurationActionsStep(@NotNull final Project project, ChooseRunConfigurationAction action, - @NotNull final RunnerAndConfigurationSettingsImpl settings, final boolean dynamic) { + @NotNull final RunnerAndConfigurationSettings settings, final boolean dynamic) { super("Actions", buildActions(project, action, settings, dynamic)); } private static ActionWrapper[] buildActions(@NotNull final Project project, final ChooseRunConfigurationAction action, - @NotNull final RunnerAndConfigurationSettingsImpl settings, + @NotNull final RunnerAndConfigurationSettings settings, final boolean dynamic) { final List result = new ArrayList(); final Executor[] executors = ExecutorRegistry.getInstance().getRegisteredExecutors(); @@ -874,7 +874,7 @@ public class ChooseRunConfigurationAction extends AnAction { final Object o = getListModel().get(index); if (o != null && o instanceof ItemWrapper && ((ItemWrapper)o).canBeDeleted()) { - deleteConfiguration(myProject_, (RunnerAndConfigurationSettingsImpl) ((ItemWrapper)o).getValue()); + deleteConfiguration(myProject_, (RunnerAndConfigurationSettings) ((ItemWrapper)o).getValue()); getListModel().deleteItem(o); final List values = getListStep().getValues(); values.remove(o); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java b/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java index 5faf6d6fe896..0828d6636fb4 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/CreateAction.java @@ -17,12 +17,12 @@ package com.intellij.execution.actions; import com.intellij.execution.ExecutionBundle; +import com.intellij.execution.RunManager; import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.impl.RunDialog; import com.intellij.execution.impl.RunManagerImpl; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.actionSystem.Presentation; @@ -44,7 +44,7 @@ public class CreateAction extends BaseRunConfigurationAction { private static BaseCreatePolicy choosePolicy(final ConfigurationContext context) { final RunnerAndConfigurationSettings configuration = context.findExisting(); if (configuration == null) return CREATE_AND_EDIT; - final RunManagerEx runManager = context.getRunManager(); + final RunManager runManager = context.getRunManager(); if (runManager.getSelectedConfiguration() != configuration) return SELECT; if (runManager.isTemporary(configuration.getConfiguration())) return SAVE; return SELECTED_STABLE; @@ -97,13 +97,13 @@ public class CreateAction extends BaseRunConfigurationAction { } public void perform(final ConfigurationContext context) { - final RunnerAndConfigurationSettingsImpl configuration = context.findExisting(); + final RunnerAndConfigurationSettings configuration = context.findExisting(); if (configuration == null) return; - context.getRunManager().setActiveConfiguration(configuration); + ((RunManagerEx)context.getRunManager()).setActiveConfiguration(configuration); } protected void updateIcon(final Presentation presentation, final ConfigurationContext context) { - final RunnerAndConfigurationSettingsImpl configuration = context.findExisting(); + final RunnerAndConfigurationSettings configuration = context.findExisting(); if (configuration != null) { presentation.setIcon(configuration.getType().getIcon()); } else { @@ -119,8 +119,8 @@ public class CreateAction extends BaseRunConfigurationAction { public void perform(final ConfigurationContext context) { final RunManagerImpl runManager = (RunManagerImpl)context.getRunManager(); - final RunnerAndConfigurationSettingsImpl configuration = context.getConfiguration(); - final RunnerAndConfigurationSettingsImpl template = runManager.getConfigurationTemplate(configuration.getFactory()); + final RunnerAndConfigurationSettings configuration = context.getConfiguration(); + final RunnerAndConfigurationSettings template = runManager.getConfigurationTemplate(configuration.getFactory()); final RunConfiguration templateConfiguration = template.getConfiguration(); runManager.addConfiguration(configuration, runManager.isConfigurationShared(template), runManager.getBeforeRunTasks( templateConfiguration)); runManager.setActiveConfiguration(configuration); @@ -133,7 +133,7 @@ public class CreateAction extends BaseRunConfigurationAction { } public void perform(final ConfigurationContext context) { - final RunnerAndConfigurationSettingsImpl configuration = context.getConfiguration(); + final RunnerAndConfigurationSettings configuration = context.getConfiguration(); if (RunDialog.editConfiguration(context.getProject(), configuration, ExecutionBundle.message("create.run.configuration.for.item.dialog.title", configuration.getName()))) { final RunManagerImpl runManager = (RunManagerImpl)context.getRunManager(); runManager.addConfiguration(configuration, @@ -155,7 +155,7 @@ public class CreateAction extends BaseRunConfigurationAction { } protected void updateIcon(final Presentation presentation, final ConfigurationContext context) { - final RunnerAndConfigurationSettingsImpl configuration = context.findExisting(); + final RunnerAndConfigurationSettings configuration = context.findExisting(); if (configuration != null) { presentation.setIcon(configuration.getType().getIcon()); } else { diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java index 4d3f381c7cd7..6c6b1551e84f 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java @@ -19,7 +19,6 @@ package com.intellij.execution.actions; import com.intellij.execution.*; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; @@ -145,8 +144,8 @@ public class RunConfigurationAction extends ComboBoxAction implements DumbAware final ConfigurationType[] types = runManager.getConfigurationFactories(); for (ConfigurationType type : types) { final DefaultActionGroup actionGroup = new DefaultActionGroup(); - final RunnerAndConfigurationSettingsImpl[] configurations = runManager.getConfigurationSettings(type); - for (final RunnerAndConfigurationSettingsImpl configuration : configurations) { + final RunnerAndConfigurationSettings[] configurations = runManager.getConfigurationSettings(type); + for (final RunnerAndConfigurationSettings configuration : configurations) { //if (runManager.canRunConfiguration(configuration)) { final MenuAction action = new MenuAction(configuration, project); actionGroup.add(action); @@ -213,10 +212,10 @@ public class RunConfigurationAction extends ComboBoxAction implements DumbAware } private static class MenuAction extends AnAction { - private final RunnerAndConfigurationSettingsImpl myConfiguration; + private final RunnerAndConfigurationSettings myConfiguration; private final Project myProject; - public MenuAction(final RunnerAndConfigurationSettingsImpl configuration, final Project project) { + public MenuAction(final RunnerAndConfigurationSettings configuration, final Project project) { myConfiguration = configuration; myProject = project; String name = configuration.getName(); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java index 860153ca68bd..4ef72efee8f1 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java @@ -18,7 +18,6 @@ package com.intellij.execution.actions; import com.intellij.execution.*; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.actionSystem.Presentation; @@ -36,8 +35,8 @@ public class RunContextAction extends BaseRunConfigurationAction { } protected void perform(final ConfigurationContext context) { - RunnerAndConfigurationSettingsImpl configuration = context.findExisting(); - final RunManagerEx runManager = context.getRunManager(); + RunnerAndConfigurationSettings configuration = context.findExisting(); + final RunManagerEx runManager = (RunManagerEx)context.getRunManager(); if (configuration == null) { configuration = context.getConfiguration(); if (configuration == null) return; @@ -69,7 +68,7 @@ public class RunContextAction extends BaseRunConfigurationAction { protected void updatePresentation(final Presentation presentation, final String actionText, final ConfigurationContext context) { presentation.setText(myExecutor.getStartActionText() + actionText, true); - RunnerAndConfigurationSettingsImpl configuration = context.findExisting(); + RunnerAndConfigurationSettings configuration = context.findExisting(); if (configuration == null) { configuration = context.getConfiguration(); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java b/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java index 8472d0adb3ff..b0b4fd2aca93 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java @@ -15,10 +15,7 @@ */ package com.intellij.execution.impl; -import com.intellij.execution.BeforeRunTask; -import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.RunManager; -import com.intellij.execution.RunManagerEx; +import com.intellij.execution.*; import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; @@ -177,7 +174,7 @@ public abstract class BaseExecuteBeforeRunDialog extend private boolean isConfigurationAssigned(ConfigurationType type) { final RunManagerEx runManager = RunManagerEx.getInstanceEx(myProject); for (ConfigurationFactory factory : type.getConfigurationFactories()) { - final RunnerAndConfigurationSettingsImpl settings = ((RunManagerImpl)runManager).getConfigurationTemplate(factory); + final RunnerAndConfigurationSettings settings = ((RunManagerImpl)runManager).getConfigurationTemplate(factory); if (isConfigurationAssigned(settings.getConfiguration())) return true; } return false; @@ -198,7 +195,7 @@ public abstract class BaseExecuteBeforeRunDialog extend if (descriptor instanceof ConfigurationTypeDescriptor) { ConfigurationTypeDescriptor typeDesc = (ConfigurationTypeDescriptor)descriptor; for (ConfigurationFactory factory : typeDesc.getConfigurationType().getConfigurationFactories()) { - RunnerAndConfigurationSettingsImpl settings = runManager.getConfigurationTemplate(factory); + RunnerAndConfigurationSettings settings = runManager.getConfigurationTemplate(factory); update(settings.getConfiguration(), isChecked, runManager); } } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java index d5e8a09f7086..a270e72210dc 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.java @@ -16,10 +16,7 @@ package com.intellij.execution.impl; -import com.intellij.execution.ExecutionBundle; -import com.intellij.execution.Executor; -import com.intellij.execution.ExecutorRegistry; -import com.intellij.execution.RunnerRegistry; +import com.intellij.execution.*; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.runners.ProgramRunner; import com.intellij.openapi.options.*; @@ -44,22 +41,22 @@ import java.util.List; /** * @author dyoma */ -class ConfigurationSettingsEditor extends CompositeSettingsEditor { - private final ArrayList> myRunnerEditors = - new ArrayList>(); +class ConfigurationSettingsEditor extends CompositeSettingsEditor { + private final ArrayList> myRunnerEditors = + new ArrayList>(); private RunnersEditorComponent myRunnersComponent; private final RunConfiguration myConfiguration; private final SettingsEditor myConfigurationEditor; - private SettingsEditorGroup myCompound; + private SettingsEditorGroup myCompound; - public CompositeSettingsBuilder getBuilder() { + public CompositeSettingsBuilder getBuilder() { init(); - return new GroupSettingsBuilder(myCompound); + return new GroupSettingsBuilder(myCompound); } private void init() { if (myCompound == null) { - myCompound = new SettingsEditorGroup(); + myCompound = new SettingsEditorGroup(); Disposer.register(this, myCompound); if (myConfigurationEditor instanceof SettingsEditorGroup) { SettingsEditorGroup group = (SettingsEditorGroup)myConfigurationEditor; @@ -91,10 +88,10 @@ class ConfigurationSettingsEditor extends CompositeSettingsEditor 0) { myCompound.addEditor(ExecutionBundle.message("run.configuration.startup.connection.rab.title"), - new CompositeSettingsEditor(getFactory()) { - public CompositeSettingsBuilder getBuilder() { - return new CompositeSettingsBuilder() { - public Collection> getEditors() { + new CompositeSettingsEditor(getFactory()) { + public CompositeSettingsBuilder getBuilder() { + return new CompositeSettingsBuilder() { + public Collection> getEditors() { return myRunnerEditors; } @@ -121,12 +118,12 @@ class ConfigurationSettingsEditor extends CompositeSettingsEditor wrappedConfigEditor = null; - SettingsEditor wrappedRunEditor = null; + SettingsEditor wrappedConfigEditor = null; + SettingsEditor wrappedRunEditor = null; if (configEditor != null) { - wrappedConfigEditor = new SettingsEditorWrapper(configEditor, - new Convertor() { - public JDOMExternalizable convert(RunnerAndConfigurationSettingsImpl configurationSettings) { + wrappedConfigEditor = new SettingsEditorWrapper(configEditor, + new Convertor() { + public JDOMExternalizable convert(RunnerAndConfigurationSettings configurationSettings) { return configurationSettings.getConfigurationSettings(runner).getSettings(); } }); @@ -135,9 +132,9 @@ class ConfigurationSettingsEditor extends CompositeSettingsEditor(runnerEditor, - new Convertor() { - public JDOMExternalizable convert(RunnerAndConfigurationSettingsImpl configurationSettings) { + wrappedRunEditor = new SettingsEditorWrapper(runnerEditor, + new Convertor() { + public JDOMExternalizable convert(RunnerAndConfigurationSettings configurationSettings) { return configurationSettings.getRunnerSettings(runner).getData(); } }); @@ -156,15 +153,15 @@ class ConfigurationSettingsEditor extends CompositeSettingsEditor)settings.getConfiguration().getConfigurationEditor(); Disposer.register(this, myConfigurationEditor); myConfiguration = settings.getConfiguration(); } - public RunnerAndConfigurationSettingsImpl getSnapshot() throws ConfigurationException { - RunnerAndConfigurationSettingsImpl settings = getFactory().create(); + public RunnerAndConfigurationSettings getSnapshot() throws ConfigurationException { + RunnerAndConfigurationSettings settings = getFactory().create(); settings.setName(myConfiguration.getName()); if (myConfigurationEditor instanceof CheckableRunConfigurationEditor) { ((CheckableRunConfigurationEditor)myConfigurationEditor).checkEditorData(settings.getConfiguration()); @@ -221,18 +218,18 @@ class ConfigurationSettingsEditor extends CompositeSettingsEditor { + private static class ConfigToSettingsWrapper extends SettingsEditor { private final SettingsEditor myConfigEditor; public ConfigToSettingsWrapper(SettingsEditor configEditor) { myConfigEditor = configEditor; } - public void resetEditorFrom(RunnerAndConfigurationSettingsImpl configurationSettings) { + public void resetEditorFrom(RunnerAndConfigurationSettings configurationSettings) { myConfigEditor.resetFrom(configurationSettings.getConfiguration()); } - public void applyEditorTo(RunnerAndConfigurationSettingsImpl configurationSettings) throws ConfigurationException { + public void applyEditorTo(RunnerAndConfigurationSettings configurationSettings) throws ConfigurationException { myConfigEditor.applyTo(configurationSettings.getConfiguration()); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java index cf72af57b934..e130a4063275 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java @@ -18,6 +18,7 @@ package com.intellij.execution.impl; import com.intellij.execution.BeforeRunTask; import com.intellij.execution.BeforeRunTaskProvider; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.configurations.UnknownRunConfiguration; import com.intellij.ide.DataManager; @@ -45,7 +46,7 @@ import java.util.List; * User: anna * Date: 27-Mar-2006 */ -public class ConfigurationSettingsEditorWrapper extends SettingsEditor { +public class ConfigurationSettingsEditorWrapper extends SettingsEditor { public static DataKey CONFIGURATION_EDITOR_KEY = DataKey.create("ConfigurationSettingsEditor"); private JPanel myComponentPlace; private JCheckBox myCbStoreProjectConfiguration; @@ -59,13 +60,13 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor(2); myUnloadedElements.add(element); @@ -117,8 +118,8 @@ public class ProjectRunConfigurationManager implements ProjectComponent, Persist } public void writeExternal(Element element) throws WriteExternalException { - final Collection configurations = myManager.getStableConfigurations().values(); - for (RunnerAndConfigurationSettingsImpl configuration : configurations) { + final Collection configurations = myManager.getStableConfigurations().values(); + for (RunnerAndConfigurationSettings configuration : configurations) { if (myManager.isConfigurationShared(configuration)){ myManager.addConfigurationElement(element, configuration); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index 6f398b7abfa9..fa62d357ea01 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -122,7 +122,7 @@ class RunConfigurable extends BaseConfigurable { String name = null; if (userObject instanceof SingleConfigurationConfigurable) { final SingleConfigurationConfigurable settings = (SingleConfigurationConfigurable)userObject; - RunnerAndConfigurationSettingsImpl snapshot; + RunnerAndConfigurationSettings snapshot; try { snapshot = settings.getSnapshot(); } @@ -134,7 +134,7 @@ class RunConfigurable extends BaseConfigurable { name = settings.getNameText(); } else if (userObject instanceof RunnerAndConfigurationSettingsImpl) { - RunnerAndConfigurationSettingsImpl settings = (RunnerAndConfigurationSettingsImpl)userObject; + RunnerAndConfigurationSettings settings = (RunnerAndConfigurationSettings)userObject; setIcon(ProgramRunnerUtil.getConfigurationIcon(getProject(), settings)); configuration = settings.getConfiguration(); name = configuration.getName(); @@ -151,11 +151,11 @@ class RunConfigurable extends BaseConfigurable { final RunManagerEx manager = getRunManager(); final ConfigurationType[] factories = manager.getConfigurationFactories(); for (ConfigurationType type : factories) { - final RunnerAndConfigurationSettingsImpl[] configurations = manager.getConfigurationSettings(type); + final RunnerAndConfigurationSettings[] configurations = manager.getConfigurationSettings(type); if (configurations != null && configurations.length > 0) { final DefaultMutableTreeNode typeNode = new DefaultMutableTreeNode(type); myRoot.add(typeNode); - for (RunnerAndConfigurationSettingsImpl configuration : configurations) { + for (RunnerAndConfigurationSettings configuration : configurations) { typeNode.add(new DefaultMutableTreeNode(configuration)); } } @@ -169,7 +169,7 @@ class RunConfigurable extends BaseConfigurable { final Object userObject = node.getUserObject(); if (userObject instanceof RunnerAndConfigurationSettingsImpl) { final SingleConfigurationConfigurable configurationConfigurable = - SingleConfigurationConfigurable.editSettings((RunnerAndConfigurationSettingsImpl)userObject); + SingleConfigurationConfigurable.editSettings((RunnerAndConfigurationSettings)userObject); installUpdateListeners(configurationConfigurable); node.setUserObject(configurationConfigurable); updateRightPanel(configurationConfigurable); @@ -199,7 +199,7 @@ class RunConfigurable extends BaseConfigurable { final DefaultMutableTreeNode node = (DefaultMutableTreeNode)enumeration.nextElement(); final Object userObject = node.getUserObject(); if (userObject instanceof RunnerAndConfigurationSettingsImpl) { - final RunnerAndConfigurationSettingsImpl runnerAndConfigurationSettings = (RunnerAndConfigurationSettingsImpl)userObject; + final RunnerAndConfigurationSettings runnerAndConfigurationSettings = (RunnerAndConfigurationSettings)userObject; final ConfigurationType configurationType = settings.getType(); if (configurationType != null && Comparing.strEqual(runnerAndConfigurationSettings.getConfiguration().getType().getId(), configurationType.getId()) && @@ -252,8 +252,8 @@ class RunConfigurable extends BaseConfigurable { } private void installUpdateListeners(final SingleConfigurationConfigurable info) { - info.getEditor().addSettingsEditorListener(new SettingsEditorListener() { - public void stateChanged(final SettingsEditor editor) { + info.getEditor().addSettingsEditorListener(new SettingsEditorListener() { + public void stateChanged(final SettingsEditor editor) { update(); setupDialogBounds(); } @@ -456,14 +456,14 @@ class RunConfigurable extends BaseConfigurable { final Object userObject = ((DefaultMutableTreeNode)typeNode.getChildAt(i)).getUserObject(); if (userObject instanceof SingleConfigurationConfigurable) { final SingleConfigurationConfigurable configurable = (SingleConfigurationConfigurable)userObject; - final RunnerAndConfigurationSettingsImpl settings = (RunnerAndConfigurationSettingsImpl)configurable.getSettings(); + final RunnerAndConfigurationSettings settings = (RunnerAndConfigurationSettings)configurable.getSettings(); if (manager.isTemporary(settings)) { applyConfiguration(typeNode, configurable); } stableConfigurations.add(new RunConfigurationBean(configurable)); } else if (userObject instanceof RunnerAndConfigurationSettingsImpl) { - RunnerAndConfigurationSettingsImpl settings = (RunnerAndConfigurationSettingsImpl)userObject; + RunnerAndConfigurationSettings settings = (RunnerAndConfigurationSettings)userObject; stableConfigurations.add(new RunConfigurationBean(settings, manager.isConfigurationShared(settings), manager.getBeforeRunTasks(settings.getConfiguration()))); @@ -516,7 +516,7 @@ class RunConfigurable extends BaseConfigurable { public boolean isModified() { if (super.isModified()) return true; final RunManagerImpl runManager = getRunManager(); - final RunnerAndConfigurationSettingsImpl settings = runManager.getSelectedConfiguration(); + final RunnerAndConfigurationSettings settings = runManager.getSelectedConfiguration(); if (mySelectedConfigurable == null) { return settings != null; } @@ -530,7 +530,7 @@ class RunConfigurable extends BaseConfigurable { final Set currentConfigurations = new HashSet(); for (int i = 0; i < myRoot.getChildCount(); i++) { DefaultMutableTreeNode typeNode = (DefaultMutableTreeNode)myRoot.getChildAt(i); - final RunnerAndConfigurationSettingsImpl[] configurationSettings = + final RunnerAndConfigurationSettings[] configurationSettings = runManager.getConfigurationSettings((ConfigurationType)typeNode.getUserObject()); if (configurationSettings.length != typeNode.getChildCount()) return true; for (int j = 0; j < typeNode.getChildCount(); j++) { @@ -544,7 +544,7 @@ class RunConfigurable extends BaseConfigurable { currentConfigurations.add(configurable.getConfiguration()); } else if (userObject instanceof RunnerAndConfigurationSettingsImpl) { - currentConfigurations.add(((RunnerAndConfigurationSettingsImpl)userObject).getConfiguration()); + currentConfigurations.add(((RunnerAndConfigurationSettings)userObject).getConfiguration()); } } } @@ -652,7 +652,7 @@ class RunConfigurable extends BaseConfigurable { currentNames.add(((SingleConfigurationConfigurable)userObject).getNameText()); } else if (userObject instanceof RunnerAndConfigurationSettingsImpl) { - currentNames.add(((RunnerAndConfigurationSettingsImpl)userObject).getName()); + currentNames.add(((RunnerAndConfigurationSettings)userObject).getName()); } } if (!currentNames.contains(str)) return str; @@ -663,7 +663,7 @@ class RunConfigurable extends BaseConfigurable { } } - private SingleConfigurationConfigurable createNewConfiguration(final RunnerAndConfigurationSettingsImpl settings, final DefaultMutableTreeNode node) { + private SingleConfigurationConfigurable createNewConfiguration(final RunnerAndConfigurationSettings settings, final DefaultMutableTreeNode node) { final SingleConfigurationConfigurable configurationConfigurable = SingleConfigurationConfigurable.editSettings(settings); installUpdateListeners(configurationConfigurable); @@ -689,7 +689,7 @@ class RunConfigurable extends BaseConfigurable { sortTree(myRoot); ((DefaultTreeModel)myTree.getModel()).reload(); } - final RunnerAndConfigurationSettingsImpl settings = getRunManager().createConfiguration(createUniqueName(node), factory); + final RunnerAndConfigurationSettings settings = getRunManager().createConfiguration(createUniqueName(node), factory); createNewConfiguration(settings, node); } @@ -894,7 +894,7 @@ class RunConfigurable extends BaseConfigurable { LOG.assertTrue(configuration != null); try { final DefaultMutableTreeNode typeNode = getSelectedConfigurationTypeNode(); - final RunnerAndConfigurationSettingsImpl settings = configuration.getSnapshot(); + final RunnerAndConfigurationSettings settings = configuration.getSnapshot(); final String copyName = createUniqueName(typeNode); settings.setName(copyName); final SingleConfigurationConfigurable configurable = createNewConfiguration(settings, typeNode); @@ -928,7 +928,7 @@ class RunConfigurable extends BaseConfigurable { catch (ConfigurationException e1) { //do nothing } - final RunnerAndConfigurationSettingsImpl originalConfiguration = configurationConfigurable.getSettings(); + final RunnerAndConfigurationSettings originalConfiguration = configurationConfigurable.getSettings(); if (getRunManager().isTemporary(originalConfiguration)) { getRunManager().makeStable(originalConfiguration.getConfiguration()); } @@ -975,12 +975,12 @@ class RunConfigurable extends BaseConfigurable { } private static class RunConfigurationBean { - private final RunnerAndConfigurationSettingsImpl mySettings; + private final RunnerAndConfigurationSettings mySettings; private final boolean myShared; private final Map, BeforeRunTask> myStepsBeforeLaunch; private final SingleConfigurationConfigurable myConfigurable; - public RunConfigurationBean(final RunnerAndConfigurationSettingsImpl settings, + public RunConfigurationBean(final RunnerAndConfigurationSettings settings, final boolean shared, final Map, BeforeRunTask> stepsBeforeLaunch) { mySettings = settings; @@ -991,13 +991,13 @@ class RunConfigurable extends BaseConfigurable { public RunConfigurationBean(final SingleConfigurationConfigurable configurable) { myConfigurable = configurable; - mySettings = (RunnerAndConfigurationSettingsImpl)myConfigurable.getSettings(); + mySettings = (RunnerAndConfigurationSettings)myConfigurable.getSettings(); final ConfigurationSettingsEditorWrapper editorWrapper = (ConfigurationSettingsEditorWrapper)myConfigurable.getEditor(); myShared = editorWrapper.isStoreProjectConfiguration(); myStepsBeforeLaunch = editorWrapper.getStepsBeforeLaunch(); } - public RunnerAndConfigurationSettingsImpl getSettings() { + public RunnerAndConfigurationSettings getSettings() { return mySettings; } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java index e9be41398d98..3305937fd264 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java @@ -18,6 +18,7 @@ package com.intellij.execution.impl; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.Executor; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.options.ConfigurationException; @@ -95,11 +96,11 @@ public class RunDialog extends DialogWrapper { super.dispose(); } - public static boolean editConfiguration(final Project project, final RunnerAndConfigurationSettingsImpl configuration, final String title) { + public static boolean editConfiguration(final Project project, final RunnerAndConfigurationSettings configuration, final String title) { return editConfiguration(project, configuration, title, null, null); } - public static boolean editConfiguration(final Project project, final RunnerAndConfigurationSettingsImpl configuration, final String title, final String okText, final Icon okIcon) { + public static boolean editConfiguration(final Project project, final RunnerAndConfigurationSettings configuration, final String title, final String okText, final Icon okIcon) { final SingleConfigurationConfigurable configurable = SingleConfigurationConfigurable.editSettings(configuration); final SingleConfigurableEditor dialog = new SingleConfigurableEditor(project, configurable) { { diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java index b3169c1e936e..b8ee9418e349 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java @@ -39,8 +39,8 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, private final Map myTypesByName = new LinkedHashMap(); - private final Map myConfigurations = - new LinkedHashMap(); // template configurations are not included here + private final Map myConfigurations = + new LinkedHashMap(); // template configurations are not included here private final Map mySharedConfigurations = new TreeMap(); /** * configurationID -> [BeforeTaskProviderName->BeforeRunTask] @@ -48,9 +48,9 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, private final Map, BeforeRunTask>> myConfigurationToBeforeTasksMap = new WeakHashMap, BeforeRunTask>>(); - private final Map myTemplateConfigurationsMap = - new HashMap(); - private RunnerAndConfigurationSettingsImpl mySelectedConfiguration = null; + private final Map myTemplateConfigurationsMap = + new HashMap(); + private RunnerAndConfigurationSettings mySelectedConfiguration = null; private String mySelectedConfig = null; @NonNls @@ -113,7 +113,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @NotNull - public RunnerAndConfigurationSettingsImpl createConfiguration(final String name, final ConfigurationFactory factory) { + public RunnerAndConfigurationSettings createConfiguration(final String name, final ConfigurationFactory factory) { return createConfiguration(doCreateConfiguration(name, factory), factory); } @@ -122,13 +122,13 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @NotNull - public RunnerAndConfigurationSettingsImpl createConfiguration(final RunConfiguration runConfiguration, + public RunnerAndConfigurationSettings createConfiguration(final RunConfiguration runConfiguration, final ConfigurationFactory factory) { - RunnerAndConfigurationSettingsImpl template = getConfigurationTemplate(factory); + RunnerAndConfigurationSettings template = getConfigurationTemplate(factory); myConfigurationToBeforeTasksMap.put(runConfiguration, getBeforeRunTasks(template.getConfiguration())); shareConfiguration(runConfiguration, isConfigurationShared(template)); RunnerAndConfigurationSettingsImpl settings = new RunnerAndConfigurationSettingsImpl(this, runConfiguration, false); - settings.importRunnerAndConfigurationSettings(template); + settings.importRunnerAndConfigurationSettings((RunnerAndConfigurationSettingsImpl)template); return settings; } @@ -166,7 +166,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, public RunConfiguration[] getConfigurations(@NotNull final ConfigurationType type) { final List array = new ArrayList(); - for (RunnerAndConfigurationSettingsImpl myConfiguration : getSortedConfigurations()) { + for (RunnerAndConfigurationSettings myConfiguration : getSortedConfigurations()) { final RunConfiguration configuration = myConfiguration.getConfiguration(); final ConfigurationType configurationType = configuration.getType(); if (type.getId().equals(configurationType.getId())) { @@ -179,7 +179,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, public RunConfiguration[] getAllConfigurations() { RunConfiguration[] result = new RunConfiguration[myConfigurations.size()]; int i = 0; - for (Iterator iterator = getSortedConfigurations().iterator(); iterator.hasNext(); i++) { + for (Iterator iterator = getSortedConfigurations().iterator(); iterator.hasNext(); i++) { RunnerAndConfigurationSettings settings = iterator.next(); result[i] = settings.getConfiguration(); } @@ -188,8 +188,8 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @Nullable - public RunnerAndConfigurationSettingsImpl getSettings(RunConfiguration configuration) { - for (RunnerAndConfigurationSettingsImpl settings : getSortedConfigurations()) { + public RunnerAndConfigurationSettings getSettings(RunConfiguration configuration) { + for (RunnerAndConfigurationSettings settings : getSortedConfigurations()) { if (settings.getConfiguration() == configuration) return settings; } return null; @@ -198,20 +198,20 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, /** * Template configuration is not included */ - public RunnerAndConfigurationSettingsImpl[] getConfigurationSettings(@NotNull final ConfigurationType type) { + public RunnerAndConfigurationSettings[] getConfigurationSettings(@NotNull final ConfigurationType type) { - final LinkedHashSet array = new LinkedHashSet(); - for (RunnerAndConfigurationSettingsImpl configuration : getSortedConfigurations()) { + final LinkedHashSet array = new LinkedHashSet(); + for (RunnerAndConfigurationSettings configuration : getSortedConfigurations()) { final ConfigurationType configurationType = configuration.getType(); if (configurationType != null && type.getId().equals(configurationType.getId())) { array.add(configuration); } } - return array.toArray(new RunnerAndConfigurationSettingsImpl[array.size()]); + return array.toArray(new RunnerAndConfigurationSettings[array.size()]); } - public RunnerAndConfigurationSettingsImpl getConfigurationTemplate(final ConfigurationFactory factory) { - RunnerAndConfigurationSettingsImpl template = myTemplateConfigurationsMap.get(factory.getType().getId() + "." + factory.getName()); + public RunnerAndConfigurationSettings getConfigurationTemplate(final ConfigurationFactory factory) { + RunnerAndConfigurationSettings template = myTemplateConfigurationsMap.get(factory.getType().getId() + "." + factory.getName()); if (template == null) { template = new RunnerAndConfigurationSettingsImpl(this, factory.createTemplateConfiguration(myProject, this), true); if (template.getConfiguration() instanceof UnknownRunConfiguration) { @@ -222,7 +222,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, return template; } - public void addConfiguration(RunnerAndConfigurationSettingsImpl settings, boolean shared, Map, BeforeRunTask> tasks) { + public void addConfiguration(RunnerAndConfigurationSettings settings, boolean shared, Map, BeforeRunTask> tasks) { final RunConfiguration configuration = settings.getConfiguration(); final String configName = getUniqueName(configuration); @@ -235,8 +235,8 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, void checkRecentsLimit() { while (getTempConfigurations().length > getConfig().getRecentsLimit()) { - for (Iterator> it = myConfigurations.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = it.next(); + for (Iterator> it = myConfigurations.entrySet().iterator(); it.hasNext();) { + Map.Entry entry = it.next(); if (entry.getValue().isTemporary()) { it.remove(); break; @@ -275,7 +275,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, // it.remove(); // } //} - for (Iterator it = getSortedConfigurations().iterator(); it.hasNext();) { + for (Iterator it = getSortedConfigurations().iterator(); it.hasNext();) { final RunnerAndConfigurationSettings configuration = it.next(); final ConfigurationType configurationType = configuration.getType(); if (configurationType != null && type.getId().equals(configurationType.getId())) { @@ -285,10 +285,10 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @Override - public Collection getSortedConfigurations() { + public Collection getSortedConfigurations() { if (myOrder != null && !myOrder.isEmpty()) { //compatibility - final HashMap settings = - new HashMap(myConfigurations); //sort shared and local configurations + final HashMap settings = + new HashMap(myConfigurations); //sort shared and local configurations myConfigurations.clear(); final List order = new ArrayList(settings.keySet()); Collections.sort(order, new Comparator() { @@ -305,8 +305,8 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @Override - public void removeConfiguration(RunnerAndConfigurationSettingsImpl settings) { - for (Iterator it = getSortedConfigurations().iterator(); it.hasNext();) { + public void removeConfiguration(RunnerAndConfigurationSettings settings) { + for (Iterator it = getSortedConfigurations().iterator(); it.hasNext();) { final RunnerAndConfigurationSettings configuration = it.next(); if (configuration.equals(settings)) { if (mySelectedConfiguration != null && settings.equals(mySelectedConfiguration)) { @@ -319,7 +319,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } } - public RunnerAndConfigurationSettingsImpl getSelectedConfiguration() { + public RunnerAndConfigurationSettings getSelectedConfiguration() { if (mySelectedConfiguration == null && mySelectedConfig != null) { mySelectedConfiguration = myConfigurations.get(mySelectedConfig); mySelectedConfig = null; @@ -327,11 +327,11 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, return mySelectedConfiguration; } - public void setSelectedConfiguration(final RunnerAndConfigurationSettingsImpl configuration) { + public void setSelectedConfiguration(final RunnerAndConfigurationSettings configuration) { mySelectedConfiguration = configuration; } - public static boolean canRunConfiguration(@NotNull final RunnerAndConfigurationSettingsImpl configuration, @NotNull final Executor executor) { + public static boolean canRunConfiguration(@NotNull final RunnerAndConfigurationSettings configuration, @NotNull final Executor executor) { try { configuration.checkSettings(executor); } @@ -347,7 +347,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, public void writeExternal(@NotNull final Element parentNode) throws WriteExternalException { writeContext(parentNode); - for (final RunnerAndConfigurationSettingsImpl runnerAndConfigurationSettings : myTemplateConfigurationsMap.values()) { + for (final RunnerAndConfigurationSettings runnerAndConfigurationSettings : myTemplateConfigurationsMap.values()) { if (runnerAndConfigurationSettings.getConfiguration() instanceof UnknownRunConfiguration) { if (((UnknownRunConfiguration) runnerAndConfigurationSettings.getConfiguration()).isDoNotStore()) { continue; @@ -357,8 +357,8 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, addConfigurationElement(parentNode, runnerAndConfigurationSettings); } - final Collection configurations = getStableConfigurations().values(); - for (RunnerAndConfigurationSettingsImpl configuration : configurations) { + final Collection configurations = getStableConfigurations().values(); + for (RunnerAndConfigurationSettings configuration : configurations) { if (!isConfigurationShared(configuration)) { addConfigurationElement(parentNode, configuration); } @@ -383,7 +383,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } public void writeContext(Element parentNode) throws WriteExternalException { - for (RunnerAndConfigurationSettingsImpl configurationSettings : myConfigurations.values()) { + for (RunnerAndConfigurationSettings configurationSettings : myConfigurations.values()) { if (configurationSettings.isTemporary()) { addConfigurationElement(parentNode, configurationSettings, CONFIGURATION); } @@ -393,21 +393,21 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } } - public void addConfigurationElement(final Element parentNode, RunnerAndConfigurationSettingsImpl template) throws WriteExternalException { + public void addConfigurationElement(final Element parentNode, RunnerAndConfigurationSettings template) throws WriteExternalException { addConfigurationElement(parentNode, template, CONFIGURATION); } - private void addConfigurationElement(final Element parentNode, RunnerAndConfigurationSettingsImpl settings, String elementType) + private void addConfigurationElement(final Element parentNode, RunnerAndConfigurationSettings settings, String elementType) throws WriteExternalException { final Element configurationElement = new Element(elementType); parentNode.addContent(configurationElement); - settings.writeExternal(configurationElement); + ((RunnerAndConfigurationSettingsImpl)settings).writeExternal(configurationElement); if (!(settings.getConfiguration() instanceof UnknownRunConfiguration)) { final Map, BeforeRunTask> tasks = getBeforeRunTasks(settings.getConfiguration()); Map, BeforeRunTask> templateTasks; if (!settings.isTemplate()) { - final RunnerAndConfigurationSettingsImpl templateSettings = getConfigurationTemplate(settings.getFactory()); + final RunnerAndConfigurationSettings templateSettings = getConfigurationTemplate(settings.getFactory()); templateTasks = getBeforeRunTasks(templateSettings.getConfiguration()); } else { @@ -485,7 +485,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, loadConfiguration(element, false); } if (mySelectedConfig != null) { - RunnerAndConfigurationSettingsImpl configurationSettings = myConfigurations.get(mySelectedConfig); + RunnerAndConfigurationSettings configurationSettings = myConfigurations.get(mySelectedConfig); if (configurationSettings != null) { mySelectedConfiguration = null; } @@ -500,7 +500,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @Nullable - public RunnerAndConfigurationSettingsImpl loadConfiguration(final Element element, boolean isShared) throws InvalidDataException { + public RunnerAndConfigurationSettings loadConfiguration(final Element element, boolean isShared) throws InvalidDataException { RunnerAndConfigurationSettingsImpl settings = new RunnerAndConfigurationSettingsImpl(this); settings.readExternal(element); ConfigurationFactory factory = settings.getFactory(); @@ -524,7 +524,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } @NotNull - private Map, BeforeRunTask> readStepsBeforeRun(final Element child, RunnerAndConfigurationSettingsImpl settings) { + private Map, BeforeRunTask> readStepsBeforeRun(final Element child, RunnerAndConfigurationSettings settings) { final Map, BeforeRunTask> map = new HashMap, BeforeRunTask>(); if (child != null) { for (Object o : child.getChildren(OPTION)) { @@ -589,7 +589,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, return "RunManager"; } - public void setTemporaryConfiguration(@NotNull final RunnerAndConfigurationSettingsImpl tempConfiguration) { + public void setTemporaryConfiguration(@NotNull final RunnerAndConfigurationSettings tempConfiguration) { tempConfiguration.setTemporary(true); addConfiguration(tempConfiguration, isConfigurationShared(tempConfiguration), @@ -597,15 +597,15 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, setActiveConfiguration(tempConfiguration); } - public void setActiveConfiguration(final RunnerAndConfigurationSettingsImpl configuration) { + public void setActiveConfiguration(final RunnerAndConfigurationSettings configuration) { setSelectedConfiguration(configuration); } - public Map getStableConfigurations() { - final Map result = - new LinkedHashMap(myConfigurations); - for (Iterator> it = result.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = it.next(); + public Map getStableConfigurations() { + final Map result = + new LinkedHashMap(myConfigurations); + for (Iterator> it = result.entrySet().iterator(); it.hasNext();) { + Map.Entry entry = it.next(); if (entry.getValue().isTemporary()) { it.remove(); } @@ -617,13 +617,13 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, return Arrays.asList(getTempConfigurations()).contains(configuration); } - public boolean isTemporary(RunnerAndConfigurationSettingsImpl settings) { + public boolean isTemporary(RunnerAndConfigurationSettings settings) { return settings.isTemporary(); } public RunConfiguration[] getTempConfigurations() { - List configurations = ContainerUtil.mapNotNull(myConfigurations.values(), new NullableFunction() { - public RunConfiguration fun(RunnerAndConfigurationSettingsImpl settings) { + List configurations = ContainerUtil.mapNotNull(myConfigurations.values(), new NullableFunction() { + public RunConfiguration fun(RunnerAndConfigurationSettings settings) { return settings.isTemporary() ? settings.getConfiguration() : null; } }); @@ -631,7 +631,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } public void makeStable(final RunConfiguration configuration) { - RunnerAndConfigurationSettingsImpl settings = getSettings(configuration); + RunnerAndConfigurationSettings settings = getSettings(configuration); if (settings != null) { settings.setTemporary(false); } @@ -641,10 +641,10 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, return createConfiguration(name, type); } - public boolean isConfigurationShared(final RunnerAndConfigurationSettingsImpl settings) { + public boolean isConfigurationShared(final RunnerAndConfigurationSettings settings) { Boolean shared = mySharedConfigurations.get(settings.getConfiguration().getUniqueID()); if (shared == null) { - final RunnerAndConfigurationSettingsImpl template = getConfigurationTemplate(settings.getFactory()); + final RunnerAndConfigurationSettings template = getConfigurationTemplate(settings.getFactory()); shared = mySharedConfigurations.get(template.getConfiguration().getUniqueID()); } return shared != null && shared.booleanValue(); @@ -653,14 +653,14 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, public Collection getBeforeRunTasks(Key taskProviderID, boolean includeOnlyActiveTasks) { final Collection tasks = new ArrayList(); if (includeOnlyActiveTasks) { - final Set checkedTemplates = new HashSet(); - for (RunnerAndConfigurationSettingsImpl settings : myConfigurations.values()) { + final Set checkedTemplates = new HashSet(); + for (RunnerAndConfigurationSettings settings : myConfigurations.values()) { final BeforeRunTask runTask = getBeforeRunTask(settings.getConfiguration(), taskProviderID); if (runTask != null && runTask.isEnabled()) { tasks.add((T)runTask); } else { - final RunnerAndConfigurationSettingsImpl template = getConfigurationTemplate(settings.getFactory()); + final RunnerAndConfigurationSettings template = getConfigurationTemplate(settings.getFactory()); if (!checkedTemplates.contains(template)) { checkedTemplates.add(template); final BeforeRunTask templateTask = getBeforeRunTask(template.getConfiguration(), taskProviderID); @@ -672,13 +672,13 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } } else { - for (RunnerAndConfigurationSettingsImpl settings : myTemplateConfigurationsMap.values()) { + for (RunnerAndConfigurationSettings settings : myTemplateConfigurationsMap.values()) { final T task = getBeforeRunTask(settings.getConfiguration(), taskProviderID); if (task != null) { tasks.add(task); } } - for (RunnerAndConfigurationSettingsImpl settings : myConfigurations.values()) { + for (RunnerAndConfigurationSettings settings : myConfigurations.values()) { final T task = getBeforeRunTask(settings.getConfiguration(), taskProviderID); if (task != null) { tasks.add(task); @@ -690,7 +690,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, @Override @Nullable - public RunnerAndConfigurationSettingsImpl findConfigurationByName(@NotNull String name) { + public RunnerAndConfigurationSettings findConfigurationByName(@NotNull String name) { return null; } @@ -714,7 +714,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, return _tasks; } - final RunnerAndConfigurationSettingsImpl template = getConfigurationTemplate(settings.getFactory()); + final RunnerAndConfigurationSettings template = getConfigurationTemplate(settings.getFactory()); final Map, BeforeRunTask> templateTasks = myConfigurationToBeforeTasksMap.get(template.getConfiguration()); if (templateTasks != null) { final Map, BeforeRunTask> _tasks = new HashMap, BeforeRunTask>(); @@ -756,7 +756,7 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, fireBeforeRunTasksUpdated(); } - public void addConfiguration(final RunnerAndConfigurationSettingsImpl settings, final boolean isShared) { + public void addConfiguration(final RunnerAndConfigurationSettings settings, final boolean isShared) { addConfiguration(settings, isShared, Collections., BeforeRunTask>emptyMap()); } @@ -765,9 +765,9 @@ public class RunManagerImpl extends RunManagerEx implements JDOMExternalizable, } public void removeNotExistingSharedConfigurations(final Set existing) { - for (Iterator> it = myConfigurations.entrySet().iterator(); it.hasNext();) { - Map.Entry c = it.next(); - final RunnerAndConfigurationSettingsImpl o = c.getValue(); + for (Iterator> it = myConfigurations.entrySet().iterator(); it.hasNext();) { + Map.Entry c = it.next(); + final RunnerAndConfigurationSettings o = c.getValue(); if (!o.isTemplate() && isConfigurationShared(o) && !existing.contains(getUniqueName(o.getConfiguration()))) { it.remove(); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java index d2c09f2b0833..94de17906a01 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunnerAndConfigurationSettingsImpl.java @@ -105,9 +105,9 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C return myConfiguration; } - public Factory createFactory() { - return new Factory() { - public RunnerAndConfigurationSettingsImpl create() { + public Factory createFactory() { + return new Factory() { + public RunnerAndConfigurationSettings create() { RunConfiguration configuration = myConfiguration.getFactory().createConfiguration(ExecutionBundle.message("default.run.configuration.name"), myConfiguration); return new RunnerAndConfigurationSettingsImpl(myManager, configuration, false); } @@ -306,7 +306,7 @@ public class RunnerAndConfigurationSettingsImpl implements JDOMExternalizable, C return myConfiguration == null ? null : myConfiguration.getType(); } - public RunnerAndConfigurationSettingsImpl clone() { + public RunnerAndConfigurationSettings clone() { RunnerAndConfigurationSettingsImpl copy = new RunnerAndConfigurationSettingsImpl(myManager, myConfiguration.clone(), false); copy.importRunnerAndConfigurationSettings(this); return copy; diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java index c4b5d69b56b8..1a7eea21c846 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java @@ -38,7 +38,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; public final class SingleConfigurationConfigurable - extends SettingsEditorConfigurable { + extends SettingsEditorConfigurable { private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.SingleConfigurationConfigurable"); private final PlainDocument myNameDocument = new PlainDocument(); private ValidationResult myLastValidationResult = null; @@ -49,7 +49,7 @@ public final class SingleConfigurationConfigurable SingleConfigurationConfigurable editSettings(RunnerAndConfigurationSettingsImpl settings) { + public static SingleConfigurationConfigurable editSettings(RunnerAndConfigurationSettings settings) { SingleConfigurationConfigurable configurable = new SingleConfigurationConfigurable(settings); configurable.reset(); return configurable; @@ -195,8 +195,8 @@ public final class SingleConfigurationConfigurable editor = getEditor(); + public RunnerAndConfigurationSettings getSnapshot() throws ConfigurationException { + final SettingsEditor editor = getEditor(); return editor == null ? null : editor.getSnapshot(); } diff --git a/platform/lang-impl/src/com/intellij/execution/impl/TypeTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/TypeTemplatesConfigurable.java index 58922126a667..0ec4e7b25e60 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/TypeTemplatesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/TypeTemplatesConfigurable.java @@ -42,7 +42,7 @@ class TypeTemplatesConfigurable implements Configurable { final ConfigurationFactory[] factories = getFactories(); for (int i = 0; i < factories.length; i++) { final ConfigurationFactory factory = factories[i]; - final RunnerAndConfigurationSettingsImpl template = runManager.getConfigurationTemplate(factory); + final RunnerAndConfigurationSettings template = runManager.getConfigurationTemplate(factory); final Configurable configurable = new TemplateConfigurable(template); myConfigurables[i] = configurable; myTabbedPane.addTab(factory.getName(), configurable.getIcon(), configurable.createComponent(), null); @@ -106,10 +106,10 @@ class TypeTemplatesConfigurable implements Configurable { : new TypeTemplatesConfigurable(type, runManager, project); } - private static class TemplateConfigurable extends SettingsEditorConfigurable { + private static class TemplateConfigurable extends SettingsEditorConfigurable { private final RunnerAndConfigurationSettings myTemplate; - public TemplateConfigurable(RunnerAndConfigurationSettingsImpl template) { + public TemplateConfigurable(RunnerAndConfigurationSettings template) { super(new ConfigurationSettingsEditorWrapper(template), template); myTemplate = template; } diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java index 5ce17117a722..42269c6d8a6b 100644 --- a/platform/util/src/com/intellij/openapi/util/IconLoader.java +++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java @@ -30,7 +30,7 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.lang.ref.Reference; import java.net.URL; -import java.util.Map; +import java.util.*; public final class IconLoader { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.IconLoader"); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java index 82c26ddd41c6..6c1013a76ae9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java @@ -22,7 +22,6 @@ import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.configurations.RunConfigurationModule; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; @@ -48,7 +47,7 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr return mySourceElement; } - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { final PsiElement element = location.getPsiElement(); final PsiFile file = element.getContainingFile(); if (!(file instanceof GroovyFile)) { @@ -64,7 +63,7 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr if (settings != null) { final GroovyScriptRunConfiguration configuration = (GroovyScriptRunConfiguration)settings.getConfiguration(); GroovyScriptType.getScriptType(groovyFile).tuneConfiguration(groovyFile, configuration, location); - return (RunnerAndConfigurationSettingsImpl)settings; + return settings; } } @@ -72,10 +71,10 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr } @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(); final String path = ((GroovyScriptRunConfiguration)configuration).scriptPath; if (path != null) { diff --git a/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java index 637c647097d0..2d69e2092423 100644 --- a/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/AllInPackageConfigurationProducer.java @@ -18,8 +18,8 @@ package com.intellij.execution.junit; import com.intellij.execution.Location; import com.intellij.execution.RunConfigurationExtension; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiPackage; @@ -27,12 +27,12 @@ import com.intellij.psi.PsiPackage; public class AllInPackageConfigurationProducer extends JUnitConfigurationProducer { private PsiPackage myPackage = null; - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { final Project project = location.getProject(); final PsiElement element = location.getPsiElement(); myPackage = checkPackage(element); if (myPackage == null) return null; - RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context); + RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context); final JUnitConfiguration configuration = (JUnitConfiguration)settings.getConfiguration(); final JUnitConfiguration.Data data = configuration.getPersistentData(); data.PACKAGE_NAME = myPackage.getQualifiedName(); diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java index 02b66c131637..d6f9134c3dab 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java @@ -18,8 +18,8 @@ package com.intellij.execution.junit; import com.intellij.execution.Location; import com.intellij.execution.RunManagerEx; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.impl.RunManagerImpl; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.Comparing; import com.intellij.psi.*; @@ -42,8 +42,8 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(@NotNull Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(@NotNull Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { final Module predefinedModule = ((JUnitConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject())) @@ -60,7 +60,7 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio } else { testPackage = null; } - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { final JUnitConfiguration unitConfiguration = (JUnitConfiguration)existingConfiguration.getConfiguration(); final TestObject testobject = unitConfiguration.getTestObject(); if (testobject != null) { diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java index 76ad86be4dc3..7e00c2e788c5 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestClassConfigurationProducer.java @@ -19,8 +19,8 @@ package com.intellij.execution.junit; import com.intellij.execution.JavaExecutionUtil; import com.intellij.execution.Location; import com.intellij.execution.RunConfigurationExtension; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; @@ -29,20 +29,19 @@ import com.intellij.psi.PsiElement; public class TestClassConfigurationProducer extends JUnitConfigurationProducer { private PsiClass myTestClass; - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, final ConfigurationContext context) { location = JavaExecutionUtil.stepIntoSingleClass(location); final Project project = location.getProject(); myTestClass = JUnitUtil.getTestClass(location); if (myTestClass == null) return null; - RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context); + RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context); final JUnitConfiguration configuration = (JUnitConfiguration)settings.getConfiguration(); setupConfigurationModule(context, configuration); final Module originalModule = configuration.getConfigurationModule().getModule(); configuration.beClassConfiguration(myTestClass); configuration.restoreOriginalModule(originalModule); RunConfigurationExtension.patchCreatedConfiguration(configuration); - copyStepsBeforeRun(project, configuration); return settings; } diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java index 85f59b3ef9df..cd2e2802e4bf 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestMethodConfigurationProducer.java @@ -18,8 +18,8 @@ package com.intellij.execution.junit; import com.intellij.execution.Location; import com.intellij.execution.RunConfigurationExtension; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; @@ -30,19 +30,18 @@ import java.util.Iterator; public class TestMethodConfigurationProducer extends JUnitConfigurationProducer { private Location myMethodLocation; - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { final Project project = location.getProject(); myMethodLocation = getTestMethod(location); if (myMethodLocation == null) return null; - RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context); + RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context); final JUnitConfiguration configuration = (JUnitConfiguration)settings.getConfiguration(); setupConfigurationModule(context, configuration); final Module originalModule = configuration.getConfigurationModule().getModule(); configuration.beMethodConfiguration(myMethodLocation); configuration.restoreOriginalModule(originalModule); RunConfigurationExtension.patchCreatedConfiguration(configuration); - copyStepsBeforeRun(project, configuration); return settings; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java index 00be0afb5e7d..53f8f2c4c994 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenConfigurationProducer.java @@ -21,9 +21,9 @@ package org.jetbrains.idea.maven.execution; import com.intellij.execution.Location; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; @@ -47,20 +47,20 @@ public class MavenConfigurationProducer extends RuntimeConfigurationProducer{ } @Override - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { myPsiElement = location.getPsiElement(); final MavenRunnerParameters params = createBuildParameters(location); if (params == null) return null; - return (RunnerAndConfigurationSettingsImpl)MavenRunConfigurationType.createRunnerAndConfigurationSettings(null, null, params, location.getProject()); + return MavenRunConfigurationType.createRunnerAndConfigurationSettings(null, null, params, location.getProject()); } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { final MavenRunnerParameters runnerParameters = createBuildParameters(location); - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { final RunConfiguration configuration = existingConfiguration.getConfiguration(); if (configuration instanceof MavenRunConfiguration && ((MavenRunConfiguration)configuration).getRunnerParameters().equals(runnerParameters)) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java index 0fae9fccfe1c..d6f23b71691a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java @@ -22,7 +22,6 @@ import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.ConfigurationTypeUtil; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.executors.DefaultRunExecutor; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.openapi.actionSystem.DataContext; @@ -185,7 +184,7 @@ public class MavenRunConfigurationType implements ConfigurationType { Project project) { MavenRunConfigurationType type = ConfigurationTypeUtil.findConfigurationType(MavenRunConfigurationType.class); - final RunnerAndConfigurationSettingsImpl settings = RunManagerEx.getInstanceEx(project) + final RunnerAndConfigurationSettings settings = RunManagerEx.getInstanceEx(project) .createConfiguration(generateName(project, params), type.myFactory); MavenRunConfiguration runConfiguration = (MavenRunConfiguration)settings.getConfiguration(); runConfiguration.setRunnerParameters(params); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationProducer.java index 878a1e326b19..906820138653 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationProducer.java @@ -22,8 +22,8 @@ package com.theoryinpractice.testng.configuration; import com.intellij.execution.Location; import com.intellij.execution.RunManagerEx; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.impl.RunManagerImpl; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.JavaRuntimeConfigurationProducerBase; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.Comparing; @@ -38,14 +38,14 @@ public abstract class TestNGConfigurationProducer extends JavaRuntimeConfigurati } @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { final Module predefinedModule = ((TestNGConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject())) .getConfigurationTemplate(getConfigurationFactory()) .getConfiguration()).getConfigurationModule().getModule(); - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { TestNGConfiguration config = (TestNGConfiguration)existingConfiguration.getConfiguration(); TestData testobject = config.getPersistantData(); if (testobject != null){ diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java index 4870909fd2c9..47645069a3e6 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java @@ -25,7 +25,6 @@ import com.intellij.execution.PsiLocation; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.RunConfigurationExtension; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.psi.*; @@ -45,7 +44,7 @@ public class TestNGInClassConfigurationProducer extends TestNGConfigurationProdu } @Nullable - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { PsiElement element = location.getPsiElement(); PsiClass psiClass = null; for (Iterator> iterator = location.getAncestors(PsiClass.class, false); iterator.hasNext();) { @@ -75,9 +74,8 @@ public class TestNGInClassConfigurationProducer extends TestNGConfigurationProdu } configuration.restoreOriginalModule(originalModule); settings.setName(configuration.getName()); - copyStepsBeforeRun(project, configuration); RunConfigurationExtension.patchCreatedConfiguration(configuration); - return (RunnerAndConfigurationSettingsImpl)settings; + return settings; } public int compareTo(Object o) { diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPackageConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPackageConfigurationProducer.java index 4fb822e25f3d..1dccaf25523b 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPackageConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPackageConfigurationProducer.java @@ -17,8 +17,8 @@ package com.theoryinpractice.testng.configuration; import com.intellij.execution.Location; import com.intellij.execution.RunConfigurationExtension; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiPackage; @@ -28,12 +28,12 @@ import com.theoryinpractice.testng.model.TestType; public class TestNGPackageConfigurationProducer extends TestNGConfigurationProducer { private PsiPackage myPackage = null; - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(final Location location, final ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(final Location location, final ConfigurationContext context) { final Project project = location.getProject(); final PsiElement element = location.getPsiElement(); myPackage = checkPackage(element); if (myPackage == null) return null; - RunnerAndConfigurationSettingsImpl settings = cloneTemplateConfiguration(project, context); + RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context); final TestNGConfiguration configuration = (TestNGConfiguration)settings.getConfiguration(); final TestData data = configuration.data; data.PACKAGE_NAME = myPackage.getQualifiedName(); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java index 6ba25c6b15e1..b8639a198be1 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java @@ -24,7 +24,6 @@ import com.intellij.execution.Location; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.RunConfigurationExtension; import com.intellij.execution.actions.ConfigurationContext; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; @@ -43,7 +42,7 @@ public class TestNGSuiteConfigurationProducer extends TestNGConfigurationProduce } @Nullable - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { final PsiElement element = location.getPsiElement(); final PsiFile containingFile = element.getContainingFile(); if (containingFile == null) return null; @@ -60,9 +59,8 @@ public class TestNGSuiteConfigurationProducer extends TestNGConfigurationProduce configuration.getPersistantData().TEST_OBJECT = TestType.SUITE.getType(); configuration.restoreOriginalModule(originalModule); settings.setName(configuration.getName()); - copyStepsBeforeRun(project, configuration); RunConfigurationExtension.patchCreatedConfiguration(configuration); - return (RunnerAndConfigurationSettingsImpl)settings; + return settings; } public int compareTo(Object o) { diff --git a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java index 28b54b26abca..bddb42ba966f 100644 --- a/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java +++ b/plugins/testng/testSources/com/theoryinpractice/testng/configuration/ConfigurationsTest.java @@ -24,7 +24,6 @@ import com.intellij.execution.PsiLocation; import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.application.Result; import com.intellij.openapi.command.WriteCommandAction; @@ -177,7 +176,7 @@ public class ConfigurationsTest { final Project project = myProjectFixture.getProject(); final PsiClass psiClass = findTestClass(project); final TestNGInClassConfigurationProducer producer = new TestNGInClassConfigurationProducer(); - final RunnerAndConfigurationSettingsImpl config = producer.createConfigurationByElement(new PsiLocation(project, psiClass), null); + final RunnerAndConfigurationSettings config = producer.createConfigurationByElement(new PsiLocation(project, psiClass), null); assert config != null; final RunConfiguration runConfiguration = config.getConfiguration(); Assert.assertTrue(runConfiguration instanceof TestNGConfiguration); @@ -202,7 +201,7 @@ public class ConfigurationsTest { final RunManagerEx manager = RunManagerEx.getInstanceEx(project); final RunnerAndConfigurationSettings settings = manager.createRunConfiguration("testt", TestNGConfigurationType.getInstance().getConfigurationFactories()[0]); - manager.addConfiguration((RunnerAndConfigurationSettingsImpl)settings, false); + manager.addConfiguration(settings, false); return (TestNGConfiguration)settings.getConfiguration(); } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java index c0d8760bfaf8..2b0265f33fd5 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -18,11 +18,11 @@ package com.intellij.uiDesigner.snapShooter; import com.intellij.execution.ExecutionException; import com.intellij.execution.RunManagerEx; +import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.RunnerRegistry; import com.intellij.execution.application.ApplicationConfiguration; import com.intellij.execution.application.ApplicationConfigurationType; import com.intellij.execution.executors.DefaultRunExecutor; -import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.util.JreVersionDetector; @@ -111,14 +111,14 @@ public class CreateSnapShotAction extends AnAction { if (dir == null) return; final SnapShotClient client = new SnapShotClient(); - List appConfigurations = new ArrayList(); - RunnerAndConfigurationSettingsImpl snapshotConfiguration = null; + List appConfigurations = new ArrayList(); + RunnerAndConfigurationSettings snapshotConfiguration = null; boolean connected = false; ApplicationConfigurationType cfgType = ApplicationConfigurationType.getInstance(); - RunnerAndConfigurationSettingsImpl[] racsi = RunManagerEx.getInstanceEx(project).getConfigurationSettings(cfgType); + RunnerAndConfigurationSettings[] racsi = RunManagerEx.getInstanceEx(project).getConfigurationSettings(cfgType); - for(RunnerAndConfigurationSettingsImpl config: racsi) { + for(RunnerAndConfigurationSettings config: racsi) { if (config.getConfiguration() instanceof ApplicationConfiguration) { ApplicationConfiguration appConfig = (ApplicationConfiguration) config.getConfiguration(); appConfigurations.add(config); @@ -259,8 +259,8 @@ public class CreateSnapShotAction extends AnAction { } @Nullable - private static RunnerAndConfigurationSettingsImpl promptForSnapshotConfiguration(final Project project, - final List configurations) { + private static RunnerAndConfigurationSettings promptForSnapshotConfiguration(final Project project, + final List configurations) { if (configurations.isEmpty()) { Messages.showMessageDialog(project, UIDesignerBundle.message("snapshot.no.configuration.error"), UIDesignerBundle.message("snapshot.title"), Messages.getInformationIcon()); @@ -279,7 +279,7 @@ public class CreateSnapShotAction extends AnAction { return null; } - final RunnerAndConfigurationSettingsImpl snapshotConfiguration; + final RunnerAndConfigurationSettings snapshotConfiguration; if (configurations.size() == 1) { final int rc = Messages.showYesNoDialog( project, diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltConfigurationProducer.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltConfigurationProducer.java index 7cb859be5e99..2d4a70cc7615 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltConfigurationProducer.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltConfigurationProducer.java @@ -26,7 +26,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.project.Project; import com.intellij.psi.PsiElement; @@ -50,7 +49,7 @@ public class XsltConfigurationProducer extends RuntimeConfigurationProducer{ } @Override - protected RunnerAndConfigurationSettingsImpl createConfigurationByElement(Location location, ConfigurationContext context) { + protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { final XmlFile file = PsiTreeUtil.getParentOfType(location.getPsiElement(), XmlFile.class, false); if (file != null && file.isPhysical() && XsltSupport.isXsltFile(file)) { myFile = file; @@ -58,7 +57,7 @@ public class XsltConfigurationProducer extends RuntimeConfigurationProducer{ final RunnerAndConfigurationSettings settings = RunManager.getInstance(project).createRunConfiguration(myFile.getName(), getConfigurationFactory()); ((XsltRunConfiguration)settings.getConfiguration()).initFromFile(myFile); - return (RunnerAndConfigurationSettingsImpl)settings; + return settings; } return null; } @@ -69,12 +68,12 @@ public class XsltConfigurationProducer extends RuntimeConfigurationProducer{ @Override - protected RunnerAndConfigurationSettingsImpl findExistingByElement(Location location, - @NotNull RunnerAndConfigurationSettingsImpl[] existingConfigurations + protected RunnerAndConfigurationSettings findExistingByElement(Location location, + @NotNull RunnerAndConfigurationSettings[] existingConfigurations ) { final XmlFile file = PsiTreeUtil.getParentOfType(location.getPsiElement(), XmlFile.class, false); if (file != null && file.isPhysical() && XsltSupport.isXsltFile(file)) { - for (RunnerAndConfigurationSettingsImpl existingConfiguration : existingConfigurations) { + for (RunnerAndConfigurationSettings existingConfiguration : existingConfigurations) { final RunConfiguration configuration = existingConfiguration.getConfiguration(); if (configuration instanceof XsltRunConfiguration) { if (file.getVirtualFile().getPath().replace('/', File.separatorChar)