@NotNull for parameter of substitute()

compiler/backend/src/org/jetbrains/jet/codegen/context/RootContext.java

@@ -54,7 +54,7 @@ class RootContext extends CodegenContext {
         }
 
         @Override
-        public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
+        public DeclarationDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
             throw new IllegalStateException();
         }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/AbstractNamespaceDescriptorImpl.java

@@ -51,7 +51,7 @@ public abstract class AbstractNamespaceDescriptorImpl extends DeclarationDescrip
 
     @NotNull
     @Override
-    public NamespaceDescriptor substitute(TypeSubstitutor substitutor) {
+    public NamespaceDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException("This operation does not make sense for a namespace");
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/AbstractReceiverParameterDescriptor.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.descriptors;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.name.Name;
@@ -35,7 +36,7 @@ public abstract class AbstractReceiverParameterDescriptor extends DeclarationDes
 
     @Nullable
     @Override
-    public ReceiverParameterDescriptor substitute(TypeSubstitutor substitutor) {
+    public ReceiverParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         if (substitutor.isEmpty()) return this;
         JetType substitutedType = substitutor.substitute(getType(), Variance.INVARIANT);
         if (substitutedType == null) return null;

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java

@@ -45,7 +45,7 @@ public interface CallableDescriptor extends DeclarationDescriptorWithVisibility,
     CallableDescriptor getOriginal();
 
     @Override
-    CallableDescriptor substitute(TypeSubstitutor substitutor);
+    CallableDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 
     @NotNull
     List<ValueParameterDescriptor> getValueParameters();

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java

@@ -50,7 +50,7 @@ public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor,
 
     @NotNull
     @Override
-    ClassDescriptor substitute(TypeSubstitutor substitutor);
+    ClassDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 
     @Nullable
     @Override

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java

@@ -50,7 +50,7 @@ public abstract class ClassDescriptorBase implements ClassDescriptor {
 
     @NotNull
     @Override
-    public ClassDescriptor substitute(TypeSubstitutor substitutor) {
+    public ClassDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         if (substitutor.isEmpty()) {
             return this;
         }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java

@@ -120,7 +120,7 @@ public class ClassDescriptorImpl extends DeclarationDescriptorNonRootImpl implem
 
     @NotNull
     @Override
-    public ClassDescriptor substitute(TypeSubstitutor substitutor) {
+    public ClassDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException(); // TODO
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java

@@ -35,7 +35,7 @@ public interface DeclarationDescriptor extends Annotated, Named {
     DeclarationDescriptor getContainingDeclaration();
 
     @Nullable
-    DeclarationDescriptor substitute(TypeSubstitutor substitutor);
+    DeclarationDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 
     <R, D> R accept(DeclarationDescriptorVisitor<R, D> visitor, D data);
     void acceptVoid(DeclarationDescriptorVisitor<Void, Void> visitor);

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java

@@ -31,7 +31,7 @@ public interface FunctionDescriptor extends CallableMemberDescriptor {
     FunctionDescriptor getOriginal();
 
     @Override
-    FunctionDescriptor substitute(TypeSubstitutor substitutor);
+    FunctionDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 
     @Override
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptorImpl.java

@@ -178,7 +178,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
     }
 
     @Override
-    public final FunctionDescriptor substitute(TypeSubstitutor originalSubstitutor) {
+    public final FunctionDescriptor substitute(@NotNull TypeSubstitutor originalSubstitutor) {
         if (originalSubstitutor.isEmpty()) {
             return this;
         }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java

@@ -141,7 +141,7 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
 
     @NotNull
     @Override
-    public ClassDescriptor substitute(TypeSubstitutor substitutor) {
+    public ClassDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         if (substitutor.isEmpty()) return this;
         return new LazySubstitutingClassDescriptor(this, TypeSubstitutor.create(substitutor.getSubstitution(), getSubstitutor().getSubstitution()));
     }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/LocalVariableDescriptor.java

@@ -41,7 +41,7 @@ public class LocalVariableDescriptor extends VariableDescriptorImpl {
 
     @NotNull
     @Override
-    public LocalVariableDescriptor substitute(TypeSubstitutor substitutor) {
+    public LocalVariableDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException(); // TODO
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.java

@@ -57,7 +57,7 @@ public class ModuleDescriptor extends DeclarationDescriptorImpl implements Class
 
     @NotNull
     @Override
-    public ModuleDescriptor substitute(TypeSubstitutor substitutor) {
+    public ModuleDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         return this;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java

@@ -73,7 +73,7 @@ public abstract class PropertyAccessorDescriptor extends DeclarationDescriptorNo
 
     @NotNull
     @Override
-    public FunctionDescriptor substitute(TypeSubstitutor substitutor) {
+    public FunctionDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException(); // TODO
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java

@@ -44,5 +44,5 @@ public interface PropertyDescriptor
     Set<? extends PropertyDescriptor> getOverriddenDescriptors();
 
     @Override
-    PropertyDescriptor substitute(TypeSubstitutor substitutor);
+    PropertyDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptorImpl.java

@@ -195,7 +195,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorImpl implements Pr
     }
 
     @Override
-    public PropertyDescriptor substitute(TypeSubstitutor originalSubstitutor) {
+    public PropertyDescriptor substitute(@NotNull TypeSubstitutor originalSubstitutor) {
         if (originalSubstitutor.isEmpty()) {
             return this;
         }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java

@@ -40,5 +40,5 @@ public interface ReceiverParameterDescriptor extends DeclarationDescriptor {
 
     @Nullable
     @Override
-    ReceiverParameterDescriptor substitute(TypeSubstitutor substitutor);
+    ReceiverParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java

@@ -157,7 +157,7 @@ public class ScriptDescriptor extends DeclarationDescriptorNonRootImpl {
     }
 
     @Override
-    public DeclarationDescriptor substitute(TypeSubstitutor substitutor) {
+    public DeclarationDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new IllegalStateException("nothing to substitute in script");
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java

@@ -48,7 +48,7 @@ public interface TypeParameterDescriptor extends ClassifierDescriptor {
     @NotNull
     @Override
     @Deprecated // Use the static method TypeParameterDescriptor.substitute()
-    TypeParameterDescriptor substitute(TypeSubstitutor substitutor);
+    TypeParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 
     int getIndex();
 }

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptorImpl.java

@@ -198,7 +198,7 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp
     @NotNull
     @Override
     @Deprecated
-    public TypeParameterDescriptor substitute(TypeSubstitutor substitutor) {
+    public TypeParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException();
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptorImpl.java

@@ -126,7 +126,7 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme
 
     @NotNull
     @Override
-    public ValueParameterDescriptor substitute(TypeSubstitutor substitutor) {
+    public ValueParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException(); // TODO
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java

@@ -30,7 +30,7 @@ public interface VariableDescriptor extends CallableDescriptor {
     DeclarationDescriptor getContainingDeclaration();
 
     @Override
-    VariableDescriptor substitute(TypeSubstitutor substitutor);
+    VariableDescriptor substitute(@NotNull TypeSubstitutor substitutor);
 
     boolean isVar();
 }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java

@@ -241,7 +241,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor, Laz
     @NotNull
     @Override
     @Deprecated
-    public TypeParameterDescriptor substitute(TypeSubstitutor substitutor) {
+    public TypeParameterDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
         throw new UnsupportedOperationException("Don't call substitute() on type parameters");
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java

@@ -130,7 +130,7 @@ public class ErrorUtils {
 
         @NotNull
         @Override
-        public ClassDescriptor substitute(TypeSubstitutor substitutor) {
+        public ClassDescriptor substitute(@NotNull TypeSubstitutor substitutor) {
             return ERROR_CLASS;
         }
     };