not-null FileReferenceSet#getElement()

diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
index a8c583904a5e95d101aa9d455512dd727547ec3f..77a37d02114757d1d2085797c380344f664a895d 100644 (file)
--- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
+++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
@@ -199,12 +199,12 @@ public class FileReferenceSet {
     reparse();
   }
 
-
+  @NotNull
   public PsiElement getElement() {
     return myElement;
   }
 
-  void setElement(final PsiElement element) {
+  void setElement(@NotNull PsiElement element) {
     myElement = element;
   }
 
@@ -368,7 +368,7 @@ public class FileReferenceSet {
         }
         final PsiFile contextFile = contextProvider.getContextFile(file);
         if (contextFile != null) {
-          return Collections.<PsiFileSystemItem>singleton(contextFile.getParent());
+          return Collections.singleton(contextFile.getParent());
         }
       }
     }
@@ -398,7 +398,7 @@ public class FileReferenceSet {
       if (parent != null) {
         final PsiDirectory directory = file.getManager().findDirectory(parent);
         if (directory != null) {
-          return Collections.<PsiFileSystemItem>singleton(directory);
+          return Collections.singleton(directory);
         }
       }
     }

diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java
index 6587164c94d06e6c8b209f9fdc2fbc8be83acfe7..67e31d3779fa97333ef849267864eee982e09060 100644 (file)
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileReferenceSet.java
@@ -76,6 +76,7 @@ public class AntDomFileReferenceSet extends FileReferenceSet {
     return new AntDomFileReference(this, range, index, text);
   }
 
+  @NotNull
   @Override
   public XmlAttributeValue getElement() {
     return (XmlAttributeValue)super.getElement();