MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

extract superclass: pass target class in after data

Browse Source
This commit is contained in:
Anna Kozlova
2014-05-12 11:42:21 +04:00
parent 838771a47c
commit 26baf8f596
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
+2 -2
View File
@@ -142,8 +142,8 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen
DocCommentPolicy javaDocPolicy) throws IncorrectOperationException {
aClass.getProject().getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringStarted(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createBeforeData(aClass, selectedMembers));
final PsiClass anInterface = JavaDirectoryService.getInstance().createInterface(targetDir, interfaceName);
try {
PsiClass anInterface = JavaDirectoryService.getInstance().createInterface(targetDir, interfaceName);
PsiJavaCodeReferenceElement ref = ExtractSuperClassUtil.createExtendingReference(anInterface, aClass, selectedMembers);
final PsiReferenceList referenceList = aClass.isInterface() ? aClass.getExtendsList() : aClass.getImplementsList();
assert referenceList != null;
@@ -154,7 +154,7 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen
}
finally {
aClass.getProject().getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringDone(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createAfterData(aClass));
.refactoringDone(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createAfterData(anInterface));
}
}
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
+2 -2
View File
@@ -70,8 +70,8 @@ public class ExtractSuperClassUtil {
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringStarted(REFACTORING_EXTRACT_SUPER_ID, createBeforeData(subclass, selectedMemberInfos));
final PsiClass superclass = JavaDirectoryService.getInstance().createClass(targetDirectory, superclassName);
try {
PsiClass superclass = JavaDirectoryService.getInstance().createClass(targetDirectory, superclassName);
final PsiModifierList superClassModifierList = superclass.getModifierList();
assert superClassModifierList != null;
superClassModifierList.setModifierProperty(PsiModifier.FINAL, false);
@@ -115,7 +115,7 @@ public class ExtractSuperClassUtil {
return superclass;
}
finally {
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC).refactoringDone(REFACTORING_EXTRACT_SUPER_ID, createAfterData(subclass));
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC).refactoringDone(REFACTORING_EXTRACT_SUPER_ID, createAfterData(superclass));
}
}