From 9fea2a686721f5351ceaf548867818d46f4c6b9b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 18 Jun 2014 14:41:56 +0400 Subject: [PATCH] notnull --- .../JavaReflectionReferenceContributor.java | 5 +++-- .../PackagePrefixFileSystemItemImpl.java | 9 +++++---- .../psi/ClassFileViewProviderFactory.java | 1 + .../tree/java/PsiLiteralExpressionImpl.java | 3 ++- .../intellij/psi/FileResolveScopeProvider.java | 4 +++- .../intellij/psi/FileViewProviderFactory.java | 1 + .../com/intellij/psi/MultiRangeReference.java | 4 +++- .../psi/PackagePrefixFileSystemItem.java | 5 ++++- .../intellij/psi/PsiReferenceContributor.java | 18 +++++++++++++++++- .../com/intellij/psi/PsiReferenceService.java | 3 ++- .../intellij/psi/PsiReferenceServiceImpl.java | 3 ++- .../inject/java/LanguageReferenceProvider.java | 2 +- .../InjectedReferencesContributor.java | 4 ++-- .../src/dom/impl/I18nReferenceContributor.java | 4 ++-- .../references/IconsReferencesContributor.java | 2 +- .../TestDataReferenceContributor.java | 2 +- .../groovy/gpp/GppReferenceContributor.java | 2 +- ...oovyMethodArgumentReferenceContributor.java | 2 +- .../providers/GroovyReferenceContributor.java | 3 ++- .../groovy/GrLanguageReferenceProvider.java | 2 +- .../groovy/dgm/DGMReferenceContributor.java | 4 ++-- .../PropertiesReferenceContributor.java | 4 ++-- .../providers/JavaReferenceContributor.java | 18 +++++++++++++++++- .../fxml/refs/FxmlReferencesContributor.java | 2 +- .../fxml/refs/JavaFxReferencesContributor.java | 3 ++- .../MavenPropertyPsiReferenceContributor.java | 5 +++-- .../MavenPluginParamReferenceContributor.java | 4 ++-- .../xml/XmlPropertiesReferenceContributor.java | 2 +- .../testng/TestNGReferenceContributor.java | 4 ++-- .../TestNGSuiteReferenceContributor.java | 5 +++-- .../binding/FormReferenceContributor.java | 6 ++++-- .../xslt/impl/XsltReferenceContributor.java | 6 +++--- .../rest/RestFileProviderFactory.java | 3 ++- .../codeInsight/PyStdReferenceContributor.java | 4 ++-- .../DocStringReferenceContributor.java | 5 +++-- .../util/xml/impl/DomReferenceContributor.java | 3 ++- .../xml/util/XmlReferenceContributor.java | 2 +- .../relaxNG/RelaxNGReferenceContributor.java | 3 ++- .../relaxNG/compact/psi/impl/RncFileImpl.java | 1 + .../psi/impl/source/xml/XmlFileImpl.java | 3 ++- 40 files changed, 112 insertions(+), 54 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java index 06e5d4a672f4..dbcc03041c6f 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaReflectionReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ import com.intellij.patterns.PsiJavaElementPattern; import com.intellij.psi.PsiLiteral; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; +import org.jetbrains.annotations.NotNull; import static com.intellij.patterns.PsiJavaPatterns.psiExpression; import static com.intellij.patterns.PsiJavaPatterns.psiLiteral; @@ -38,7 +39,7 @@ public class JavaReflectionReferenceContributor extends PsiReferenceContributor .definedInClass(JAVA_LANG_CLASS))); @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(PATTERN, new JavaReflectionReferenceProvider()); } } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PackagePrefixFileSystemItemImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PackagePrefixFileSystemItemImpl.java index 7b85d17470ed..ce56ac3a36ad 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PackagePrefixFileSystemItemImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PackagePrefixFileSystemItemImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +37,11 @@ import java.util.ArrayList; * @author Gregory.Shrago */ class PackagePrefixFileSystemItemImpl extends PsiElementBase implements PsiFileSystemItem, PackagePrefixFileSystemItem { - private final PsiDirectory myDirectory; + @NotNull private final PsiDirectory myDirectory; private final int myIndex; private final PsiPackage[] myPackages; - public static PackagePrefixFileSystemItemImpl create(final PsiDirectory directory) { + public static PackagePrefixFileSystemItemImpl create(@NotNull PsiDirectory directory) { final ArrayList packages = new ArrayList(); for (PsiPackage cur = JavaDirectoryService.getInstance().getPackage(directory); cur != null; cur = cur.getParentPackage()) { packages.add(0, cur); @@ -49,7 +49,7 @@ class PackagePrefixFileSystemItemImpl extends PsiElementBase implements PsiFileS return new PackagePrefixFileSystemItemImpl(directory, 0, packages.toArray(new PsiPackage[packages.size()])); } - private PackagePrefixFileSystemItemImpl(final PsiDirectory directory, int index, final PsiPackage[] packages) { + private PackagePrefixFileSystemItemImpl(@NotNull PsiDirectory directory, int index, final PsiPackage[] packages) { myDirectory = directory; myIndex = index; myPackages = packages; @@ -249,6 +249,7 @@ class PackagePrefixFileSystemItemImpl extends PsiElementBase implements PsiFileS return myDirectory.getIcon(flags); } + @NotNull @Override public PsiDirectory getDirectory() { return myDirectory; diff --git a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java index de870b9cfcbf..4a73a85da0bc 100644 --- a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java +++ b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProviderFactory.java @@ -28,6 +28,7 @@ import static com.intellij.psi.compiled.ClassFileDecompilers.Full; * @author max */ public class ClassFileViewProviderFactory implements FileViewProviderFactory { + @NotNull @Override public FileViewProvider createFileViewProvider(@NotNull VirtualFile file, Language language, @NotNull PsiManager manager, boolean eventSystemEnabled) { ClassFileDecompilers.Decompiler decompiler = ClassFileDecompilers.find(file); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java index cf099fb33304..e5892be2fb4d 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -370,6 +370,7 @@ public class PsiLiteralExpressionImpl } } + @Override public String toString() { return "PsiLiteralExpression:" + getText(); } diff --git a/platform/core-api/src/com/intellij/psi/FileResolveScopeProvider.java b/platform/core-api/src/com/intellij/psi/FileResolveScopeProvider.java index 966b10728bba..e1fbc72c3709 100644 --- a/platform/core-api/src/com/intellij/psi/FileResolveScopeProvider.java +++ b/platform/core-api/src/com/intellij/psi/FileResolveScopeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package com.intellij.psi; import com.intellij.psi.search.GlobalSearchScope; +import org.jetbrains.annotations.NotNull; /** * Implemented by PSI files which must have non-standard resolve scope for elements contained in them. @@ -24,6 +25,7 @@ import com.intellij.psi.search.GlobalSearchScope; * @author yole */ public interface FileResolveScopeProvider { + @NotNull GlobalSearchScope getFileResolveScope(); boolean ignoreReferencedElementAccessibility(); } diff --git a/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java b/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java index 60fdf43dad58..55169f9fb07b 100644 --- a/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java +++ b/platform/core-api/src/com/intellij/psi/FileViewProviderFactory.java @@ -26,5 +26,6 @@ import org.jetbrains.annotations.NotNull; * @author yole */ public interface FileViewProviderFactory { + @NotNull FileViewProvider createFileViewProvider(@NotNull VirtualFile file, Language language, @NotNull PsiManager manager, boolean eventSystemEnabled); } \ No newline at end of file diff --git a/platform/core-api/src/com/intellij/psi/MultiRangeReference.java b/platform/core-api/src/com/intellij/psi/MultiRangeReference.java index 1eace6c88c39..feb57c31cae0 100644 --- a/platform/core-api/src/com/intellij/psi/MultiRangeReference.java +++ b/platform/core-api/src/com/intellij/psi/MultiRangeReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,11 @@ package com.intellij.psi; import com.intellij.openapi.util.TextRange; +import org.jetbrains.annotations.NotNull; import java.util.List; public interface MultiRangeReference extends PsiReference { + @NotNull List getRanges(); } diff --git a/platform/core-api/src/com/intellij/psi/PackagePrefixFileSystemItem.java b/platform/core-api/src/com/intellij/psi/PackagePrefixFileSystemItem.java index 0f86473450bc..4ed023e85330 100644 --- a/platform/core-api/src/com/intellij/psi/PackagePrefixFileSystemItem.java +++ b/platform/core-api/src/com/intellij/psi/PackagePrefixFileSystemItem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,13 @@ */ package com.intellij.psi; +import org.jetbrains.annotations.NotNull; + /** * User: anna * Date: 7/15/13 */ public interface PackagePrefixFileSystemItem extends PsiFileSystemItem { + @NotNull PsiDirectory getDirectory(); } diff --git a/platform/core-api/src/com/intellij/psi/PsiReferenceContributor.java b/platform/core-api/src/com/intellij/psi/PsiReferenceContributor.java index 2d9c675464c7..9708eb75ee95 100644 --- a/platform/core-api/src/com/intellij/psi/PsiReferenceContributor.java +++ b/platform/core-api/src/com/intellij/psi/PsiReferenceContributor.java @@ -1,7 +1,23 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi; import com.intellij.openapi.Disposable; import com.intellij.openapi.extensions.ExtensionPointName; +import org.jetbrains.annotations.NotNull; /** * Via implementing this extension it's possible to provide references ({@link com.intellij.psi.PsiReference}) to @@ -28,7 +44,7 @@ import com.intellij.openapi.extensions.ExtensionPointName; public abstract class PsiReferenceContributor implements Disposable { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.psi.referenceContributor"); - public abstract void registerReferenceProviders(PsiReferenceRegistrar registrar); + public abstract void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar); @Override public void dispose() { diff --git a/platform/core-api/src/com/intellij/psi/PsiReferenceService.java b/platform/core-api/src/com/intellij/psi/PsiReferenceService.java index a83ff97c19ae..d6433a59f3cb 100644 --- a/platform/core-api/src/com/intellij/psi/PsiReferenceService.java +++ b/platform/core-api/src/com/intellij/psi/PsiReferenceService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,6 +44,7 @@ public abstract class PsiReferenceService { * fail-fast checks in case the pattern takes long to match. * @return the references */ + @NotNull public abstract List getReferences(@NotNull final PsiElement element, @NotNull final Hints hints); public PsiReference[] getContributedReferences(@NotNull final PsiElement element) { diff --git a/platform/core-impl/src/com/intellij/psi/PsiReferenceServiceImpl.java b/platform/core-impl/src/com/intellij/psi/PsiReferenceServiceImpl.java index 3283e3abbdf1..d77eb0a9f794 100644 --- a/platform/core-impl/src/com/intellij/psi/PsiReferenceServiceImpl.java +++ b/platform/core-impl/src/com/intellij/psi/PsiReferenceServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import java.util.List; * @author Gregory.Shrago */ public class PsiReferenceServiceImpl extends PsiReferenceService { + @NotNull @Override public List getReferences(@NotNull PsiElement element, @NotNull Hints hints) { if (element instanceof ContributedReferenceHost) { diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/LanguageReferenceProvider.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/LanguageReferenceProvider.java index e8510b3b2974..2e8c74699f39 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/LanguageReferenceProvider.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/LanguageReferenceProvider.java @@ -32,7 +32,7 @@ import static com.intellij.patterns.PsiJavaPatterns.literalExpression; */ public final class LanguageReferenceProvider extends PsiReferenceContributor { - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { final Configuration configuration = Configuration.getInstance(); registrar.registerReferenceProvider( literalExpression().annotationParam(StandardPatterns.string().with(new PatternCondition("isLanguageAnnotation") { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/references/InjectedReferencesContributor.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/references/InjectedReferencesContributor.java index 0ee07affca98..751eade99bb6 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/references/InjectedReferencesContributor.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/references/InjectedReferencesContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class InjectedReferencesContributor extends PsiReferenceContributor { } @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(PlatformPatterns.psiElement(), new PsiReferenceProvider() { @NotNull @Override diff --git a/plugins/devkit/src/dom/impl/I18nReferenceContributor.java b/plugins/devkit/src/dom/impl/I18nReferenceContributor.java index 05301b5d4b1e..f88cdda1b212 100644 --- a/plugins/devkit/src/dom/impl/I18nReferenceContributor.java +++ b/plugins/devkit/src/dom/impl/I18nReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class I18nReferenceContributor extends PsiReferenceContributor { private static final String INTENTION_ACTION_BUNDLE_TAG = "bundleName"; @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registerKeyProviders(registrar); registerBundleNameProviders(registrar); diff --git a/plugins/devkit/src/references/IconsReferencesContributor.java b/plugins/devkit/src/references/IconsReferencesContributor.java index eac85d8f0f3c..a7a903555717 100644 --- a/plugins/devkit/src/references/IconsReferencesContributor.java +++ b/plugins/devkit/src/references/IconsReferencesContributor.java @@ -60,7 +60,7 @@ import static com.intellij.patterns.PsiJavaPatterns.*; */ public class IconsReferencesContributor extends PsiReferenceContributor implements QueryExecutor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { final StringPattern methodName = string().oneOf("findIcon", "getIcon"); final PsiMethodPattern method = psiMethod().withName(methodName).definedInClass(IconLoader.class.getName()); final PsiJavaElementPattern.Capture javaFile diff --git a/plugins/devkit/src/testAssistant/TestDataReferenceContributor.java b/plugins/devkit/src/testAssistant/TestDataReferenceContributor.java index de3d4a446bb1..f0cc660dcc8a 100644 --- a/plugins/devkit/src/testAssistant/TestDataReferenceContributor.java +++ b/plugins/devkit/src/testAssistant/TestDataReferenceContributor.java @@ -44,7 +44,7 @@ import static org.jetbrains.idea.devkit.testAssistant.TestDataLineMarkerProvider */ public class TestDataReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(literalExpression().annotationParam(TEST_DATA_PATH_ANNOTATION_QUALIFIED_NAME), new TestDataReferenceProvider()); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java index ef33bef8640f..873345c3eced 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/gpp/GppReferenceContributor.java @@ -40,7 +40,7 @@ import java.util.List; public class GppReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(PlatformPatterns.psiElement(GrArgumentLabel.class), new PsiReferenceProvider() { @NotNull @Override diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java index 46e25a719c8d..30bc357240b4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GroovyMethodArgumentReferenceContributor.java @@ -37,7 +37,7 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; public final class GroovyMethodArgumentReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(GroovyPatterns.stringLiteral(), new MyProvider()); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/GroovyReferenceContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/GroovyReferenceContributor.java index 8f8367cdda6d..e25c490f87cd 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/GroovyReferenceContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/providers/GroovyReferenceContributor.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.lang.resolve.providers; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; +import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral; import org.jetbrains.plugins.groovy.lang.psi.patterns.GroovyPatterns; @@ -28,7 +29,7 @@ import org.jetbrains.plugins.groovy.spock.SpockUnrollReferenceProvider; */ public class GroovyReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(PlatformPatterns.psiElement(GrLiteral.class), new PropertiesReferenceProvider()); registrar.registerReferenceProvider(GroovyPatterns.stringLiteral().withParent(GrAnnotationNameValuePair.class), diff --git a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrLanguageReferenceProvider.java b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrLanguageReferenceProvider.java index 401f20edc06e..f4094b2d665f 100644 --- a/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrLanguageReferenceProvider.java +++ b/plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/GrLanguageReferenceProvider.java @@ -32,7 +32,7 @@ import org.jetbrains.plugins.groovy.lang.psi.patterns.GroovyPatterns; */ public class GrLanguageReferenceProvider extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { final Configuration configuration = Configuration.getInstance(); registrar.registerReferenceProvider( GroovyPatterns.groovyLiteralExpression().annotationParam(StandardPatterns.string().with(isLanguageAnnotation(configuration)), "value").and( diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dgm/DGMReferenceContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dgm/DGMReferenceContributor.java index 2dd7f99dd95c..d5f6e0f3c5c2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dgm/DGMReferenceContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dgm/DGMReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ public class DGMReferenceContributor extends PsiReferenceContributor { private final JavaClassReferenceProvider myProvider = new JavaClassReferenceProvider(); @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(PlatformPatterns.psiElement(PropertiesTokenTypes.VALUE_CHARACTERS), new PsiReferenceProvider() { @NotNull @Override diff --git a/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesReferenceContributor.java b/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesReferenceContributor.java index a322d400b95f..bce0f3683c6e 100644 --- a/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesReferenceContributor.java +++ b/plugins/java-i18n/src/com/intellij/lang/properties/PropertiesReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class PropertiesReferenceContributor extends PsiReferenceContributor{ } }; - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(literalExpression(), new PropertiesReferenceProvider(true)); registrar.registerReferenceProvider(literalExpression().withParent( psiNameValuePair().withName(AnnotationUtil.PROPERTY_KEY_RESOURCE_BUNDLE_PARAMETER)), diff --git a/plugins/java-i18n/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaReferenceContributor.java b/plugins/java-i18n/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaReferenceContributor.java index a97a2fb69718..b38f94079933 100644 --- a/plugins/java-i18n/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaReferenceContributor.java +++ b/plugins/java-i18n/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaReferenceContributor.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.psi.impl.source.resolve.reference.impl.providers; import com.intellij.codeInsight.AnnotationUtil; @@ -6,6 +21,7 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.*; import com.intellij.psi.filters.ElementFilter; import com.intellij.psi.filters.position.FilterPattern; +import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.Map; @@ -17,7 +33,7 @@ import static com.intellij.patterns.XmlPatterns.xmlTag; * @author peter */ public class JavaReferenceContributor extends PsiReferenceContributor{ - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { final JavaClassListReferenceProvider classListProvider = new JavaClassListReferenceProvider(); registrar.registerReferenceProvider(xmlAttributeValue(), classListProvider, PsiReferenceRegistrar.LOWER_PRIORITY); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java index baaa54da2d77..454022ae3448 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/FxmlReferencesContributor.java @@ -41,7 +41,7 @@ public class FxmlReferencesContributor extends PsiReferenceContributor { public static final JavaClassReferenceProvider CLASS_REFERENCE_PROVIDER = new JavaClassReferenceProvider(); @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { final XmlAttributeValuePattern attributeValueInFxml = XmlPatterns.xmlAttributeValue().inVirtualFile( virtualFile().withExtension(JavaFxFileTypeFactory.FXML_EXTENSION)); registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName(FxmlConstants.FX_CONTROLLER)) diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java index 46e73c213558..f6e64f068547 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxReferencesContributor.java @@ -22,6 +22,7 @@ import com.intellij.psi.filters.ElementFilter; import com.intellij.psi.filters.position.FilterPattern; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.javaFX.JavaFxFileReferenceProvider; import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonClassNames; import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory; @@ -125,7 +126,7 @@ public class JavaFxReferencesContributor extends PsiReferenceContributor { })); @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(FXML_PATTERN, new JavaFxFileReferenceProvider(JavaFxFileTypeFactory.FXML_EXTENSION)); registrar.registerReferenceProvider(STYLESHEET_PATTERN, new JavaFxFileReferenceProvider("css") { @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReferenceContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReferenceContributor.java index 2ce633c361e4..6ea57e425bf9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReferenceContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,12 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.patterns.XmlPatterns; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.dom.model.MavenDomProperties; public class MavenPropertyPsiReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { ElementPattern pattern = XmlPatterns.xmlTag().withParent(DomPatterns.withDom(DomPatterns.domElement(MavenDomProperties.class))); registrar.registerReferenceProvider(pattern, new MavenPropertyPsiReferenceProvider(), PsiReferenceRegistrar.DEFAULT_PRIORITY); registrar.registerReferenceProvider(PlatformPatterns.psiElement(), diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginParamReferenceContributor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginParamReferenceContributor.java index 298bc9f30ea9..6e7dfdf8b966 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginParamReferenceContributor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/api/MavenPluginParamReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import static org.jetbrains.idea.maven.plugins.api.MavenPluginParamInfo.ParamInf public class MavenPluginParamReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider( PlatformPatterns.psiElement(XmlTokenType.XML_DATA_CHARACTERS).withParent( XmlPatterns.xmlText().inFile(XmlPatterns.xmlFile().withName("pom.xml")) diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesReferenceContributor.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesReferenceContributor.java index 20fb07eeb7a7..d469f343fca0 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesReferenceContributor.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/xml/XmlPropertiesReferenceContributor.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; */ public class XmlPropertiesReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withLocalName("key"), new PsiReferenceProvider() { @NotNull diff --git a/plugins/testng/src/com/theoryinpractice/testng/TestNGReferenceContributor.java b/plugins/testng/src/com/theoryinpractice/testng/TestNGReferenceContributor.java index b61c451ffa70..0a9acf231499 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/TestNGReferenceContributor.java +++ b/plugins/testng/src/com/theoryinpractice/testng/TestNGReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ public class TestNGReferenceContributor extends PsiReferenceContributor { return PlatformPatterns.psiElement(PsiLiteralExpression.class).and(new FilterPattern(new TestAnnotationFilter(annotation))); } - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(getElementPattern("dependsOnMethods"), new PsiReferenceProvider() { @NotNull public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull final ProcessingContext context) { diff --git a/plugins/testng/src/com/theoryinpractice/testng/TestNGSuiteReferenceContributor.java b/plugins/testng/src/com/theoryinpractice/testng/TestNGSuiteReferenceContributor.java index 4629f624ff05..dc592d833b81 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/TestNGSuiteReferenceContributor.java +++ b/plugins/testng/src/com/theoryinpractice/testng/TestNGSuiteReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider; import com.intellij.psi.impl.source.resolve.reference.impl.providers.PathListReferenceProvider; +import org.jetbrains.annotations.NotNull; import org.testng.IMethodSelector; import static com.intellij.patterns.XmlPatterns.*; @@ -55,7 +56,7 @@ public class TestNGSuiteReferenceContributor extends PsiReferenceContributor { .withParent(xmlTag().withName("suite-files") .withParent(xmlTag().withName("suite"))))); - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(ourTestClassPattern, new JavaClassReferenceProvider()); registrar.registerReferenceProvider(ourListenerClassPattern, new JavaClassReferenceProvider()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceContributor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceContributor.java index 72bc1f716993..a0d9d181efb3 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceContributor.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,13 +18,15 @@ package com.intellij.uiDesigner.binding; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; import com.intellij.psi.PsiPlainTextFile; +import org.jetbrains.annotations.NotNull; + import static com.intellij.patterns.PlatformPatterns.psiFile; /** * @author yole */ public class FormReferenceContributor extends PsiReferenceContributor { - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(psiFile(PsiPlainTextFile.class), new FormReferenceProvider()); } } 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 6cb553f431e5..0ff49d08f81f 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,13 +49,13 @@ public class XsltReferenceContributor { } public static class XPath extends PsiReferenceContributor { - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(psiElement(XPath2TypeElement.class), SchemaTypeProvider.INSTANCE); } } public static class XML extends PsiReferenceContributor { - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider( psiElement(XmlAttributeValue.class).withParent( xmlAttribute().withLocalName("name", "href", "mode", "elements", "exclude-result-prefixes", "extension-element-prefixes", "stylesheet-prefix").withParent( diff --git a/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java b/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java index 5c61251d9ba6..ae15df01e0a5 100644 --- a/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java +++ b/python/python-rest/src/com/jetbrains/rest/RestFileProviderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import org.jetbrains.annotations.NotNull; */ public class RestFileProviderFactory implements FileViewProviderFactory { + @NotNull public FileViewProvider createFileViewProvider(@NotNull VirtualFile virtualFile, Language language, @NotNull PsiManager psiManager, boolean eventSystemEnabled) { return new RestFileViewProvider(psiManager, virtualFile, eventSystemEnabled); } diff --git a/python/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java b/python/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java index 3be84bfdc170..5b0221d0c6ff 100644 --- a/python/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java +++ b/python/src/com/jetbrains/python/codeInsight/PyStdReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import static com.intellij.patterns.PlatformPatterns.psiElement; */ public class PyStdReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registerClassAttributeReference(registrar, PyNames.ALL, new PsiReferenceProvider() { @NotNull @Override diff --git a/python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java b/python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java index 0867c293328f..192a70b8e8e8 100644 --- a/python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java +++ b/python/src/com/jetbrains/python/documentation/DocStringReferenceContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,13 +17,14 @@ package com.jetbrains.python.documentation; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; +import org.jetbrains.annotations.NotNull; /** * @author yole */ public class DocStringReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(DocStringTagCompletionContributor.DOCSTRING_PATTERN, new DocStringReferenceProvider()); } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java index f44fe05c92d1..6fe7a0df71a4 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java @@ -18,13 +18,14 @@ package com.intellij.util.xml.impl; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; import com.intellij.patterns.XmlPatterns; +import org.jetbrains.annotations.NotNull; /** * @author peter */ public class DomReferenceContributor extends PsiReferenceContributor{ @Override - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { GenericValueReferenceProvider provider = new GenericValueReferenceProvider(); registrar.registerReferenceProvider(XmlPatterns.xmlTag(), provider); diff --git a/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java b/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java index 7e5977abf9dc..e2267f53b770 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java +++ b/xml/impl/src/com/intellij/xml/util/XmlReferenceContributor.java @@ -39,7 +39,7 @@ import static com.intellij.patterns.XmlPatterns.*; */ public class XmlReferenceContributor extends PsiReferenceContributor { @Override - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { final IdReferenceProvider idReferenceProvider = new IdReferenceProvider(); diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNGReferenceContributor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNGReferenceContributor.java index c9317dd79ac4..268f53d5d846 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNGReferenceContributor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxNGReferenceContributor.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiReferenceRegistrar; import com.intellij.psi.filters.position.PatternFilter; import com.intellij.xml.util.XmlUtil; import org.intellij.plugins.relaxNG.references.PrefixReferenceProvider; +import org.jetbrains.annotations.NotNull; import static com.intellij.patterns.XmlPatterns.*; @@ -36,7 +37,7 @@ public class RelaxNGReferenceContributor extends PsiReferenceContributor { RNG_TAG_PATTERN.withLocalName("element", "attribute")); @Override - public void registerReferenceProviders(PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { XmlUtil.registerXmlAttributeValueReferenceProvider(registrar, new String[]{ "name" }, new PatternFilter(xmlAttributeValue().withParent(NAME_PATTERN)), true, new PrefixReferenceProvider()); diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncFileImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncFileImpl.java index 0bc22c5f407b..fcb398019b7b 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncFileImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncFileImpl.java @@ -115,6 +115,7 @@ public class RncFileImpl extends PsiFileBase implements RncFile, XmlFile { return false; } + @NotNull @Override public GlobalSearchScope getFileResolveScope() { return ProjectScope.getAllScope(getProject()); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java index 780eee70fb51..7fc96844ca09 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlFileImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -113,6 +113,7 @@ public class XmlFileImpl extends PsiFileImpl implements XmlFile { } + @NotNull @Override public GlobalSearchScope getFileResolveScope() { return ProjectScope.getAllScope(getProject());