From 34e001cc6e724b0a4354e5f06764a86d489fd980 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 15 Jun 2012 17:10:56 +0400
Subject: [PATCH] tests fixed

---
 .../codeInsight/generation/GenerateMembersUtil.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
index b1cc007de249..2699efc024f3 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
@@ -293,8 +293,8 @@ public class GenerateMembersUtil {
                                                                  @NotNull PsiTypeParameter typeParam,
                                                                  @NotNull PsiSubstitutor substitutor) {
     for (PsiType type : substitutor.getSubstitutionMap().values()) {
-      if (Comparing.equal(type.getCanonicalText(), typeParam.getName())) {
-        final String newName = suggestUniqueTypeParameterName(typeParam.getName(), sourceTypeParameterList, PsiTreeUtil.getParentOfType(target, PsiClass.class,false));
+      if (type != null && Comparing.equal(type.getCanonicalText(), typeParam.getName())) {
+        final String newName = suggestUniqueTypeParameterName(typeParam.getName(), sourceTypeParameterList, PsiTreeUtil.getParentOfType(target, PsiClass.class, false));
         final PsiTypeParameter newTypeParameter = factory.createTypeParameter(newName, typeParam.getSuperTypes());
         substitutor.put(typeParam, factory.createType(newTypeParameter));
         return newTypeParameter;
@@ -305,10 +305,10 @@ public class GenerateMembersUtil {
 
   @NotNull
   private static String suggestUniqueTypeParameterName(@NonNls String baseName, @NotNull PsiTypeParameterList typeParameterList, @Nullable PsiClass targetClass) {
-    int i =0;
+    int i = 0;
     while (true) {
       final String newName = baseName + ++i;
-      if (checkUniqueTypeParameterName(newName, typeParameterList) && (targetClass == null || checkUniqueTypeParameterName(newName, targetClass.getTypeParameterList()))){
+      if (checkUniqueTypeParameterName(newName, typeParameterList) && (targetClass == null || checkUniqueTypeParameterName(newName, targetClass.getTypeParameterList()))) {
         return newName;
       }
     }
@@ -430,10 +430,10 @@ public class GenerateMembersUtil {
 
   private static void substituteReturnType(@NotNull PsiManager manager,
                                            @NotNull PsiMethod method,
-                                           @NotNull PsiType returnType,
+                                           @Nullable PsiType returnType,
                                            @NotNull PsiSubstitutor substitutor) {
     final PsiTypeElement returnTypeElement = method.getReturnTypeElement();
-    if (returnTypeElement == null) {
+    if (returnTypeElement == null || returnType == null) {
       return;
     }
     final PsiType substitutedReturnType = substituteType(substitutor, returnType);