MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

move inner to upper level: warn about existing class on the desired place

Browse Source
This commit is contained in:
anna
2011-09-08 13:09:09 +02:00
parent 076126822f
commit 3ce19cfe19
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
View File

@@ -178,7 +178,14 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
final MoveInnerOptions moveInnerOptions = new MoveInnerOptions(myInnerClass, myOuterClass, myTargetContainer, myNewClassName);
final MoveInnerHandler handler = MoveInnerHandler.EP_NAME.forLanguage(myInnerClass.getLanguage());
final PsiClass newClass = handler.copyClass(moveInnerOptions);
final PsiClass newClass;
try {
newClass = handler.copyClass(moveInnerOptions);
}
catch (IncorrectOperationException e) {
RefactoringUIUtil.processIncorrectOperation(myProject, e);
return;
}
// replace references in a new class to old inner class with references to itself
for (PsiReference ref : ReferencesSearch.search(myInnerClass, new LocalSearchScope(newClass), true)) {