Do not reuse RunConfigurationModule for different configurations

fixed PY-10200 py.test producer choses the wrong project
This commit is contained in:
Ekaterina Tuzova
2013-07-09 16:53:54 +04:00
parent 7f45e1a6ce
commit b00d24e5ff
11 changed files with 40 additions and 33 deletions
@@ -63,7 +63,7 @@ public class RestRunConfigurationType implements ConfigurationType {
}
public RunConfiguration createTemplateConfiguration(Project project) {
return new DocutilsRunConfiguration("", new RunConfigurationModule(project), this);
return new DocutilsRunConfiguration("", project, this);
}
}
@@ -73,7 +73,7 @@ public class RestRunConfigurationType implements ConfigurationType {
}
public RunConfiguration createTemplateConfiguration(Project project) {
return new SphinxRunConfiguration("", new RunConfigurationModule(project), this);
return new SphinxRunConfiguration("", project, this);
}
}
}
@@ -6,6 +6,7 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.jetbrains.rest.run.RestConfigurationEditor;
import com.jetbrains.rest.run.RestRunConfiguration;
@@ -17,14 +18,14 @@ import org.jetbrains.annotations.NotNull;
public class DocutilsRunConfiguration extends RestRunConfiguration {
public DocutilsRunConfiguration(final String name,
final RunConfigurationModule module,
final Project project,
final ConfigurationFactory factory) {
super(name, module, factory);
super(name, new RunConfigurationModule(project), factory);
}
@Override
protected ModuleBasedConfiguration createInstance() {
return new DocutilsRunConfiguration(getName(), getConfigurationModule(), getFactory());
return new DocutilsRunConfiguration(getName(), getProject(), getFactory());
}
@Override
@@ -6,6 +6,7 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.jetbrains.rest.run.RestConfigurationEditor;
import com.jetbrains.rest.run.RestRunConfiguration;
@@ -16,14 +17,14 @@ import org.jetbrains.annotations.NotNull;
*/
public class SphinxRunConfiguration extends RestRunConfiguration {
public SphinxRunConfiguration(final String name,
final RunConfigurationModule module,
final Project project,
final ConfigurationFactory factory) {
super(name, module, factory);
super(name, new RunConfigurationModule(project), factory);
}
@Override
protected ModuleBasedConfiguration createInstance() {
return new SphinxRunConfiguration(getName(), getConfigurationModule(), getFactory());
return new SphinxRunConfiguration(getName(), getProject(), getFactory());
}
@Override