This commit is contained in:
anna
2010-05-13 19:44:55 +04:00
parent 9be694efd5
commit 1e6a387db4
3 changed files with 17 additions and 13 deletions
@@ -22,7 +22,6 @@ package com.intellij.execution.applet;
import com.intellij.execution.JavaExecutionUtil;
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.junit.JUnitUtil;
@@ -57,7 +56,7 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce
final PsiElement element = location.getPsiElement();
myPsiClass = getAppletClass(element, PsiManager.getInstance(project));
if (myPsiClass == null) return null;
RunnerAndConfigurationSettings settings = RunManagerEx.getInstanceEx(project).createConfiguration("", getConfigurationFactory());
RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
final AppletConfiguration configuration = (AppletConfiguration)settings.getConfiguration();
configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(myPsiClass);
configuration.setModule(new JUnitUtil.ModuleOfClass().convert(myPsiClass));
@@ -114,6 +114,22 @@ class PreferedProducerFind {
return ((LocatableConfigurationType)getConfigurationType()).createConfigurationByLocation(location);
}
@Override
protected RunnerAndConfigurationSettings findExistingByElement(Location location,
@NotNull RunnerAndConfigurationSettings[] existingConfigurations) {
if (existingConfigurations.length > 0) {
ConfigurationType type = existingConfigurations[0].getType();
if (type instanceof LocatableConfigurationType) {
for (final RunnerAndConfigurationSettings configuration : existingConfigurations) {
if (((LocatableConfigurationType)type).isConfigurationByLocation(configuration.getConfiguration(), location)) {
return configuration;
}
}
}
}
return null;
}
public int compareTo(final Object o) {
return PREFERED;
}
@@ -80,17 +80,6 @@ public abstract class RuntimeConfigurationProducer implements Comparable {
@Nullable
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 RunnerAndConfigurationSettings configuration : existingConfigurations) {
if (((LocatableConfigurationType)type).isConfigurationByLocation(configuration.getConfiguration(), location)) {
return configuration;
}
}
}
}
return null;
}