mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
do not call readModule explicitly
This commit is contained in:
-1
@@ -242,7 +242,6 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
|
||||
super.readExternal(element);
|
||||
JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
|
||||
DefaultJDOMExternalizer.readExternal(this, element);
|
||||
readModule(element);
|
||||
EnvironmentVariablesComponent.readExternal(element, getEnvs());
|
||||
setShortenCommandLine(ShortenCommandLine.readShortenClasspathMethod(element));
|
||||
}
|
||||
|
||||
@@ -45,7 +45,6 @@ public class RemoteConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
|
||||
@Override
|
||||
public void readExternal(@NotNull final Element element) throws InvalidDataException {
|
||||
super.readExternal(element);
|
||||
readModule(element);
|
||||
DefaultJDOMExternalizer.readExternal(this, element);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
|
||||
getConfigurationModule().setModuleName(moduleName);
|
||||
}
|
||||
|
||||
protected void readModule(final Element element) {
|
||||
protected void readModule(@NotNull Element element) {
|
||||
getConfigurationModule().readExternal(element);
|
||||
}
|
||||
|
||||
|
||||
@@ -152,7 +152,6 @@ public abstract class MvcRunConfiguration extends ModuleBasedConfiguration<RunCo
|
||||
@Override
|
||||
public void readExternal(@NotNull Element element) throws InvalidDataException {
|
||||
super.readExternal(element);
|
||||
readModule(element);
|
||||
vmParams = JDOMExternalizer.readString(element, "vmparams");
|
||||
cmdLine = JDOMExternalizer.readString(element, "cmdLine");
|
||||
|
||||
|
||||
-1
@@ -125,7 +125,6 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
|
||||
@Override
|
||||
public void readExternal(@NotNull Element element) {
|
||||
super.readExternal(element);
|
||||
readModule(element);
|
||||
scriptPath = ExternalizablePath.localPathValue(JDOMExternalizer.readString(element, "path"));
|
||||
vmParams = JDOMExternalizer.readString(element, "vmparams");
|
||||
scriptParams = JDOMExternalizer.readString(element, "params");
|
||||
|
||||
@@ -361,7 +361,6 @@ public class JUnitConfiguration extends JavaTestConfigurationBase {
|
||||
public void readExternal(@NotNull final Element element) throws InvalidDataException {
|
||||
super.readExternal(element);
|
||||
JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
|
||||
readModule(element);
|
||||
DefaultJDOMExternalizer.readExternal(this, element);
|
||||
DefaultJDOMExternalizer.readExternal(getPersistentData(), element);
|
||||
EnvironmentVariablesComponent.readExternal(element, getPersistentData().getEnvs());
|
||||
|
||||
+1
-4
@@ -285,9 +285,7 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
|
||||
@Override
|
||||
public void checkConfiguration() throws RuntimeConfigurationException {
|
||||
final TestNGTestObject testObject = TestNGTestObject.fromConfig(this);
|
||||
if (testObject != null) {
|
||||
testObject.checkConfiguration();
|
||||
}
|
||||
testObject.checkConfiguration();
|
||||
JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
|
||||
ProgramParametersUtil.checkWorkingDirectoryExist(this, getProject(), getConfigurationModule().getModule());
|
||||
JavaParametersUtil.checkAlternativeJRE(this);
|
||||
@@ -298,7 +296,6 @@ public class TestNGConfiguration extends JavaTestConfigurationBase {
|
||||
public void readExternal(@NotNull Element element) {
|
||||
super.readExternal(element);
|
||||
JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
|
||||
readModule(element);
|
||||
DefaultJDOMExternalizer.readExternal(this, element);
|
||||
DefaultJDOMExternalizer.readExternal(getPersistantData(), element);
|
||||
EnvironmentVariablesComponent.readExternal(element, getPersistantData().getEnvs());
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
/*
|
||||
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
*/
|
||||
package com.theoryinpractice.testng.model;
|
||||
|
||||
import com.intellij.codeInsight.AnnotationUtil;
|
||||
@@ -36,7 +38,8 @@ public abstract class TestNGTestObject {
|
||||
myConfig = config;
|
||||
}
|
||||
|
||||
public static TestNGTestObject fromConfig(TestNGConfiguration config) {
|
||||
@NotNull
|
||||
public static TestNGTestObject fromConfig(@NotNull TestNGConfiguration config) {
|
||||
final String testObject = config.getPersistantData().TEST_OBJECT;
|
||||
if (testObject.equals(TestType.PACKAGE.getType())) {
|
||||
return new TestNGTestPackage(config);
|
||||
@@ -283,7 +286,7 @@ public abstract class TestNGTestObject {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillTestObjects(Map<PsiClass, Map<PsiMethod, List<String>>> classes) throws CantRunException {}
|
||||
public void fillTestObjects(Map<PsiClass, Map<PsiMethod, List<String>>> classes) {}
|
||||
|
||||
@Override
|
||||
public String getGeneratedName() {
|
||||
@@ -296,6 +299,6 @@ public abstract class TestNGTestObject {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkConfiguration() throws RuntimeConfigurationException {}
|
||||
public void checkConfiguration() {}
|
||||
}
|
||||
}
|
||||
|
||||
+5
-3
@@ -1,8 +1,10 @@
|
||||
/*
|
||||
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
*/
|
||||
package com.jetbrains.env;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.intellij.openapi.application.TransactionGuard;
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import com.intellij.openapi.projectRoots.Sdk;
|
||||
import com.intellij.openapi.vfs.VfsUtil;
|
||||
@@ -77,8 +79,8 @@ public class PyEnvTaskRunner {
|
||||
}
|
||||
final Sdk sdk = createSdkByExecutable(executable);
|
||||
|
||||
/**
|
||||
* Skipping test if {@link PyTestTask} reports it does not support this language level
|
||||
/*
|
||||
Skipping test if {@link PyTestTask} reports it does not support this language level
|
||||
*/
|
||||
final LanguageLevel languageLevel = PythonSdkType.getLanguageLevelForSdk(sdk);
|
||||
if (testTask.isLanguageLevelSupported(languageLevel)) {
|
||||
|
||||
Reference in New Issue
Block a user