diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/MutablyNamedIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/MutablyNamedIntention.java index b740d1f8bc87..6e020224e712 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/MutablyNamedIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/MutablyNamedIntention.java @@ -9,9 +9,10 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; public abstract class MutablyNamedIntention extends Intention { - private @IntentionName String text = null; + private @IntentionName String text; - protected abstract @IntentionName String getTextForElement(PsiElement element); + @NotNull + protected abstract @IntentionName String getTextForElement(@NotNull PsiElement element); @Override @NotNull diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java index 1f2559851290..7b1df16ac649 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java @@ -21,7 +21,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.utils.ParenthesesUtils; public class DemorgansLawIntention extends MutablyNamedIntention { @Override - protected @IntentionName String getTextForElement(PsiElement element) { + protected @IntentionName @NotNull String getTextForElement(@NotNull PsiElement element) { final GrBinaryExpression binaryExpression = (GrBinaryExpression)element; final IElementType tokenType = binaryExpression.getOperationTokenType(); if (GroovyTokenTypes.mLAND.equals(tokenType)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java index d07cd79de604..f0d4676ba562 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java @@ -18,7 +18,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.utils.ComparisonUtils; public class FlipComparisonIntention extends MutablyNamedIntention { @Override - protected @IntentionName String getTextForElement(PsiElement element) { + protected @IntentionName @NotNull String getTextForElement(@NotNull PsiElement element) { final GrBinaryExpression binaryExpression = (GrBinaryExpression) element; final IElementType tokenType = binaryExpression.getOperationTokenType(); final String comparison = ComparisonUtils.getStringForComparison(tokenType); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java index 1ce757569b22..73f835de9e94 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java @@ -18,7 +18,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil; public class FlipConjunctionIntention extends MutablyNamedIntention { @Override - protected @IntentionName String getTextForElement(PsiElement element) { + protected @IntentionName @NotNull String getTextForElement(@NotNull PsiElement element) { final GrBinaryExpression binaryExpression = (GrBinaryExpression)element; final IElementType tokenType = binaryExpression.getOperationTokenType(); final String conjunction = getConjunction(tokenType); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java index dde3fd4b3f19..c346208d2f2d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java @@ -17,7 +17,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.utils.ComparisonUtils; public class NegateComparisonIntention extends MutablyNamedIntention { @Override - protected @IntentionName String getTextForElement(PsiElement element) { + protected @IntentionName @NotNull String getTextForElement(@NotNull PsiElement element) { final GrBinaryExpression binaryExpression = (GrBinaryExpression) element; final IElementType tokenType = binaryExpression.getOperationTokenType(); final String comparison = ComparisonUtils.getStringForComparison(tokenType);