From 7e41e9c7add52b61aa0728769fdc4c916c7f0983 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 13 Jun 2012 18:33:07 +0400
Subject: [PATCH] EA-36474 - assert:
 TypeConversionUtil.getSuperClassSubstitutor

---
 .../InlineSuperClassRefactoringProcessor.java               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
index c98e6b8da9d4..453dc14687dd 100644
--- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
@@ -221,7 +221,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori
         super.performRefactoring(pushDownUsages);
         RefactoringUtil.sortDepthFirstRightLeftOrder(usages);
         for (UsageInfo usageInfo : usages) {
-          if (!(usageInfo instanceof ReplaceExtendsListUsageInfo)) {
+          if (!(usageInfo instanceof ReplaceExtendsListUsageInfo || usageInfo instanceof RemoveImportUsageInfo)) {
             try {
               ((FixableUsageInfo)usageInfo).fixUsage();
             }
@@ -234,8 +234,8 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori
 
         //postpone broken hierarchy
         for (UsageInfo usage : usages) {
-          if (usage instanceof ReplaceExtendsListUsageInfo) {
-            ((ReplaceExtendsListUsageInfo)usage).fixUsage();
+          if (usage instanceof ReplaceExtendsListUsageInfo || usage instanceof RemoveImportUsageInfo) {
+            ((FixableUsageInfo)usage).fixUsage();
           }
         }
         try {