collapse hierarchy: do not push down supersuper twice

java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceExtendsListUsageInfo.java

@@ -21,22 +21,22 @@
 package com.intellij.refactoring.inlineSuperClass.usageInfo;
 
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiJavaCodeReferenceElement;
-import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteExtendsClassUsageInfo;
 import com.intellij.refactoring.util.FixableUsageInfo;
 import com.intellij.util.IncorrectOperationException;
 
 public class ReplaceExtendsListUsageInfo extends FixableUsageInfo {
-  private final SafeDeleteExtendsClassUsageInfo mySafeDeleteUsageInfo;
 
   public ReplaceExtendsListUsageInfo(PsiJavaCodeReferenceElement element, final PsiClass superClass, final PsiClass targetClass) {
     super(element);
-    mySafeDeleteUsageInfo = new SafeDeleteExtendsClassUsageInfo(element, superClass, targetClass);
+
   }
 
   public void fixUsage() throws IncorrectOperationException {
-    if (mySafeDeleteUsageInfo.isSafeDelete()) {
-      mySafeDeleteUsageInfo.deleteElement();
+    final PsiElement element = getElement();
+    if (element != null) {
+      element.delete();
     }
   }
 }

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/after/ISuper.java

@@ -0,0 +1 @@
+interface ISuper {}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/after/Test.java

@@ -0,0 +1 @@
+class Test implements ISuper {}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/after/Test1.java

@@ -0,0 +1,2 @@
+class Test1 implements ISuper {
+}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/before/ISuper.java

@@ -0,0 +1 @@
+interface ISuper {}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/before/Super.java

@@ -0,0 +1 @@
+public interface Super extends ISuper{}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/before/Test.java

@@ -0,0 +1 @@
+class Test implements Super {}

java/java-tests/testData/refactoring/inlineSuperClass/multipleSubclassesInheritsOneBaseBase/before/Test1.java

@@ -0,0 +1,2 @@
+class Test1 implements Super{
+}

java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java

@@ -168,6 +168,10 @@ public class InlineSuperClassTest extends MultiFileTestCase {
     doTestMultipleSubclasses();
   }
 
+  public void testMultipleSubclassesInheritsOneBaseBase() throws Exception {
+    doTestMultipleSubclasses();
+  }
+
   private void doTestMultipleSubclasses() throws Exception {
     doTest(new PerformAction() {
       public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception {