From 0d0972aa8b5f4b7fc3603e2bc4d36d0f21933940 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 11 Feb 2013 13:34:40 +0400 Subject: [PATCH] notnull --- .../resolve/reference/impl/providers/JavaClassReference.java | 1 + .../resolve/reference/impl/providers/PsiPackageReference.java | 1 + .../src/com/intellij/codeInsight/daemon/JavaErrorMessages.java | 2 ++ .../codeInsight/daemon/EmptyResolveMessageProvider.java | 3 +++ .../src/com/intellij/openapi/paths/PsiDynaReference.java | 1 + .../source/resolve/reference/impl/providers/FileReference.java | 1 + platform/util-rt/src/com/intellij/BundleBase.java | 3 ++- .../ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java | 1 + .../groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.java | 2 ++ .../lang/properties/references/PropertyReferenceBase.java | 1 + .../lang/xpath/xslt/impl/XsltReferenceContributor.java | 1 + .../lang/xpath/xslt/impl/references/ModeReference.java | 1 + .../lang/xpath/xslt/impl/references/PrefixReference.java | 1 + .../lang/xpath/xslt/impl/references/TemplateReference.java | 1 + .../com/intellij/util/xml/impl/GenericDomValueReference.java | 1 + .../intellij/util/xml/converters/DelimitedListConverter.java | 1 + .../com/intellij/util/xml/converters/QuotedValueConverter.java | 1 + .../src/com/intellij/codeInsight/daemon/XmlErrorMessages.java | 2 ++ .../daemon/impl/analysis/encoding/XmlEncodingReference.java | 1 + .../reference/impl/providers/DtdReferencesProvider.java | 2 ++ .../reference/impl/providers/SchemaReferencesProvider.java | 1 + .../source/resolve/reference/impl/providers/URLReference.java | 1 + xml/impl/src/com/intellij/xml/util/AnchorReference.java | 1 + .../plugins/relaxNG/compact/psi/impl/PatternReference.java | 1 + .../intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java | 1 + .../plugins/relaxNG/references/PrefixReferenceProvider.java | 1 + .../plugins/relaxNG/xml/dom/impl/DefinitionReference.java | 1 + 27 files changed, 34 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java index 04dd71c7970d..09eb7879deb9 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java @@ -583,6 +583,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return myJavaClassReferenceSet; } + @NotNull @Override public String getUnresolvedMessagePattern() { return myJavaClassReferenceSet.getUnresolvedMessagePattern(myIndex); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java index 94827c3a03f5..537b3216df4d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java @@ -60,6 +60,7 @@ public class PsiPackageReference extends PsiPolyVariantReferenceBase return subPackages.toArray(); } + @NotNull @Override public String getUnresolvedMessagePattern() { return JavaErrorMessages.message("cannot.resolve.package"); diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java b/java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java index 3fc250b1c0ab..530c87cb33f4 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.daemon; import com.intellij.AbstractBundle; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; /** @@ -31,6 +32,7 @@ public class JavaErrorMessages extends AbstractBundle { super(BUNDLE); } + @NotNull public static String message(@PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { return INSTANCE.getMessage(key, params); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/EmptyResolveMessageProvider.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/EmptyResolveMessageProvider.java index 2fb1dea8aea8..0cba5404e11b 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/EmptyResolveMessageProvider.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/EmptyResolveMessageProvider.java @@ -16,6 +16,8 @@ package com.intellij.codeInsight.daemon; +import org.jetbrains.annotations.NotNull; + /** * Implement this in your {@link com.intellij.psi.PsiReference} to provide custom error message. */ @@ -27,5 +29,6 @@ public interface EmptyResolveMessageProvider { * @return pattern or message * @see XmlHighlightVisitor#getErrorDescription() */ + @NotNull String getUnresolvedMessagePattern(); } diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java b/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java index ff6e12637e68..35cfc426c60c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java +++ b/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java @@ -207,6 +207,7 @@ public class PsiDynaReference extends PsiReferenceBase } } + @NotNull @Override @SuppressWarnings({"UnresolvedPropertyKey"}) public String getUnresolvedMessagePattern() { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java index 861e6cf3e3a7..338563f3104d 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java @@ -553,6 +553,7 @@ public class FileReference implements FileReferenceOwner, PsiPolyVariantReferenc return myIndex; } + @NotNull @Override public String getUnresolvedMessagePattern() { return LangBundle.message("error.cannot.resolve") diff --git a/platform/util-rt/src/com/intellij/BundleBase.java b/platform/util-rt/src/com/intellij/BundleBase.java index 8b230fe0e160..75c72d8b87ba 100644 --- a/platform/util-rt/src/com/intellij/BundleBase.java +++ b/platform/util-rt/src/com/intellij/BundleBase.java @@ -58,7 +58,8 @@ public abstract class BundleBase { return format(value, params); } - public static String format(String value, Object... params) { + @NotNull + public static String format(@NotNull String value, @NotNull Object... params) { if (params.length > 0 && value.indexOf('{') >= 0) { return MessageFormat.format(value, params); } diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java index b79dc71de44e..ad45851ff043 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReference.java @@ -47,6 +47,7 @@ public class AntDomFileReference extends FileReference implements AntDomReferenc return (AntDomFileReferenceSet)super.getFileReferenceSet(); } + @NotNull public String getUnresolvedMessagePattern() { return AntBundle.message("file.doesnt.exist", getCanonicalRepresentationText()); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.java index c5788c3b889a..d2f8ba7f27ce 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy; import com.intellij.CommonBundle; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import java.lang.ref.Reference; @@ -34,6 +35,7 @@ public class GroovyBundle { @NonNls private static final String BUNDLE = "org.jetbrains.plugins.groovy.GroovyBundle"; + @NotNull public static String message(@PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { return CommonBundle.message(getBundle(), key, params); } diff --git a/plugins/properties/src/com/intellij/lang/properties/references/PropertyReferenceBase.java b/plugins/properties/src/com/intellij/lang/properties/references/PropertyReferenceBase.java index 993be84b5d08..3c4c0d8bb655 100644 --- a/plugins/properties/src/com/intellij/lang/properties/references/PropertyReferenceBase.java +++ b/plugins/properties/src/com/intellij/lang/properties/references/PropertyReferenceBase.java @@ -191,6 +191,7 @@ public abstract class PropertyReferenceBase implements PsiPolyVariantReference, return mySoft; } + @NotNull public String getUnresolvedMessagePattern() { return PropertiesBundle.message("unresolved.property.key"); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltReferenceContributor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltReferenceContributor.java index 85057da43b88..e2d3277351a7 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltReferenceContributor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltReferenceContributor.java @@ -134,6 +134,7 @@ public class XsltReferenceContributor { return name.equals(text) || text.endsWith(":" + name); } + @NotNull @Override public String getUnresolvedMessagePattern() { return "Unknown Type"; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java index 3867949f0b27..529fcc323124 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java @@ -187,6 +187,7 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe } } + @NotNull public String getUnresolvedMessagePattern() { final QName qName = myImplicitModeElement.getQName(); if (qName != null && qName != QNameUtil.UNRESOLVED) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/PrefixReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/PrefixReference.java index 837350475d81..0cfb85649ac0 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/PrefixReference.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/PrefixReference.java @@ -70,6 +70,7 @@ public class PrefixReference extends SimpleAttributeReference implements EmptyRe return XsltNamespaceContext.resolvePrefix(getCanonicalText(), myAttribute); } + @NotNull public String getUnresolvedMessagePattern() { return "Undeclared namespace prefix ''{0}''"; } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/TemplateReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/TemplateReference.java index 8048ce911bec..6dc05ff99bdb 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/TemplateReference.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/TemplateReference.java @@ -86,6 +86,7 @@ class TemplateReference extends AttributeReference implements EmptyResolveMessag QuickFixAction.registerQuickFixAction(highlightInfo, new CreateTemplateFix(myAttribute.getParent(), myName)); } + @NotNull public String getUnresolvedMessagePattern() { return "Cannot resolve template ''{0}''"; } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java index 06a47b9f7644..881630e16325 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java @@ -142,6 +142,7 @@ public class GenericDomValueReference extends PsiReferenceBase im return StringUtil.notNullize(getStringValue()); } + @NotNull public String getUnresolvedMessagePattern() { final ConvertContext context = getConvertContext(); return getConverter().getErrorMessage(getStringValue(), context); diff --git a/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java b/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java index 2e5c825dd3ee..0b6a1d5e75a9 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/converters/DelimitedListConverter.java @@ -251,6 +251,7 @@ public abstract class DelimitedListConverter extends ResolvingConverter extends ResolvingConverter impl return getReferenceVariants(myContext, myGenericDomValue, getRangeInElement()); } + @NotNull public String getUnresolvedMessagePattern() { return myBadQuotation? DomBundle.message("message.invalid.value.quotation") : getUnresolvedMessage(getValue()); } diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java b/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java index dab60a7a6a0c..77d0c1ee4b3b 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/XmlErrorMessages.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.daemon; import com.intellij.CommonBundle; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import java.lang.ref.Reference; @@ -34,6 +35,7 @@ public class XmlErrorMessages { private XmlErrorMessages() { } + @NotNull public static String message(@PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { return CommonBundle.message(getBundle(), key, params); } diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java index 59d987996ffa..d63164ac72a2 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java @@ -65,6 +65,7 @@ public class XmlEncodingReference implements PsiReference, EmptyResolveMessagePr //return myValue.getManager().findClass(fqn, GlobalSearchScope.allScope(myValue.getProject())); } + @NotNull public String getUnresolvedMessagePattern() { //noinspection UnresolvedPropertyKey return XmlErrorMessages.message("unknown.encoding.0"); diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java index 4a3fcbaddf4a..cb816495b0e7 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java @@ -138,6 +138,7 @@ public class DtdReferencesProvider extends PsiReferenceProvider { }; } + @NotNull public String getUnresolvedMessagePattern() { return XmlBundle.message("xml.dtd.unresolved.element.reference", getCanonicalText()); } @@ -259,6 +260,7 @@ public class DtdReferencesProvider extends PsiReferenceProvider { }; } + @NotNull public String getUnresolvedMessagePattern() { return XmlBundle.message("xml.dtd.unresolved.entity.reference", getCanonicalText()); } diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java index b4c39f109269..d74ac1e4b2d7 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java @@ -124,6 +124,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider { return false; } + @NotNull public String getUnresolvedMessagePattern() { return message; } diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java index f5821112427f..e1a152905db9 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java @@ -225,6 +225,7 @@ public class URLReference implements PsiReference, QuickFixProvider, EmptyResolv } } + @NotNull public String getUnresolvedMessagePattern() { return XmlErrorMessages.message(myIncorrectResourceMapped ? "registered.resource.is.not.recognized":"uri.is.not.registered"); } diff --git a/xml/impl/src/com/intellij/xml/util/AnchorReference.java b/xml/impl/src/com/intellij/xml/util/AnchorReference.java index 65e0c1a9522e..5bae0f65d68e 100644 --- a/xml/impl/src/com/intellij/xml/util/AnchorReference.java +++ b/xml/impl/src/com/intellij/xml/util/AnchorReference.java @@ -215,6 +215,7 @@ public class AnchorReference implements PsiReference, EmptyResolveMessageProvide return mySoft; } + @NotNull public String getUnresolvedMessagePattern() { final XmlFile xmlFile = getFile(); return xmlFile == null ? diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/PatternReference.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/PatternReference.java index c140344f3504..8aeab6059c17 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/PatternReference.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/PatternReference.java @@ -147,6 +147,7 @@ class PatternReference extends PsiReferenceBase.Poly implements Function return false; } + @NotNull public String getUnresolvedMessagePattern() { return "Unresolved pattern reference ''{0}''"; } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java index 26d350796265..6dc7ad54df8e 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java @@ -135,6 +135,7 @@ public class RncNameImpl extends RncElementImpl implements RncName, PsiReference return "xsd".equals(prefix) || "xml".equals(prefix); } + @NotNull public String getUnresolvedMessagePattern() { return "Unresolved namespace prefix ''{0}''"; } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java index 27015b9ef39a..df9bcc8d5cf2 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java @@ -118,6 +118,7 @@ public class PrefixReferenceProvider extends PsiReferenceProvider { return false; } + @NotNull public String getUnresolvedMessagePattern() { return "Undefined namespace prefix ''{0}''"; } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/DefinitionReference.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/DefinitionReference.java index 2de2b477ffef..31b1950c9a8f 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/DefinitionReference.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/DefinitionReference.java @@ -153,6 +153,7 @@ public class DefinitionReference extends PsiReferenceBase.Poly