push down: preserve @Override if keep abstract was selected (IDEA-155600)
authorAnna.Kozlova <anna.kozlova@jetbrains.com>
Wed, 4 May 2016 18:10:50 +0000 (20:10 +0200)
committerAnna.Kozlova <anna.kozlova@jetbrains.com>
Wed, 4 May 2016 18:18:45 +0000 (20:18 +0200)
commitc9f72daaff0e26bdfc7e740322b5e7edc756a1bb
tree64cfb764f4911ce3c480b8c59f23d93529e68dba
parent1a70d8bcbd858b032639dd2206f01f8eb1cfe678
push down: preserve @Override if keep abstract was selected (IDEA-155600)
java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
java/java-tests/testData/refactoring/pushDown/PreserveOverrideAnnotationAfterConflict.java [new file with mode: 0644]
java/java-tests/testData/refactoring/pushDown/PreserveOverrideAnnotationAfterConflict_after.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java