notnull

java/java-psi-api/src/com/intellij/psi/PsiClassType.java

@@ -42,7 +42,7 @@ public abstract class PsiClassType extends PsiType implements JvmReferenceType {
 
   protected final LanguageLevel myLanguageLevel;
 
-  protected PsiClassType(LanguageLevel languageLevel) {
+  protected PsiClassType(@NotNull LanguageLevel languageLevel) {
     this(languageLevel, PsiAnnotation.EMPTY_ARRAY);
   }
 
@@ -67,6 +67,7 @@ public abstract class PsiClassType extends PsiType implements JvmReferenceType {
    *
    * @return the class instance, or null if the reference resolve failed.
    */
+  @Override
   @Nullable
   public abstract PsiClass resolve();
 

java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java

@@ -129,7 +129,7 @@ class TypeCorrector extends PsiTypeMapper {
     private final PsiClassType myDelegate;
     private final CorrectedResolveResult myResolveResult;
 
-    private PsiCorrectedClassType(LanguageLevel languageLevel,
+    private PsiCorrectedClassType(@NotNull LanguageLevel languageLevel,
                                   PsiClassType delegate,
                                   CorrectedResolveResult resolveResult) {
       super(languageLevel, delegate.getAnnotationProvider());

platform/util/src/com/intellij/util/containers/ComparatorUtil.java

@@ -15,6 +15,7 @@
  */
 package com.intellij.util.containers;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
@@ -23,7 +24,8 @@ public class ComparatorUtil {
   private ComparatorUtil() {
   }
 
-  public static <Type, Aspect> Comparator<Type> compareBy(final Convertor<Type, Aspect> aspect, final Comparator<Aspect> comparator) {
+  @NotNull
+  public static <Type, Aspect> Comparator<Type> compareBy(@NotNull final Convertor<Type, Aspect> aspect, @NotNull final Comparator<Aspect> comparator) {
     return new Comparator<Type>() {
       @Override
       public int compare(Type element1, Type element2) {
@@ -32,19 +34,20 @@ public class ComparatorUtil {
     };
   }
 
-  public static <T extends Comparable<T>> T max(T o1, T o2) {
+  @NotNull
+  public static <T extends Comparable<T>> T max(@NotNull T o1, @NotNull T o2) {
     return o1.compareTo(o2) >= 0 ? o1 : o2;
   }
 
-  public static <T extends Comparable<T>> T min(T o1, T o2) {
+  @NotNull
+  public static <T extends Comparable<T>> T min(@NotNull T o1, @NotNull T o2) {
     return o1.compareTo(o2) >= 0 ? o2 : o1;
   }
 
   public static <T> boolean equalsNullable(@Nullable T a, @Nullable T b) {
     if (a == null) {
       return b == null;
-    } else {
-      return b != null && a.equals(b);
     }
+    return a.equals(b);
   }
 }

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java

@@ -33,7 +33,7 @@ public class GrClassReferenceType extends PsiClassType {
     super(LanguageLevel.JDK_1_5);
     myReferenceElement = referenceElement;
   }
-  public GrClassReferenceType(GrReferenceElement referenceElement, LanguageLevel languageLevel) {
+  public GrClassReferenceType(GrReferenceElement referenceElement, @NotNull LanguageLevel languageLevel) {
     super(languageLevel);
     myReferenceElement = referenceElement;
   }

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java

@@ -27,7 +27,7 @@ public class GrClosureType extends GrLiteralClassType {
   private volatile PsiType[] myTypeArgs;
   private GrClosableBlock myClosure;
 
-  private GrClosureType(LanguageLevel languageLevel,
+  private GrClosureType(@NotNull LanguageLevel languageLevel,
                         @NotNull GlobalSearchScope scope,
                         @NotNull JavaPsiFacade facade,
                         @NotNull GrSignature closureSignature,
@@ -37,7 +37,7 @@ public class GrClosureType extends GrLiteralClassType {
     if (!shouldInferTypeParameters) myTypeArgs = PsiType.EMPTY_ARRAY;
   }
 
-  private GrClosureType(LanguageLevel level,
+  private GrClosureType(@NotNull LanguageLevel level,
                         @NotNull GlobalSearchScope scope,
                         @NotNull JavaPsiFacade facade,
                         @NotNull GrSignature signature,
@@ -161,7 +161,7 @@ public class GrClosureType extends GrLiteralClassType {
   public static GrClosureType create(@NotNull GrSignature signature,
                                      GlobalSearchScope scope,
                                      JavaPsiFacade facade,
-                                     LanguageLevel languageLevel,
+                                     @NotNull LanguageLevel languageLevel,
                                      boolean shouldInferTypeParameters) {
     return new GrClosureType(languageLevel, scope, facade, signature, shouldInferTypeParameters);
   }

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java

@@ -34,7 +34,7 @@ public abstract class GrLiteralClassType extends PsiClassType {
   protected final JavaPsiFacade myFacade;
   private final GroovyPsiManager myGroovyPsiManager;
 
-  public GrLiteralClassType(LanguageLevel languageLevel, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade) {
+  public GrLiteralClassType(@NotNull LanguageLevel languageLevel, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade) {
     super(languageLevel);
     myScope = scope;
     myFacade = facade;

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java

@@ -58,7 +58,7 @@ public abstract class GrMapType extends GrLiteralClassType {
 
   protected GrMapType(JavaPsiFacade facade,
                       GlobalSearchScope scope,
-                      LanguageLevel languageLevel) {
+                      @NotNull LanguageLevel languageLevel) {
     super(languageLevel, scope, facade);
   }
 

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapTypeImpl.java

@@ -37,7 +37,7 @@ public class GrMapTypeImpl extends GrMapType {
                 GlobalSearchScope scope,
                 LinkedHashMap<String, PsiType> stringEntries,
                 List<Couple<PsiType>> otherEntries,
-                LanguageLevel languageLevel) {
+                @NotNull LanguageLevel languageLevel) {
     super(facade, scope, languageLevel);
     myStringEntries = stringEntries;
     myOtherEntries = otherEntries;

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrRangeType.java

@@ -38,7 +38,7 @@ public class GrRangeType extends GrLiteralClassType {
 
   private final PsiType[] myParameters;
 
-  public GrRangeType(LanguageLevel languageLevel,
+  public GrRangeType(@NotNull LanguageLevel languageLevel,
                      GlobalSearchScope scope,
                      JavaPsiFacade facade,
                      @Nullable PsiType left,

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/LazyFqnClassType.java

@@ -29,7 +29,7 @@ public class LazyFqnClassType extends GrLiteralClassType {
   private final String myFqn;
 
   private LazyFqnClassType(@NotNull String fqn,
-                           LanguageLevel languageLevel,
+                           @NotNull LanguageLevel languageLevel,
                            @NotNull GlobalSearchScope scope,
                            @NotNull JavaPsiFacade facade) {
     super(languageLevel, scope, facade);