From 8347e620b78e1d9ba50aa8e6277c452cd0bf607b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 14 Aug 2013 18:29:42 +0400 Subject: [PATCH] notnull --- .../daemon/impl/analysis/HighlightMethodUtil.java | 3 ++- .../impl/quickfix/DefaultQuickFixProvider.java | 6 +++--- .../jarFinder/FindJarQuickFixProvider.java | 2 +- .../daemon/QuickFixActionRegistrar.java | 7 ++++--- .../impl/quickfix/QuickFixActionRegistrarImpl.java | 14 +++++++++----- .../UnresolvedReferenceQuickFixProvider.java | 9 +++------ .../ant/quickfix/AntUnresolvedRefsFixProvider.java | 2 +- .../GrUnresolvedAccessInspection.java | 6 +++--- .../jarFinder/GroovyFindJarQuickFixProvider.java | 2 +- .../fxml/refs/JavaFxEventHandlerReference.java | 2 +- .../javaFX/fxml/refs/JavaFxTagNameReference.java | 2 +- .../ResolveReferenceQuickFixProvider.java | 2 +- .../DependentNSReferenceQuickFixProvider.java | 2 +- .../providers/SchemaReferenceQuickFixProvider.java | 2 +- .../providers/URLReferenceQuickFixProvider.java | 2 +- 15 files changed, 33 insertions(+), 30 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index 0aa08d0b4728..636b0331eee1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -1198,7 +1198,8 @@ public class HighlightMethodUtil { return null; } - public static TextRange getFixRange(PsiElement element) { + @NotNull + public static TextRange getFixRange(@NotNull PsiElement element) { TextRange range = element.getTextRange(); int start = range.getStartOffset(); int end = range.getEndOffset(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java index b30a19f52b66..06704aaed162 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java @@ -28,12 +28,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Map; public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(PsiJavaCodeReferenceElement ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull PsiJavaCodeReferenceElement ref, @NotNull QuickFixActionRegistrar registrar) { registrar.register(new ImportClassFix(ref)); registrar.register(SetupJDKFix.getInstance()); @@ -80,7 +80,7 @@ public class DefaultQuickFixProvider extends UnresolvedReferenceQuickFixProvider @NotNull PsiReferenceExpression refExpr) { final JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(refExpr.getProject()); - final Map map = new HashMap(); + final Map map = new EnumMap(VariableKind.class); map.put(VariableKind.FIELD, new CreateFieldFromUsageFix(refExpr)); map.put(VariableKind.STATIC_FINAL_FIELD, new CreateConstantFieldFromUsageFix(refExpr)); if (!refExpr.isQualified()) { diff --git a/java/java-impl/src/com/intellij/jarFinder/FindJarQuickFixProvider.java b/java/java-impl/src/com/intellij/jarFinder/FindJarQuickFixProvider.java index 9cf66d3991fe..fbf7ae96c57a 100644 --- a/java/java-impl/src/com/intellij/jarFinder/FindJarQuickFixProvider.java +++ b/java/java-impl/src/com/intellij/jarFinder/FindJarQuickFixProvider.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; */ public class FindJarQuickFixProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(PsiJavaCodeReferenceElement ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull PsiJavaCodeReferenceElement ref, @NotNull QuickFixActionRegistrar registrar) { registrar.register(new JavaFindJarFix(ref)); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/QuickFixActionRegistrar.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/QuickFixActionRegistrar.java index ea79f570c4a4..2194bbe5eacb 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/QuickFixActionRegistrar.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/QuickFixActionRegistrar.java @@ -19,15 +19,16 @@ package com.intellij.codeInsight.daemon; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.TextRange; +import org.jetbrains.annotations.NotNull; public interface QuickFixActionRegistrar { - void register(IntentionAction action); - void register(TextRange fixRange, IntentionAction action, HighlightDisplayKey key); + void register(@NotNull IntentionAction action); + void register(@NotNull TextRange fixRange, @NotNull IntentionAction action, HighlightDisplayKey key); /** * Allows to replace some of the built-in quickfixes. * @param condition condition for quickfixes to remove * @since 9.0 */ - void unregister(Condition condition); + void unregister(@NotNull Condition condition); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixActionRegistrarImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixActionRegistrarImpl.java index 56f974535c91..3890dd45bbd2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixActionRegistrarImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QuickFixActionRegistrarImpl.java @@ -22,26 +22,30 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.TextRange; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class QuickFixActionRegistrarImpl implements QuickFixActionRegistrar { private final HighlightInfo myInfo; - public QuickFixActionRegistrarImpl(HighlightInfo info) { + public QuickFixActionRegistrarImpl(@Nullable HighlightInfo info) { myInfo = info; } @Override - public void register(IntentionAction action) { + public void register(@NotNull IntentionAction action) { QuickFixAction.registerQuickFixAction(myInfo, action); } @Override - public void register(TextRange fixRange, IntentionAction action, HighlightDisplayKey key) { + public void register(@NotNull TextRange fixRange, @NotNull IntentionAction action, HighlightDisplayKey key) { QuickFixAction.registerQuickFixAction(myInfo, fixRange, action, key); } @Override - public void unregister(Condition condition) { - QuickFixAction.unregisterQuickFixAction(myInfo, condition); + public void unregister(@NotNull Condition condition) { + if (myInfo != null) { + QuickFixAction.unregisterQuickFixAction(myInfo, condition); + } } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java index e5c419d771b3..07022bc87263 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/quickfix/UnresolvedReferenceQuickFixProvider.java @@ -24,9 +24,7 @@ import com.intellij.util.ReflectionCache; import org.jetbrains.annotations.NotNull; public abstract class UnresolvedReferenceQuickFixProvider { - - public static void registerReferenceFixes(T ref, QuickFixActionRegistrar registrar) { - + public static void registerReferenceFixes(@NotNull T ref, @NotNull QuickFixActionRegistrar registrar) { final boolean dumb = DumbService.getInstance(ref.getElement().getProject()).isDumb(); UnresolvedReferenceQuickFixProvider[] fixProviders = Extensions.getExtensions(EXTENSION_NAME); Class referenceClass = ref.getClass(); @@ -40,10 +38,9 @@ public abstract class UnresolvedReferenceQuickFixProvider EXTENSION_NAME = - ExtensionPointName.create("com.intellij.codeInsight.unresolvedReferenceQuickFixProvider"); + private static final ExtensionPointName EXTENSION_NAME = ExtensionPointName.create("com.intellij.codeInsight.unresolvedReferenceQuickFixProvider"); - public abstract void registerFixes(T ref, QuickFixActionRegistrar registrar); + public abstract void registerFixes(@NotNull T ref, @NotNull QuickFixActionRegistrar registrar); @NotNull public abstract Class getReferenceClass(); diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntUnresolvedRefsFixProvider.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntUnresolvedRefsFixProvider.java index 5df91b5c9fcf..cf0405389126 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntUnresolvedRefsFixProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntUnresolvedRefsFixProvider.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; */ public class AntUnresolvedRefsFixProvider extends UnresolvedReferenceQuickFixProvider { - public void registerFixes(PsiReference ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull PsiReference ref, @NotNull QuickFixActionRegistrar registrar) { if (ref instanceof TagNameReference || ref instanceof AntDomReference) { registrar.register(new AntChangeContextFix()); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java index e5621b7cd90a..985632ad27fb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java @@ -682,18 +682,18 @@ public class GrUnresolvedAccessInspection extends GroovySuppressableInspectionTo } @Override - public void register(IntentionAction action) { + public void register(@NotNull IntentionAction action) { myKey = HighlightDisplayKey.find(SHORT_NAME); QuickFixAction.registerQuickFixAction(myInfo, action, myKey); } @Override - public void register(TextRange fixRange, IntentionAction action, HighlightDisplayKey key) { + public void register(@NotNull TextRange fixRange, @NotNull IntentionAction action, HighlightDisplayKey key) { QuickFixAction.registerQuickFixAction(myInfo, fixRange, action, key); } @Override - public void unregister(Condition condition) { + public void unregister(@NotNull Condition condition) { if (myInfo != null) { QuickFixAction.unregisterQuickFixAction(myInfo, condition); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/jarFinder/GroovyFindJarQuickFixProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/jarFinder/GroovyFindJarQuickFixProvider.java index 15021e83cdb6..d2398deefc79 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/jarFinder/GroovyFindJarQuickFixProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/jarFinder/GroovyFindJarQuickFixProvider.java @@ -12,7 +12,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement; */ public class GroovyFindJarQuickFixProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(GrReferenceElement ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull GrReferenceElement ref, @NotNull QuickFixActionRegistrar registrar) { registrar.register(new GroovyFindJarFix(ref)); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java index 432e3eeabe25..ca308cdcde6d 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java @@ -93,7 +93,7 @@ public class JavaFxEventHandlerReference extends PsiReferenceBase { @Override - public void registerFixes(final JavaFxEventHandlerReference ref, final QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull final JavaFxEventHandlerReference ref, @NotNull final QuickFixActionRegistrar registrar) { if (ref.myController != null && ref.myEventHandler == null) { final CreateMethodQuickFix quickFix = CreateMethodQuickFix.createFix(ref.myController, getHandlerSignature(ref), ""); if (quickFix != null) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java index c7b852285bf1..e01234fc4f1e 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxTagNameReference.java @@ -60,7 +60,7 @@ public class JavaFxTagNameReference extends TagNameReference{ public static class JavaFxUnresolvedTagRefsProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(JavaFxTagNameReference ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull JavaFxTagNameReference ref, @NotNull QuickFixActionRegistrar registrar) { XmlTag element = ref.getTagElement(); if (element != null) { registrar.register(new JavaFxImportClassFix(ref, element) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ResolveReferenceQuickFixProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ResolveReferenceQuickFixProvider.java index 15cb9f90f780..3ce874bd008f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ResolveReferenceQuickFixProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ResolveReferenceQuickFixProvider.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; public class ResolveReferenceQuickFixProvider extends UnresolvedReferenceQuickFixProvider { - public void registerFixes(PsiJavaCodeReferenceElement ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull PsiJavaCodeReferenceElement ref, @NotNull QuickFixActionRegistrar registrar) { registrar.register(new AddMavenDependencyQuickFix(ref)); } diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReferenceQuickFixProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReferenceQuickFixProvider.java index 0fb6ef242977..142e7df51f21 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReferenceQuickFixProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DependentNSReferenceQuickFixProvider.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; */ public class DependentNSReferenceQuickFixProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(DependentNSReference ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull DependentNSReference ref, @NotNull QuickFixActionRegistrar registrar) { registrar.register(new FetchExtResourceAction(ref.isForceFetchResultValid())); registrar.register(new ManuallySetupExtResourceAction()); registrar.register(new IgnoreExtResourceAction()); diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferenceQuickFixProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferenceQuickFixProvider.java index 6b8bebde5652..eb3d558b6e18 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferenceQuickFixProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferenceQuickFixProvider.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.PropertyKey; */ public class SchemaReferenceQuickFixProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(SchemaReferencesProvider.TypeOrElementOrAttributeReference ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull SchemaReferencesProvider.TypeOrElementOrAttributeReference ref, @NotNull QuickFixActionRegistrar registrar) { if (ref.getType() == SchemaReferencesProvider.TypeOrElementOrAttributeReference.ReferenceType.TypeReference) { registrar.register( new CreateXmlElementIntentionAction("xml.schema.create.complex.type.intention.name", SchemaReferencesProvider.COMPLEX_TYPE_TAG_NAME, ref) diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReferenceQuickFixProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReferenceQuickFixProvider.java index 1c63a9737aef..13bae7ba826f 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReferenceQuickFixProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReferenceQuickFixProvider.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; */ public class URLReferenceQuickFixProvider extends UnresolvedReferenceQuickFixProvider { @Override - public void registerFixes(URLReference ref, QuickFixActionRegistrar registrar) { + public void registerFixes(@NotNull URLReference ref, @NotNull QuickFixActionRegistrar registrar) { registrar.register(new FetchExtResourceAction()); registrar.register(new ManuallySetupExtResourceAction()); registrar.register(new IgnoreExtResourceAction());