From e8a4c0addf7c2c5881b1dc56e0c76adb2556a0ad Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 7 Dec 2016 18:05:41 +0100 Subject: [PATCH] cleanup --- .../intellij/execution/actions/RunConfigurationProducer.java | 2 +- .../test/runner/TestClassGradleConfigurationProducer.java | 2 +- .../test/runner/TestMethodGradleConfigurationProducer.java | 2 +- .../junit/AbstractTestClassConfigurationProducer.java | 3 ++- .../junit/AbstractTestMethodConfigurationProducer.java | 3 ++- .../AbstractTestNGInClassConfigurationProducer.java | 5 ++--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java index fa39564c294f..370e45e75f22 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java @@ -157,7 +157,7 @@ public abstract class RunConfigurationProducer { * @param context the context * @param startRunnable the runnable that needs to be called after additional customization is complete. */ - public void onFirstRun(ConfigurationFromContext configuration, ConfigurationContext context, Runnable startRunnable) { + public void onFirstRun(@NotNull ConfigurationFromContext configuration, @NotNull ConfigurationContext context, @NotNull Runnable startRunnable) { startRunnable.run(); } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestClassGradleConfigurationProducer.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestClassGradleConfigurationProducer.java index bbe87c8a8201..9c90f1eb1a0f 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestClassGradleConfigurationProducer.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestClassGradleConfigurationProducer.java @@ -134,7 +134,7 @@ public class TestClassGradleConfigurationProducer extends GradleTestRunConfigura } @Override - public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, final Runnable performRunnable) { + public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, @NotNull final Runnable performRunnable) { final InheritorChooser inheritorChooser = new InheritorChooser() { @Override protected void runForClasses(List classes, PsiMethod method, ConfigurationContext context, Runnable performRunnable) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestMethodGradleConfigurationProducer.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestMethodGradleConfigurationProducer.java index 7dbfcfac9cbc..883bf404b45e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestMethodGradleConfigurationProducer.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/TestMethodGradleConfigurationProducer.java @@ -113,7 +113,7 @@ public class TestMethodGradleConfigurationProducer extends GradleTestRunConfigur } @Override - public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, final Runnable performRunnable) { + public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, @NotNull final Runnable performRunnable) { final PsiMethod psiMethod = (PsiMethod)fromContext.getSourceElement(); final PsiClass containingClass = psiMethod.getContainingClass(); final InheritorChooser inheritorChooser = new InheritorChooser() { diff --git a/plugins/junit/src/com/intellij/execution/junit/AbstractTestClassConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/AbstractTestClassConfigurationProducer.java index 036154fee3ef..b1d36b7bd496 100644 --- a/plugins/junit/src/com/intellij/execution/junit/AbstractTestClassConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/AbstractTestClassConfigurationProducer.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -70,7 +71,7 @@ public abstract class AbstractTestClassConfigurationProducer extends JUnitConfig } @Override - public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, final Runnable performRunnable) { + public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, @NotNull final Runnable performRunnable) { final InheritorChooser inheritorChooser = new InheritorChooser() { @Override diff --git a/plugins/junit/src/com/intellij/execution/junit/AbstractTestMethodConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/AbstractTestMethodConfigurationProducer.java index 53b5ca0339e3..05a7a1a0ab91 100644 --- a/plugins/junit/src/com/intellij/execution/junit/AbstractTestMethodConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/AbstractTestMethodConfigurationProducer.java @@ -31,6 +31,7 @@ import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; +import org.jetbrains.annotations.NotNull; import java.util.Iterator; import java.util.List; @@ -82,7 +83,7 @@ public abstract class AbstractTestMethodConfigurationProducer extends JUnitConfi } @Override - public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, final Runnable performRunnable) { + public void onFirstRun(final ConfigurationFromContext fromContext, final ConfigurationContext context, @NotNull final Runnable performRunnable) { final PsiMethod psiMethod = (PsiMethod)fromContext.getSourceElement(); final PsiClass containingClass = psiMethod.getContainingClass(); final InheritorChooser inheritorChooser = new InheritorChooser() { diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java index 4198e3529415..55c3275155c7 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGInClassConfigurationProducer.java @@ -31,12 +31,11 @@ import com.intellij.execution.junit.InheritorChooser; import com.intellij.execution.junit2.info.MethodLocation; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; -import com.intellij.psi.util.PsiClassUtil; import com.intellij.psi.util.PsiTreeUtil; import com.theoryinpractice.testng.util.TestNGUtil; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -51,7 +50,7 @@ public abstract class AbstractTestNGInClassConfigurationProducer extends TestNGC } @Override - public void onFirstRun(final ConfigurationFromContext configuration, final ConfigurationContext fromContext, Runnable performRunnable) { + public void onFirstRun(final ConfigurationFromContext configuration, final ConfigurationContext fromContext, @NotNull Runnable performRunnable) { final PsiElement psiElement = configuration.getSourceElement(); if (psiElement instanceof PsiMethod || psiElement instanceof PsiClass) {