MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

JUnit producers converted to new API

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-08-01 19:12:44 +02:00
parent 5eb0064733
commit 0f2a8de77c
13 changed files with 139 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
+3 -6
View File
@@ -16,7 +16,6 @@
package com.intellij.execution.application;
import com.intellij.execution.JavaExecutionUtil;
import com.intellij.execution.JavaRunConfigurationExtensionManager;
import com.intellij.execution.Location;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.configurations.ConfigurationUtil;
@@ -51,7 +50,7 @@ public class ApplicationConfigurationProducer extends JavaRunConfigurationProduc
final PsiClass aClass = method.getContainingClass();
if (ConfigurationUtil.MAIN_CLASS.value(aClass)) {
sourceElement.set(method);
setupConfiguration(configuration, aClass, context, location);
setupConfiguration(configuration, aClass, context);
return true;
}
currentElement = method.getParent();
@@ -59,18 +58,16 @@ public class ApplicationConfigurationProducer extends JavaRunConfigurationProduc
final PsiClass aClass = ApplicationConfigurationType.getMainClass(element);
if (aClass == null) return false;
sourceElement.set(aClass);
setupConfiguration(configuration, aClass, context, location);
setupConfiguration(configuration, aClass, context);
return true;
}
private void setupConfiguration(ApplicationConfiguration configuration,
final PsiClass aClass,
final ConfigurationContext context,
Location location) {
final ConfigurationContext context) {
configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(aClass);
configuration.setGeneratedName();
setupConfigurationModule(context, configuration);
JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location);
}
@Nullable
java/execution/impl/src/com/intellij/execution/junit/JavaRunConfigurationProducerBase.java
+29 -7
View File
@@ -1,19 +1,19 @@
package com.intellij.execution.junit;
import com.intellij.execution.JavaRunConfigurationExtensionManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.actions.ConfigurationFromContext;
import com.intellij.execution.actions.RunConfigurationProducer;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.execution.configurations.ModuleBasedConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.*;
import com.intellij.execution.testframework.TestSearchScope;
import com.intellij.openapi.module.Module;
import org.jetbrains.annotations.Nullable;
/**
* @author yole
*/
public abstract class JavaRunConfigurationProducerBase<T extends RunConfiguration> extends RunConfigurationProducer<T> {
public abstract class JavaRunConfigurationProducerBase<T extends ModuleBasedConfiguration> extends RunConfigurationProducer<T> {
protected JavaRunConfigurationProducerBase(ConfigurationFactory configurationFactory) {
super(configurationFactory);
}
@@ -22,7 +22,7 @@ public abstract class JavaRunConfigurationProducerBase<T extends RunConfiguratio
super(configurationType);
}
protected boolean setupConfigurationModule(@Nullable ConfigurationContext context, ModuleBasedConfiguration configuration) {
protected boolean setupConfigurationModule(@Nullable ConfigurationContext context, T configuration) {
if (context != null) {
final RunnerAndConfigurationSettings template = context.getRunManager().getConfigurationTemplate(getConfigurationFactory());
final Module contextModule = context.getModule();
@@ -40,10 +40,32 @@ public abstract class JavaRunConfigurationProducerBase<T extends RunConfiguratio
return false;
}
protected Module findModule(ModuleBasedConfiguration configuration, Module contextModule) {
protected Module findModule(T configuration, Module contextModule) {
if (configuration.getConfigurationModule().getModule() == null && contextModule != null) {
return contextModule;
}
return null;
}
protected TestSearchScope setupPackageConfiguration(ConfigurationContext context,
T configuration,
TestSearchScope scope) {
if (scope != TestSearchScope.WHOLE_PROJECT) {
if (!setupConfigurationModule(context, configuration)) {
return TestSearchScope.WHOLE_PROJECT;
}
}
return scope;
}
@Nullable
@Override
public ConfigurationFromContext createConfigurationFromContext(ConfigurationContext context) {
ConfigurationFromContext fromContext = super.createConfigurationFromContext(context);
if (fromContext != null) {
JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration((RunConfigurationBase)fromContext.getConfiguration(),
context.getLocation());
}
return fromContext;
}
}