notnull

2026-09-18 09:34:34 +07:00 · 2011-12-05 13:17:30 +04:00
parent 86dc6d8700
commit 51dfe9df93
29 changed files with 80 additions and 73 deletions
@@ -48,12 +48,12 @@ public class JavaAnnotationElementType extends JavaStubElementType<PsiAnnotation
  }

  @Override
-  public PsiAnnotation createPsi(final PsiAnnotationStub stub) {
+  public PsiAnnotation createPsi(@NotNull final PsiAnnotationStub stub) {
    return getPsiFactory(stub).createAnnotation(stub);
  }

  @Override
-  public PsiAnnotation createPsi(final ASTNode node) {
+  public PsiAnnotation createPsi(@NotNull final ASTNode node) {
    return new PsiAnnotationImpl(node);
  }  

@@ -52,12 +52,12 @@ public abstract class JavaClassElementType extends JavaStubElementType<PsiClassS
  }

  @Override
-  public PsiClass createPsi(final PsiClassStub stub) {
+  public PsiClass createPsi(@NotNull final PsiClassStub stub) {
    return getPsiFactory(stub).createClass(stub);
  }

  @Override
-  public PsiClass createPsi(final ASTNode node) {
+  public PsiClass createPsi(@NotNull final ASTNode node) {
    if (node instanceof EnumConstantInitializerElement) {
      return new PsiEnumConstantInitializerImpl(node);
    }
@@ -45,12 +45,12 @@ public class JavaClassInitializerElementType extends JavaStubElementType<PsiClas
  }

  @Override
-  public PsiClassInitializer createPsi(final PsiClassInitializerStub stub) {
+  public PsiClassInitializer createPsi(@NotNull final PsiClassInitializerStub stub) {
    return getPsiFactory(stub).createClassInitializer(stub);
  }

  @Override
-  public PsiClassInitializer createPsi(final ASTNode node) {
+  public PsiClassInitializer createPsi(@NotNull final ASTNode node) {
    return new PsiClassInitializerImpl(node);
  }

@@ -48,12 +48,12 @@ public abstract class JavaClassReferenceListElementType extends JavaStubElementT
  }

  @Override
-  public PsiReferenceList createPsi(final PsiClassReferenceListStub stub) {
+  public PsiReferenceList createPsi(@NotNull final PsiClassReferenceListStub stub) {
    return getPsiFactory(stub).createClassReferenceList(stub);
  }

  @Override
-  public PsiReferenceList createPsi(final ASTNode node) {
+  public PsiReferenceList createPsi(@NotNull final ASTNode node) {
    if (node.getElementType() == JavaStubElementTypes.EXTENDS_BOUND_LIST) {
      return new PsiTypeParameterExtendsBoundsListImpl(node);
    }
@@ -53,12 +53,12 @@ public abstract class JavaFieldStubElementType extends JavaStubElementType<PsiFi
  }

  @Override
-  public PsiField createPsi(final PsiFieldStub stub) {
+  public PsiField createPsi(@NotNull final PsiFieldStub stub) {
    return getPsiFactory(stub).createField(stub);
  }

  @Override
-  public PsiField createPsi(final ASTNode node) {
+  public PsiField createPsi(@NotNull final ASTNode node) {
    if (node instanceof EnumConstantElement) {
      return new PsiEnumConstantImpl(node);
    }
@@ -45,12 +45,12 @@ public class JavaImportListElementType extends JavaStubElementType<PsiImportList
  }

  @Override
-  public PsiImportList createPsi(final PsiImportListStub stub) {
+  public PsiImportList createPsi(@NotNull final PsiImportListStub stub) {
    return getPsiFactory(stub).createImportList(stub);
  }

  @Override
-  public PsiImportList createPsi(final ASTNode node) {
+  public PsiImportList createPsi(@NotNull final ASTNode node) {
    return new PsiImportListImpl(node);
  }

@@ -46,12 +46,12 @@ public abstract class JavaImportStatementElementType extends JavaStubElementType
  }

  @Override
-  public PsiImportStatementBase createPsi(final PsiImportStatementStub stub) {
+  public PsiImportStatementBase createPsi(@NotNull final PsiImportStatementStub stub) {
    return getPsiFactory(stub).createImportStatement(stub);
  }

  @Override
-  public PsiImportStatementBase createPsi(final ASTNode node) {
+  public PsiImportStatementBase createPsi(@NotNull final ASTNode node) {
    if (node instanceof ImportStaticStatementElement) {
      return new PsiImportStaticStatementImpl(node);
    }
@@ -38,6 +38,7 @@ import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;

 import java.io.IOException;
 import java.util.List;
@@ -51,12 +52,12 @@ public abstract class JavaMethodElementType extends JavaStubElementType<PsiMetho
  }

  @Override
-  public PsiMethod createPsi(final PsiMethodStub stub) {
+  public PsiMethod createPsi(@NotNull final PsiMethodStub stub) {
    return getPsiFactory(stub).createMethod(stub);
  }

  @Override
-  public PsiMethod createPsi(final ASTNode node) {
+  public PsiMethod createPsi(@NotNull final ASTNode node) {
    if (node instanceof AnnotationMethodElement) {
      return new PsiAnnotationMethodImpl(node);
    }
@@ -48,12 +48,12 @@ public class JavaModifierListElementType extends JavaStubElementType<PsiModifier
  }

  @Override
-  public PsiModifierList createPsi(final PsiModifierListStub stub) {
+  public PsiModifierList createPsi(@NotNull final PsiModifierListStub stub) {
    return getPsiFactory(stub).createModifierList(stub);
  }

  @Override
-  public PsiModifierList createPsi(final ASTNode node) {
+  public PsiModifierList createPsi(@NotNull final ASTNode node) {
    return new PsiModifierListImpl(node);
  }

@@ -50,12 +50,12 @@ public class JavaParameterElementType extends JavaStubElementType<PsiParameterSt
  }

  @Override
-  public PsiParameter createPsi(final PsiParameterStub stub) {
+  public PsiParameter createPsi(@NotNull PsiParameterStub stub) {
    return getPsiFactory(stub).createParameter(stub);
  }

  @Override
-  public PsiParameter createPsi(final ASTNode node) {
+  public PsiParameter createPsi(@NotNull final ASTNode node) {
    return new PsiParameterImpl(node);
  }

@@ -45,12 +45,12 @@ public class JavaParameterListElementType extends JavaStubElementType<PsiParamet
  }

  @Override
-  public PsiParameterList createPsi(final PsiParameterListStub stub) {
+  public PsiParameterList createPsi(@NotNull final PsiParameterListStub stub) {
    return getPsiFactory(stub).createParameterList(stub);
  }

  @Override
-  public PsiParameterList createPsi(final ASTNode node) {
+  public PsiParameterList createPsi(@NotNull final ASTNode node) {
    return new PsiParameterListImpl(node);
  }

@@ -64,10 +64,10 @@ public abstract class JavaStubElementType<StubT extends StubElement, PsiT extend
  }

  @SuppressWarnings("MethodOverloadsMethodOfSuperclass")
-  public abstract PsiT createPsi(ASTNode node);
+  public abstract PsiT createPsi(@NotNull ASTNode node);

  @Override
-  public final StubT createStub(final PsiT psi, final StubElement parentStub) {
+  public final StubT createStub(@NotNull final PsiT psi, final StubElement parentStub) {
    final String message = "Should not be called. Element=" + psi + "; file=" + (psi.isValid() ? psi.getContainingFile() : "-");
    throw new UnsupportedOperationException(message);
  }
@@ -49,12 +49,12 @@ public class JavaTypeParameterElementType extends JavaStubElementType<PsiTypePar
  }

  @Override
-  public PsiTypeParameter createPsi(final PsiTypeParameterStub stub) {
+  public PsiTypeParameter createPsi(@NotNull final PsiTypeParameterStub stub) {
    return getPsiFactory(stub).createTypeParameter(stub);
  }

  @Override
-  public PsiTypeParameter createPsi(final ASTNode node) {
+  public PsiTypeParameter createPsi(@NotNull final ASTNode node) {
    return new PsiTypeParameterImpl(node);
  }

@@ -45,12 +45,12 @@ public class JavaTypeParameterListElementType extends JavaStubElementType<PsiTyp
  }

  @Override
-  public PsiTypeParameterList createPsi(final PsiTypeParameterListStub stub) {
+  public PsiTypeParameterList createPsi(@NotNull final PsiTypeParameterListStub stub) {
    return getPsiFactory(stub).createTypeParameterList(stub);
  }

  @Override
-  public PsiTypeParameterList createPsi(final ASTNode node) {
+  public PsiTypeParameterList createPsi(@NotNull final ASTNode node) {
    return new PsiTypeParameterListImpl(node);
  }

@@ -44,7 +44,7 @@ import org.jetbrains.annotations.Nullable;
 public abstract class JavaStubPsiElement<T extends StubElement> extends StubBasedPsiElementBase<T> implements StubBasedPsiElement<T> {
  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.JavaStubPsiElement");

-  public JavaStubPsiElement(final T stub, IStubElementType nodeType) {
+  public JavaStubPsiElement(@NotNull T stub, @NotNull IStubElementType nodeType) {
    super(stub, nodeType);
  }

@@ -44,11 +44,11 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiParameterImpl");
  private volatile PatchedSoftReference<PsiType> myCachedType = null;

-  public PsiParameterImpl(final PsiParameterStub stub) {
+  public PsiParameterImpl(@NotNull PsiParameterStub stub) {
    super(stub, JavaStubElementTypes.PARAMETER);
  }

-  public PsiParameterImpl(final ASTNode node) {
+  public PsiParameterImpl(@NotNull ASTNode node) {
    super(node);
  }

@@ -31,11 +31,11 @@ import org.jetbrains.annotations.NotNull;
 public class PsiParameterListImpl extends JavaStubPsiElement<PsiParameterListStub> implements PsiParameterList {
  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiParameterListImpl");

-  public PsiParameterListImpl(final PsiParameterListStub stub) {
+  public PsiParameterListImpl(@NotNull PsiParameterListStub stub) {
    super(stub, JavaStubElementTypes.PARAMETER_LIST);
  }

-  public PsiParameterListImpl(final ASTNode node) {
+  public PsiParameterListImpl(@NotNull ASTNode node) {
    super(node);
  }

@@ -18,7 +18,6 @@ package com.intellij.psi.impl.source.tree.java;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.JavaTokenType;
-import com.intellij.psi.impl.source.Constants;
 import com.intellij.psi.impl.source.tree.ChildRole;
 import com.intellij.psi.impl.source.tree.CompositeElement;
 import com.intellij.psi.impl.source.tree.JavaElementType;
@@ -29,7 +28,7 @@ public class ParameterElement extends CompositeElement{
  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ParameterElement");

  public ParameterElement() {
-    super(Constants.PARAMETER);
+    super(JavaElementType.PARAMETER);
  }

  protected ParameterElement(IElementType type) {