push down from interface to abstract class fixed (IDEA-82286)

java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java

@@ -356,11 +356,14 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
       }
       else if (member instanceof PsiMethod) {
         PsiMethod method = (PsiMethod)member;
-
         final PsiMethod methodBySignature = targetClass.findMethodBySignature(method, false);
         if (methodBySignature == null) {
+          final boolean wasInterface = myClass.isInterface();
           newMember = (PsiMethod)targetClass.add(method);
-          if (memberInfo.isToAbstract()) {
+          if (wasInterface) {
+            PsiUtil.setModifierProperty(newMember, PsiModifier.ABSTRACT, true);
+            PsiUtil.setModifierProperty(newMember, PsiModifier.PUBLIC, true);
+          } else if (memberInfo.isToAbstract()) {
             if (newMember.hasModifierProperty(PsiModifier.PRIVATE)) {
               PsiUtil.setModifierProperty(newMember, PsiModifier.PROTECTED, true);
             }

java/java-tests/testData/refactoring/pushDown/MethodFromInterfaceToAbstractClass.java

@@ -0,0 +1,7 @@
+abstract class StraightLine implements Inline {
+}
+
+interface Inline {
+
+  void g<caret>o(); // inline this method
+}

java/java-tests/testData/refactoring/pushDown/MethodFromInterfaceToAbstractClass.java.after

@@ -0,0 +1,7 @@
+abstract class StraightLine implements Inline {
+    public abstract void go(); // inline this method
+}
+
+interface Inline {
+
+}

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

@@ -111,6 +111,10 @@ public class PushDownTest extends LightRefactoringTestCase {
     doTest();
   }
 
+  public void testMethodFromInterfaceToAbstractClass() throws Exception {
+    doTest();
+  }
+
   public void testSameClassInterface() throws Exception {
     final String filePath = "/refactoring/pushDown/" + getTestName(false) + ".java";
     configureByFile(filePath);