From c41a1c8d7954d5a5b4c5659ce1bad70ad473a5a7 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 15 Feb 2012 23:03:32 +0100 Subject: [PATCH] @NotNull --- .../psi/impl/light/AbstractLightClass.java | 3 +++ .../intellij/psi/impl/light/LightClass.java | 20 ++++++------------- .../psi/impl/light/LightTypeParameter.java | 2 ++ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java index 36e174b1ef43..186fa0c80639 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java @@ -44,7 +44,10 @@ public abstract class AbstractLightClass extends LightElement implements PsiClas super(manager, JavaLanguage.INSTANCE); } + @NotNull public abstract PsiClass getDelegate(); + + @NotNull public abstract PsiElement copy(); @Override diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightClass.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightClass.java index 91f6e7c822d4..45cb3a2cf3b2 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightClass.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightClass.java @@ -17,19 +17,9 @@ package com.intellij.psi.impl.light; import com.intellij.lang.Language; import com.intellij.lang.java.JavaLanguage; -import com.intellij.openapi.util.Pair; -import com.intellij.psi.*; -import com.intellij.psi.impl.PsiClassImplUtil; -import com.intellij.psi.impl.PsiImplUtil; -import com.intellij.psi.javadoc.PsiDocComment; -import com.intellij.psi.scope.PsiScopeProcessor; -import com.intellij.util.IncorrectOperationException; -import org.jetbrains.annotations.NonNls; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Collection; -import java.util.List; /** * @author peter @@ -37,20 +27,22 @@ import java.util.List; public class LightClass extends AbstractLightClass { private final PsiClass myDelegate; - public LightClass(PsiClass delegate) { + public LightClass(@NotNull PsiClass delegate) { this(delegate, JavaLanguage.INSTANCE); } - public LightClass(PsiClass delegate, final Language language) { + public LightClass(@NotNull PsiClass delegate, final Language language) { super(delegate.getManager(), language); myDelegate = delegate; } + @NotNull @Override public PsiClass getDelegate() { return myDelegate; } + @NotNull @Override public PsiElement copy() { return new LightClass(this); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java index 54e5d84da927..6775a64c59ef 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameter.java @@ -24,11 +24,13 @@ public class LightTypeParameter extends LightClass implements PsiTypeParameter { super(delegate); } + @NotNull @Override public PsiTypeParameter getDelegate() { return (PsiTypeParameter)super.getDelegate(); } + @NotNull @Override public PsiElement copy() { return new LightTypeParameter(getDelegate());