diff --git a/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
index d2c9c77f6d2e..7027c6788957 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiAnnotation.java
@@ -33,6 +33,7 @@ public interface PsiAnnotation extends PsiAnnotationMemberValue, PsiMetaOwner {
   PsiAnnotation[] EMPTY_ARRAY = new PsiAnnotation[0];
 
   ArrayFactory<PsiAnnotation> ARRAY_FACTORY = new ArrayFactory<PsiAnnotation>() {
+    @NotNull
     @Override
     public PsiAnnotation[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiAnnotation[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiAnnotationMemberValue.java b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationMemberValue.java
index 1b6b8b94f61e..0788fee661be 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiAnnotationMemberValue.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiAnnotationMemberValue.java
@@ -16,6 +16,7 @@
 package com.intellij.psi;
 
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a PSI element which can be used as the value of an annotation element.
@@ -29,6 +30,7 @@ public interface PsiAnnotationMemberValue extends PsiElement {
   PsiAnnotationMemberValue[] EMPTY_ARRAY = new PsiAnnotationMemberValue[0];
 
   ArrayFactory<PsiAnnotationMemberValue> ARRAY_FACTORY = new ArrayFactory<PsiAnnotationMemberValue>() {
+    @NotNull
     @Override
     public PsiAnnotationMemberValue[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiAnnotationMemberValue[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiCatchSection.java b/java/java-psi-api/src/com/intellij/psi/PsiCatchSection.java
index e0b7d221d681..fc7c7621f3be 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiCatchSection.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiCatchSection.java
@@ -33,6 +33,7 @@ public interface PsiCatchSection extends PsiElement {
   PsiCatchSection[] EMPTY_ARRAY = new PsiCatchSection[0];
 
   ArrayFactory<PsiCatchSection> ARRAY_FACTORY = new ArrayFactory<PsiCatchSection>() {
+    @NotNull
     @Override
     public PsiCatchSection[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiCatchSection[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClass.java b/java/java-psi-api/src/com/intellij/psi/PsiClass.java
index e6dd7b9073d2..7274a0081bf5 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiClass.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiClass.java
@@ -29,7 +29,7 @@ import java.util.List;
 /**
  * Represents a Java class or interface.
  *
- * @see PsiJavaFile#getClasses() 
+ * @see PsiJavaFile#getClasses()
  */
 public interface PsiClass
   extends PsiNameIdentifierOwner, PsiModifierListOwner, PsiDocCommentOwner, PsiTypeParameterListOwner, PsiTarget, PomRenameableTarget<PsiElement> {
@@ -39,6 +39,7 @@ public interface PsiClass
   @NotNull PsiClass[] EMPTY_ARRAY = new PsiClass[0];
 
   ArrayFactory<PsiClass> ARRAY_FACTORY = new ArrayFactory<PsiClass>() {
+    @NotNull
     @Override
     public PsiClass[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiClass[count];
@@ -349,7 +350,7 @@ public interface PsiClass
    * its superclasses and superinterfaces.
    *
    * @return the collection of signatures.
-   * @since 5.1 
+   * @since 5.1
    */
   @NotNull
   Collection<HierarchicalMethodSignature> getVisibleSignatures();
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClassInitializer.java b/java/java-psi-api/src/com/intellij/psi/PsiClassInitializer.java
index bb280bec6dff..7fa1639cd420 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiClassInitializer.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiClassInitializer.java
@@ -28,6 +28,7 @@ public interface PsiClassInitializer extends PsiMember {
   PsiClassInitializer[] EMPTY_ARRAY = new PsiClassInitializer[0];
 
   ArrayFactory<PsiClassInitializer> ARRAY_FACTORY = new ArrayFactory<PsiClassInitializer>() {
+    @NotNull
     @Override
     public PsiClassInitializer[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiClassInitializer[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
index 5a85ba65fdff..ea3b693dadeb 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
@@ -34,6 +34,7 @@ public abstract class PsiClassType extends PsiType {
    */
   public static final PsiClassType[] EMPTY_ARRAY = new PsiClassType[0];
   public static final ArrayFactory<PsiClassType> ARRAY_FACTORY = new ArrayFactory<PsiClassType>() {
+    @NotNull
     @Override
     public PsiClassType[] create(int count) {
       return new PsiClassType[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
index 54233636f654..cff6e10d1eee 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiExpression.java
@@ -18,6 +18,7 @@ package com.intellij.psi;
 import com.intellij.util.ArrayFactory;
 import com.intellij.util.Function;
 import com.intellij.util.NullableFunction;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -30,6 +31,7 @@ public interface PsiExpression extends PsiAnnotationMemberValue {
   PsiExpression[] EMPTY_ARRAY = new PsiExpression[0];
 
   ArrayFactory<PsiExpression> ARRAY_FACTORY = new ArrayFactory<PsiExpression>() {
+    @NotNull
     @Override
     public PsiExpression[] create(final int count) {
       return count == 0 ? PsiExpression.EMPTY_ARRAY : new PsiExpression[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiField.java b/java/java-psi-api/src/com/intellij/psi/PsiField.java
index d3e87cad7109..93bd92efc80a 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiField.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiField.java
@@ -30,6 +30,7 @@ public interface PsiField extends PsiMember, PsiVariable, PsiDocCommentOwner {
   PsiField[] EMPTY_ARRAY = new PsiField[0];
 
   ArrayFactory<PsiField> ARRAY_FACTORY = new ArrayFactory<PsiField>() {
+    @NotNull
     @Override
     public PsiField[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiField[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiImportList.java b/java/java-psi-api/src/com/intellij/psi/PsiImportList.java
index e9f70c83ba51..670f43556d62 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiImportList.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiImportList.java
@@ -23,11 +23,12 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Represents the list of import statements contained in a Java or JSP file.
  *
- * @see PsiJavaFile#getImportList() 
+ * @see PsiJavaFile#getImportList()
  */
 public interface PsiImportList extends PsiElement {
   PsiImportList[] EMPTY_ARRAY = new PsiImportList[0];
   ArrayFactory<PsiImportList> ARRAY_FACTORY = new ArrayFactory<PsiImportList>() {
+    @NotNull
     @Override
     public PsiImportList[] create(int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiImportList[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiImportStatementBase.java b/java/java-psi-api/src/com/intellij/psi/PsiImportStatementBase.java
index e40b253dd3d4..582f51d1bf8e 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiImportStatementBase.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiImportStatementBase.java
@@ -16,6 +16,7 @@
 package com.intellij.psi;
 
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -30,6 +31,7 @@ public interface PsiImportStatementBase extends PsiElement {
   PsiImportStatementBase[] EMPTY_ARRAY = new PsiImportStatementBase[0];
 
   ArrayFactory<PsiImportStatementBase> ARRAY_FACTORY = new ArrayFactory<PsiImportStatementBase>() {
+    @NotNull
     @Override
     public PsiImportStatementBase[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiImportStatementBase[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceElement.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceElement.java
index b2f80104449c..a0eaeaecb38d 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceElement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiJavaCodeReferenceElement.java
@@ -30,6 +30,7 @@ public interface PsiJavaCodeReferenceElement extends PsiJavaReference, PsiQualif
   PsiJavaCodeReferenceElement[] EMPTY_ARRAY = new PsiJavaCodeReferenceElement[0];
 
   ArrayFactory<PsiJavaCodeReferenceElement> ARRAY_FACTORY = new ArrayFactory<PsiJavaCodeReferenceElement>() {
+    @NotNull
     @Override
     public PsiJavaCodeReferenceElement[] create(int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiJavaCodeReferenceElement[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethod.java b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java
index 0d4f172c7041..28a79ed07d9b 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiMethod.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiMethod.java
@@ -39,6 +39,7 @@ public interface PsiMethod extends PsiMember, PsiNameIdentifierOwner, PsiModifie
   PsiMethod[] EMPTY_ARRAY = new PsiMethod[0];
 
   ArrayFactory<PsiMethod> ARRAY_FACTORY = new ArrayFactory<PsiMethod>() {
+    @NotNull
     @Override
     public PsiMethod[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiMethod[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiNameValuePair.java b/java/java-psi-api/src/com/intellij/psi/PsiNameValuePair.java
index 5e9c14c80f5a..d9882347b9f5 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiNameValuePair.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiNameValuePair.java
@@ -34,6 +34,7 @@ public interface PsiNameValuePair extends PsiElement {
   PsiNameValuePair[] EMPTY_ARRAY = new PsiNameValuePair[0];
 
   ArrayFactory<PsiNameValuePair> ARRAY_FACTORY = new ArrayFactory<PsiNameValuePair>() {
+    @NotNull
     @Override
     public PsiNameValuePair[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiNameValuePair[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiParameter.java b/java/java-psi-api/src/com/intellij/psi/PsiParameter.java
index 025d37ff5b37..dc8b0aefdabc 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiParameter.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiParameter.java
@@ -29,6 +29,7 @@ public interface PsiParameter extends PsiVariable {
   PsiParameter[] EMPTY_ARRAY = new PsiParameter[0];
 
   ArrayFactory<PsiParameter> ARRAY_FACTORY = new ArrayFactory<PsiParameter>() {
+    @NotNull
     @Override
     public PsiParameter[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiParameter[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiStatement.java b/java/java-psi-api/src/com/intellij/psi/PsiStatement.java
index fcd2ea2c5aa2..a26dfc2ca3bd 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiStatement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiStatement.java
@@ -16,6 +16,7 @@
 package com.intellij.psi;
 
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a Java statement.
@@ -27,6 +28,7 @@ public interface PsiStatement extends PsiElement {
   PsiStatement[] EMPTY_ARRAY = new PsiStatement[0];
 
   ArrayFactory<PsiStatement> ARRAY_FACTORY = new ArrayFactory<PsiStatement>() {
+    @NotNull
     @Override
     public PsiStatement[] create(final int count) {
       return count == 0 ? PsiStatement.EMPTY_ARRAY : new PsiStatement[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java
index dd511d3c225f..e94c1aaa069e 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeElement.java
@@ -30,6 +30,7 @@ public interface PsiTypeElement extends PsiElement,PsiAnnotationOwner {
   PsiTypeElement[] EMPTY_ARRAY = new PsiTypeElement[0];
 
   ArrayFactory<PsiTypeElement> ARRAY_FACTORY = new ArrayFactory<PsiTypeElement>() {
+    @NotNull
     @Override
     public PsiTypeElement[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiTypeElement[count];
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeParameter.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameter.java
index de168c1cad28..9dcdbf3b5579 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiTypeParameter.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameter.java
@@ -31,6 +31,7 @@ public interface PsiTypeParameter extends PsiClass, PsiAnnotationOwner {
   PsiTypeParameter[] EMPTY_ARRAY = new PsiTypeParameter[0];
 
   ArrayFactory<PsiTypeParameter> ARRAY_FACTORY = new ArrayFactory<PsiTypeParameter>() {
+    @NotNull
     @Override
     public PsiTypeParameter[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiTypeParameter[count];
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java
index b49a615f0285..e1960a8a88bd 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportListImpl.java
@@ -34,6 +34,7 @@ public class PsiImportListImpl extends JavaStubPsiElement<PsiImportListStub> imp
   private volatile Map<String,PsiImportStatementBase> myNameToSingleImportMap = null;
   private static final PsiImportStatementBase[] EMPTY_ARRAY = new PsiImportStatementBase[0];
   private static final ArrayFactory<PsiImportStatementBase> ARRAY_FACTORY = new ArrayFactory<PsiImportStatementBase>() {
+    @NotNull
     @Override
     public PsiImportStatementBase[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiImportStatementBase[count];
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java
index 68c955baa226..7c955cae55d0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStatementImpl.java
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
 public class PsiImportStatementImpl extends PsiImportStatementBaseImpl implements PsiImportStatement {
   public static final PsiImportStatementImpl[] EMPTY_ARRAY = new PsiImportStatementImpl[0];
   public static final ArrayFactory<PsiImportStatementImpl> ARRAY_FACTORY = new ArrayFactory<PsiImportStatementImpl>() {
+    @NotNull
     @Override
     public PsiImportStatementImpl[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiImportStatementImpl[count];
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java
index 4917a76f3339..9286673b8eba 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticStatementImpl.java
@@ -26,6 +26,7 @@ import org.jetbrains.annotations.Nullable;
 public class PsiImportStaticStatementImpl extends PsiImportStatementBaseImpl implements PsiImportStaticStatement {
   public static final PsiImportStaticStatementImpl[] EMPTY_ARRAY = new PsiImportStaticStatementImpl[0];
   public static final ArrayFactory<PsiImportStaticStatementImpl> ARRAY_FACTORY = new ArrayFactory<PsiImportStaticStatementImpl>() {
+    @NotNull
     @Override
     public PsiImportStaticStatementImpl[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiImportStaticStatementImpl[count];
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java
index e8a00fca7f6f..121ebdf54aa1 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java
@@ -42,6 +42,7 @@ public class PsiDocCommentImpl extends LazyParseablePsiElement implements PsiDoc
 
   private static final TokenSet TAG_BIT_SET = TokenSet.create(DOC_TAG);
   private static final ArrayFactory<PsiDocTag> ARRAY_FACTORY = new ArrayFactory<PsiDocTag>() {
+    @NotNull
     @Override
     public PsiDocTag[] create(final int count) {
       return count == 0 ? PsiDocTag.EMPTY_ARRAY : new PsiDocTag[count];
diff --git a/platform/core-api/src/com/intellij/psi/PsiElement.java b/platform/core-api/src/com/intellij/psi/PsiElement.java
index e6394bb13b1c..57b139102651 100644
--- a/platform/core-api/src/com/intellij/psi/PsiElement.java
+++ b/platform/core-api/src/com/intellij/psi/PsiElement.java
@@ -44,6 +44,7 @@ public interface PsiElement extends UserDataHolder, Iconable {
   PsiElement[] EMPTY_ARRAY = new PsiElement[0];
 
   ArrayFactory<PsiElement> ARRAY_FACTORY = new ArrayFactory<PsiElement>() {
+    @NotNull
     @Override
     public PsiElement[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiElement[count];
diff --git a/platform/core-api/src/com/intellij/psi/PsiReference.java b/platform/core-api/src/com/intellij/psi/PsiReference.java
index baf4b69b1c38..acc25ec529cd 100644
--- a/platform/core-api/src/com/intellij/psi/PsiReference.java
+++ b/platform/core-api/src/com/intellij/psi/PsiReference.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
  *
  * @see PsiPolyVariantReference
  * @see PsiElement#getReference()
- * @see PsiElement#getReferences() 
+ * @see PsiElement#getReferences()
  * @see com.intellij.psi.PsiReferenceService#getReferences(PsiElement, com.intellij.psi.PsiReferenceService.Hints)
  * @see com.intellij.psi.PsiReferenceBase
  * @see com.intellij.psi.PsiReferenceContributor
@@ -42,6 +42,7 @@ public interface PsiReference {
   PsiReference[] EMPTY_ARRAY = new PsiReference[0];
 
   ArrayFactory<PsiReference> ARRAY_FACTORY = new ArrayFactory<PsiReference>() {
+    @NotNull
     @Override
     public PsiReference[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new PsiReference[count];
@@ -118,7 +119,7 @@ public interface PsiReference {
    *
    * @return the array of available identifiers.
    */
-  @NotNull 
+  @NotNull
   Object[] getVariants();
 
   /**
diff --git a/platform/lang-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java b/platform/lang-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
index ecac3bc28a42..9997f6b161ad 100644
--- a/platform/lang-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
+++ b/platform/lang-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull;
 public interface CommonProblemDescriptor {
   CommonProblemDescriptor[] EMPTY_ARRAY = new CommonProblemDescriptor[0];
   ArrayFactory<CommonProblemDescriptor> ARRAY_FACTORY = new ArrayFactory<CommonProblemDescriptor>() {
+    @NotNull
     @Override
     public CommonProblemDescriptor[] create(final int count) {
       return count == 0 ? EMPTY_ARRAY : new CommonProblemDescriptor[count];
@@ -47,7 +48,7 @@ public interface CommonProblemDescriptor {
   /**
    * Returns the quickfixes for the problem.
    *
-   * @return the list of quickfixes registered for the problem. 
+   * @return the list of quickfixes registered for the problem.
    */
   QuickFix[] getFixes();
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
index bd783fc046e8..d209c64a1a10 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
@@ -651,6 +651,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry {
 
   private void removeFromArray(int index) {
     myChildren = ArrayUtil.remove(myChildren, index, new ArrayFactory<VirtualFileSystemEntry>() {
+      @NotNull
       @Override
       public VirtualFileSystemEntry[] create(int count) {
         return new VirtualFileSystemEntry[count];
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryInfo.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryInfo.java
index ffb2ff30e797..8755f49aa26e 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryInfo.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryInfo.java
@@ -256,6 +256,7 @@ public final class DirectoryInfo {
   }
 
   private static final ArrayFactory<OrderEntry> ORDER_ENTRY_ARRAY_FACTORY = new ArrayFactory<OrderEntry>() {
+    @NotNull
     @Override
     public OrderEntry[] create(int count) {
       return count == 0 ? OrderEntry.EMPTY_ARRAY : new OrderEntry[count];
diff --git a/platform/util/src/com/intellij/util/ArrayFactory.java b/platform/util/src/com/intellij/util/ArrayFactory.java
index 345ee83a21c5..207fb4597524 100644
--- a/platform/util/src/com/intellij/util/ArrayFactory.java
+++ b/platform/util/src/com/intellij/util/ArrayFactory.java
@@ -19,6 +19,9 @@
  */
 package com.intellij.util;
 
+import org.jetbrains.annotations.NotNull;
+
 public interface ArrayFactory<T> {
+  @NotNull
   T[] create(int count);
 }
\ No newline at end of file
diff --git a/platform/util/src/com/intellij/util/ArrayUtil.java b/platform/util/src/com/intellij/util/ArrayUtil.java
index 2074720e6213..b4d7df3ebd1d 100644
--- a/platform/util/src/com/intellij/util/ArrayUtil.java
+++ b/platform/util/src/com/intellij/util/ArrayUtil.java
@@ -47,12 +47,14 @@ public class ArrayUtil extends ArrayUtilRt {
   public static final CharSequence EMPTY_CHAR_SEQUENCE = new CharArrayCharSequence(EMPTY_CHAR_ARRAY);
 
   public static final ArrayFactory<String> STRING_ARRAY_FACTORY = new ArrayFactory<String>() {
+    @NotNull
     @Override
     public String[] create(int count) {
       return newStringArray(count);
     }
   };
   public static final ArrayFactory<Object> OBJECT_ARRAY_FACTORY = new ArrayFactory<Object>() {
+    @NotNull
     @Override
     public Object[] create(int count) {
       return newObjectArray(count);
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/InjectionPlace.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/InjectionPlace.java
index f693d7f8bb49..26e43681f107 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/InjectionPlace.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/InjectionPlace.java
@@ -19,6 +19,7 @@ package org.intellij.plugins.intelliLang.inject.config;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
 
 /**
 * @author Gregory.Shrago
@@ -29,6 +30,7 @@ public class InjectionPlace {
   public static final InjectionPlace[] EMPTY_ARRAY = new InjectionPlace[0];
 
   public static final ArrayFactory<InjectionPlace> ARRAY_FACTORY = new ArrayFactory<InjectionPlace>() {
+    @NotNull
     @Override
     public InjectionPlace[] create(int count) {
       return count == 0? EMPTY_ARRAY : new InjectionPlace[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariable.java
index 4b837dfaff8c..fd6ad06c30c3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariable.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariable.java
@@ -34,6 +34,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
 public interface GrVariable extends PsiVariable, GrNamedElement {
   GrVariable[] EMPTY_ARRAY = new GrVariable[0];
   ArrayFactory<GrVariable> ARRAY_FACTORY = new ArrayFactory<GrVariable>() {
+    @NotNull
     @Override
     public GrVariable[] create(int count) {
       return new GrVariable[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
index 68eb1061f998..bbc6d548ca3e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
@@ -16,6 +16,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
  */
 public interface GrVariableDeclaration extends GrStatement, GrMembersDeclaration {
   ArrayFactory<GrVariableDeclaration> ARRAY_FACTORY = new ArrayFactory<GrVariableDeclaration>() {
+    @NotNull
     @Override
     public GrVariableDeclaration[] create(int count) {
       return new GrVariableDeclaration[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java
index 781ba5d9b47f..603d4ee94362 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java
@@ -34,6 +34,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
 public interface GrParameter extends PsiParameter, GrVariable, GrCondition {
   GrParameter[] EMPTY_ARRAY = new GrParameter[0];
   ArrayFactory<GrParameter> ARRAY_FACTORY = new ArrayFactory<GrParameter>() {
+    @NotNull
     @Override
     public GrParameter[] create(int count) {
       return new GrParameter[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrReferenceList.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrReferenceList.java
index 3cc961241693..95013a17653d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrReferenceList.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrReferenceList.java
@@ -26,6 +26,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
  */
 public interface GrReferenceList extends GroovyPsiElement {
   ArrayFactory<GrReferenceList> ARRAY_FACTORY = new ArrayFactory<GrReferenceList>() {
+    @NotNull
     @Override
     public GrReferenceList[] create(int count) {
       return new GrReferenceList[0];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrTypeDefinition.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrTypeDefinition.java
index 9444a8758102..969685ca6a2c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrTypeDefinition.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/GrTypeDefinition.java
@@ -43,6 +43,7 @@ public interface GrTypeDefinition
 
   GrTypeDefinition[] EMPTY_ARRAY = new GrTypeDefinition[0];
   ArrayFactory<GrTypeDefinition> ARRAY_FACTORY = new ArrayFactory<GrTypeDefinition>() {
+    @NotNull
     @Override
     public GrTypeDefinition[] create(int count) {
       return new GrTypeDefinition[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrEnumConstant.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrEnumConstant.java
index e87d5d5d5d04..c6e11a8cd9eb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrEnumConstant.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrEnumConstant.java
@@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members;
 
 import com.intellij.psi.PsiEnumConstant;
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
@@ -31,6 +32,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumConsta
 public interface GrEnumConstant extends GrField, GrConstructorCall, PsiEnumConstant {
   GrEnumConstant[] EMPTY_ARRAY = new GrEnumConstant[0];
   ArrayFactory<GrEnumConstant> ARRAY_FACTORY = new ArrayFactory<GrEnumConstant>() {
+    @NotNull
     @Override
     public GrEnumConstant[] create(int count) {
       return new GrEnumConstant[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrMethod.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrMethod.java
index 09e10d40e12d..84ea773ec225 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrMethod.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/typedef/members/GrMethod.java
@@ -44,6 +44,7 @@ public interface GrMethod extends GrMembersDeclaration, GrNamedElement, PsiMetho
         GrParametersOwner, GrTopLevelDefinition, GrTypeParameterListOwner, GrDocCommentOwner {
   GrMethod[] EMPTY_ARRAY = new GrMethod[0];
   ArrayFactory<GrMethod> ARRAY_FACTORY = new ArrayFactory<GrMethod>() {
+    @NotNull
     @Override
     public GrMethod[] create(int count) {
       return new GrMethod[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
index 44d9c76b165f..18dc9cd67f8e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
@@ -64,6 +64,7 @@ public class GrModifierListImpl extends GrStubElementBase<GrModifierListStub> im
   public static final TObjectIntHashMap<String> NAME_TO_MODIFIER_FLAG_MAP = new TObjectIntHashMap<String>();
   public static final Map<String, IElementType> NAME_TO_MODIFIER_ELEMENT_TYPE = ContainerUtil.newHashMap();
   private static final ArrayFactory<GrAnnotation> ARRAY_FACTORY = new ArrayFactory<GrAnnotation>() {
+    @NotNull
     @Override
     public GrAnnotation[] create(int count) {
       return new GrAnnotation[count];
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
index 2ce54ad11c7c..cd88eda6c24f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
@@ -221,6 +221,7 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
       final GroovyResolveResult[] tupleCandidates = ResolveUtil.getMethodCandidates(thisType, name, invoked, tupleType);
       if (incompleteCode) {
         candidates = ArrayUtil.mergeArrays(candidates, tupleCandidates, new ArrayFactory<GroovyResolveResult>() {
+          @NotNull
           @Override
           public GroovyResolveResult[] create(int count) {
             return new GroovyResolveResult[count];
@@ -294,7 +295,7 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
   @Override
   public PsiType getNominalType() {
     if (getParent() instanceof GrThrowStatement) return super.getNominalType();
-    
+
     GroovyResolveResult[] candidates = multiResolve(true);
     if (candidates.length == 1) {
       return extractLastParameterType(candidates[0]);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java
index f089d1a9f252..1811e252acf8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java
@@ -35,6 +35,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.GrStubElementBase;
  */
 public class GrTypeParameterListImpl extends GrStubElementBase<EmptyStub> implements GrTypeParameterList, StubBasedPsiElement<EmptyStub> {
   private static final ArrayFactory<GrTypeParameter> ARRAY_FACTORY = new ArrayFactory<GrTypeParameter>() {
+    @NotNull
     @Override
     public GrTypeParameter[] create(int count) {
       return new GrTypeParameter[count];
diff --git a/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java b/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java
index e279ed71c684..56a9604a1af8 100644
--- a/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java
+++ b/xml/openapi/src/com/intellij/xml/XmlAttributeDescriptor.java
@@ -19,6 +19,7 @@ package com.intellij.xml;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.xml.XmlElement;
 import com.intellij.util.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -27,6 +28,7 @@ import org.jetbrains.annotations.Nullable;
 public interface XmlAttributeDescriptor extends PsiMetaData {
   XmlAttributeDescriptor[] EMPTY = new XmlAttributeDescriptor[0];
   ArrayFactory<XmlAttributeDescriptor> ARRAY_FACTORY = new ArrayFactory<XmlAttributeDescriptor>() {
+    @NotNull
     @Override
     public XmlAttributeDescriptor[] create(int count) {
       return new XmlAttributeDescriptor[count];