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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-07-25 19:15:56 +04:00
parent 73728e8f72 17135d4309
commit 31faaaa577
15 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-rest/src/com/jetbrains/rest/run/RestRunConfiguration.java
+3 -4
View File
@@ -1,7 +1,7 @@
package com.jetbrains.rest.run;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.RunConfigurationModule;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMExternalizerUtil;
import com.intellij.openapi.util.WriteExternalException;
@@ -24,10 +24,9 @@ public abstract class RestRunConfiguration extends AbstractPythonRunConfiguratio
private static final String TASK = "docutils_task";
private static final String OPEN_IN_BROWSER = "docutils_open_in_browser";
public RestRunConfiguration(final String name,
final RunConfigurationModule module,
public RestRunConfiguration(Project project,
final ConfigurationFactory factory) {
super(name, module, factory);
super(project, factory);
}
public String getInputFile() {
python/python-rest/src/com/jetbrains/rest/run/RestRunConfigurationType.java
+2 -2
View File
@@ -63,7 +63,7 @@ public class RestRunConfigurationType implements ConfigurationType {
}
public RunConfiguration createTemplateConfiguration(Project project) {
return new DocutilsRunConfiguration("", project, this);
return new DocutilsRunConfiguration(project, this);
}
}
@@ -73,7 +73,7 @@ public class RestRunConfigurationType implements ConfigurationType {
}
public RunConfiguration createTemplateConfiguration(Project project) {
return new SphinxRunConfiguration("", project, this);
return new SphinxRunConfiguration(project, this);
}
}
}
python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsRunConfiguration.java
+2 -3
View File
@@ -17,10 +17,9 @@ import org.jetbrains.annotations.NotNull;
*/
public class DocutilsRunConfiguration extends RestRunConfiguration {
public DocutilsRunConfiguration(final String name,
final Project project,
public DocutilsRunConfiguration(final Project project,
final ConfigurationFactory factory) {
super(name, new RunConfigurationModule(project), factory);
super(project, factory);
}
@Override
python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxRunConfiguration.java
+2 -3
View File
@@ -16,10 +16,9 @@ import org.jetbrains.annotations.NotNull;
* User : catherine
*/
public class SphinxRunConfiguration extends RestRunConfiguration {
public SphinxRunConfiguration(final String name,
final Project project,
public SphinxRunConfiguration(final Project project,
final ConfigurationFactory factory) {
super(name, new RunConfigurationModule(project), factory);
super(project, factory);
}
@Override
python/src/com/jetbrains/python/run/AbstractPythonRunConfiguration.java
+3 -3
View File
@@ -43,9 +43,9 @@ public abstract class AbstractPythonRunConfiguration<T extends AbstractRunConfig
private boolean myAddSourceRoots = true;
protected PathMappingSettings myMappingSettings;
public AbstractPythonRunConfiguration(final String name, final RunConfigurationModule module, final ConfigurationFactory factory) {
super(name, module, factory);
module.init();
public AbstractPythonRunConfiguration(Project project, final ConfigurationFactory factory) {
super(project, factory);
getConfigurationModule().init();
}
public List<Module> getValidModules() {
python/src/com/jetbrains/python/run/AbstractServerPythonRunConfiguration.java
+3 -3
View File
@@ -2,7 +2,7 @@ package com.jetbrains.python.run;
import com.intellij.execution.configuration.AbstractRunConfiguration;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.RunConfigurationModule;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMExternalizerUtil;
import com.intellij.openapi.util.WriteExternalException;
@@ -16,8 +16,8 @@ abstract public class AbstractServerPythonRunConfiguration<T extends AbstractRun
@NonNls private static final String LAUNCH_JAVASCRIPT_DEBUGGER = "launchJavascriptDebuger";
private boolean myLaunchJavascriptDebugger;
public AbstractServerPythonRunConfiguration(final String name, final RunConfigurationModule module, final ConfigurationFactory factory) {
super(name, module, factory);
public AbstractServerPythonRunConfiguration(final Project project, final ConfigurationFactory factory) {
super(project, factory);
}
@Override
python/src/com/jetbrains/python/run/PythonConfigurationType.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class PythonConfigurationType implements ConfigurationType {
}
public RunConfiguration createTemplateConfiguration(Project project) {
return new PythonRunConfiguration(project, this, "");
return new PythonRunConfiguration(project, this);
}
}
python/src/com/jetbrains/python/run/PythonRunConfiguration.java
+2 -2
View File
@@ -38,8 +38,8 @@ public class PythonRunConfiguration extends AbstractPythonRunConfiguration
private String myScriptName;
private String myScriptParameters;
protected PythonRunConfiguration(Project project, ConfigurationFactory configurationFactory, String name) {
super(name, new RunConfigurationModule(project), configurationFactory);
protected PythonRunConfiguration(Project project, ConfigurationFactory configurationFactory) {
super(project, configurationFactory);
setUnbufferedEnv();
}
python/src/com/jetbrains/python/testing/AbstractPythonTestRunConfiguration.java
+7 -3
View File
@@ -1,6 +1,10 @@
package com.jetbrains.python.testing;
import com.intellij.execution.configurations.*;
import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.RefactoringListenerProvider;
import com.intellij.execution.configurations.RuntimeConfigurationError;
import com.intellij.execution.configurations.RuntimeConfigurationException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMExternalizerUtil;
@@ -42,8 +46,8 @@ public abstract class AbstractPythonTestRunConfiguration extends AbstractPythonR
private String myPattern = ""; // pattern for modules in folder to match against
private boolean usePattern = false;
protected AbstractPythonTestRunConfiguration(RunConfigurationModule module, ConfigurationFactory configurationFactory, String name) {
super(name, module, configurationFactory);
protected AbstractPythonTestRunConfiguration(Project project, ConfigurationFactory configurationFactory) {
super(project, configurationFactory);
}
@Override
python/src/com/jetbrains/python/testing/PythonTestConfigurationType.java
+5 -5
View File
@@ -36,7 +36,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
return new PythonUnitTestRunConfiguration(project, this, "");
return new PythonUnitTestRunConfiguration(project, this);
}
@Override
@@ -52,7 +52,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
return new PythonDocTestRunConfiguration(project, this, "");
return new PythonDocTestRunConfiguration(project, this);
}
@Override
@@ -68,7 +68,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
return new PyTestRunConfiguration("", project, this);
return new PyTestRunConfiguration(project, this);
}
@Override
@@ -84,7 +84,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
return new PythonNoseTestRunConfiguration(project, this, "");
return new PythonNoseTestRunConfiguration(project, this);
}
@Override
@@ -100,7 +100,7 @@ public class PythonTestConfigurationType implements ConfigurationType {
@Override
public RunConfiguration createTemplateConfiguration(Project project) {
return new PythonAtTestRunConfiguration(project, this, "");
return new PythonAtTestRunConfiguration(project, this);
}
@Override
python/src/com/jetbrains/python/testing/attest/PythonAtTestRunConfiguration.java
+2 -3
View File
@@ -24,9 +24,8 @@ public class PythonAtTestRunConfiguration extends AbstractPythonTestRunConfigura
protected String myTitle = "Attest";
protected String myPluralTitle = "Attests";
public PythonAtTestRunConfiguration(Project project,
ConfigurationFactory configurationFactory,
String name) {
super(new RunConfigurationModule(project), configurationFactory, name);
ConfigurationFactory configurationFactory) {
super(project, configurationFactory);
}
@Override
python/src/com/jetbrains/python/testing/doctest/PythonDocTestRunConfiguration.java
+2 -3
View File
@@ -20,9 +20,8 @@ public class PythonDocTestRunConfiguration extends AbstractPythonTestRunConfigur
protected String myPluralTitle = "Doctests";
protected String myTitle = "Doctest";
public PythonDocTestRunConfiguration(Project project,
ConfigurationFactory configurationFactory,
String name) {
super(new RunConfigurationModule(project), configurationFactory, name);
ConfigurationFactory configurationFactory) {
super(project, configurationFactory);
}
@Override
python/src/com/jetbrains/python/testing/nosetest/PythonNoseTestRunConfiguration.java
+2 -3
View File
@@ -29,9 +29,8 @@ public class PythonNoseTestRunConfiguration extends AbstractPythonTestRunConfigu
private boolean useParam = false;
public PythonNoseTestRunConfiguration(Project project,
ConfigurationFactory configurationFactory,
String name) {
super(new RunConfigurationModule(project), configurationFactory, name);
ConfigurationFactory configurationFactory) {
super(project, configurationFactory);
}
@Override
python/src/com/jetbrains/python/testing/pytest/PyTestRunConfiguration.java
+2 -2
View File
@@ -37,8 +37,8 @@ public class PyTestRunConfiguration extends AbstractPythonTestRunConfiguration i
private static final String KEYWORDS_FIELD = "keywords";
private static final String PARAMS_FIELD = "params";
public PyTestRunConfiguration(final String name, final Project project, final ConfigurationFactory factory) {
super(new RunConfigurationModule(project), factory, name);
public PyTestRunConfiguration(final Project project, final ConfigurationFactory factory) {
super(project, factory);
}
protected SettingsEditor<? extends RunConfiguration> createConfigurationEditor() {
python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfiguration.java
+2 -3
View File
@@ -28,9 +28,8 @@ public class PythonUnitTestRunConfiguration extends
private boolean useParam = false;
public PythonUnitTestRunConfiguration(Project project,
ConfigurationFactory configurationFactory,
String name) {
super(new RunConfigurationModule(project), configurationFactory, name);
ConfigurationFactory configurationFactory) {
super(project, configurationFactory);
}
@Override