pull up: preserve/remove override from pulled method according to super classes structure

java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java

@@ -204,15 +204,15 @@ public class PullUpHelper extends BaseRefactoringProcessor{
     for (MemberInfo info : myMembersToMove) {
       if (info.getMember() instanceof PsiMethod) {
         PsiMethod method = (PsiMethod)info.getMember();
+        PsiMethod methodCopy = (PsiMethod)method.copy();
+        if (method.findDeepestSuperMethods().length == 0) {
+          deleteOverrideAnnotationIfFound(methodCopy);
+        }
         final boolean isOriginalMethodAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT);
         if (myIsTargetInterface || info.isToAbstract()) {
-          PsiMethod methodCopy = (PsiMethod)method.copy();
           ChangeContextUtil.clearContextInfo(method);
           RefactoringUtil.abstractizeMethod(myTargetSuperClass, methodCopy);
           RefactoringUtil.replaceMovedMemberTypeParameters(methodCopy, PsiUtil.typeParametersIterable(mySourceClass), substitutor, elementFactory);
-          if (method.findDeepestSuperMethods().length == 0 || (myTargetSuperClass.isInterface() && !PsiUtil.isLanguageLevel6OrHigher(mySourceClass))) {
-            deleteOverrideAnnotationIfFound(methodCopy);
-          }
 
           myJavaDocPolicy.processCopiedJavaDoc(methodCopy.getDocComment(), method.getDocComment(), isOriginalMethodAbstract);
 
@@ -240,14 +240,14 @@ public class PullUpHelper extends BaseRefactoringProcessor{
           if (isOriginalMethodAbstract) {
             PsiUtil.setModifierProperty(myTargetSuperClass, PsiModifier.ABSTRACT, true);
           }
-          RefactoringUtil.replaceMovedMemberTypeParameters(method, PsiUtil.typeParametersIterable(mySourceClass), substitutor, elementFactory);
-          fixReferencesToStatic(method, movedMembers);
-          final PsiMethod superClassMethod = myTargetSuperClass.findMethodBySignature(method, false);
+          RefactoringUtil.replaceMovedMemberTypeParameters(methodCopy, PsiUtil.typeParametersIterable(mySourceClass), substitutor, elementFactory);
+          fixReferencesToStatic(methodCopy, movedMembers);
+          final PsiMethod superClassMethod = myTargetSuperClass.findMethodBySignature(methodCopy, false);
           if (superClassMethod != null && superClassMethod.hasModifierProperty(PsiModifier.ABSTRACT)) {
-            superClassMethod.replace(method);
+            superClassMethod.replace(methodCopy);
           }
           else {
-            final PsiMember movedElement = (PsiMember)myTargetSuperClass.add(method);
+            final PsiMember movedElement = (PsiMember)myTargetSuperClass.add(methodCopy);
             myMembersAfterMove.add(movedElement);
           }
           method.delete();

java/java-tests/testData/refactoring/pullUp/PreserveOverrideInPulledMethod.java

@@ -0,0 +1,12 @@
+public class Test {
+  abstract class Base extends IntImpl {
+    @Override
+    public abstract String<caret> foo();
+  }
+
+  class IntImpl extends Int {}
+  
+  class Int {
+    public abstract String foo();
+  }
+}

java/java-tests/testData/refactoring/pullUp/PreserveOverrideInPulledMethod_after.java

@@ -0,0 +1,13 @@
+public class Test {
+  abstract class Base extends IntImpl {
+  }
+
+  abstract class IntImpl extends Int {
+      @Override
+      public abstract String foo();
+  }
+  
+  class Int {
+    public abstract String foo();
+  }
+}

java/java-tests/testData/refactoring/pullUp/RemoveOverrideFromPulledMethod.java

@@ -0,0 +1,9 @@
+public class Test {
+  abstract class Base extends Int {
+    @Override
+    public abstract String<caret> foo();
+  }
+
+  class Int {
+  }
+}

java/java-tests/testData/refactoring/pullUp/RemoveOverrideFromPulledMethod_after.java

@@ -0,0 +1,8 @@
+public class Test {
+  abstract class Base extends Int {
+  }
+
+  abstract class Int {
+      public abstract String foo();
+  }
+}

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

@@ -105,6 +105,14 @@ public class PullUpTest extends LightCodeInsightTestCase {
     doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
   }
 
+  public void testRemoveOverrideFromPulledMethod() throws Exception {
+    doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
+  }
+
+  public void testPreserveOverrideInPulledMethod() throws Exception {
+    doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
+  }
+
   private void doTest(RefactoringTestUtil.MemberDescriptor... membersToFind) throws Exception {
     doTest(true, membersToFind);
   }