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

EA-33425 - IOE: JavaDirectoryServiceImpl.checkCreateClassOrInterface

Browse Source
This commit is contained in:
Anna Kozlova
2012-02-03 16:40:29 +04:00
parent 8d87a73c8e
commit 0f63a8b8e4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractSuperclass/JavaExtractSuperBaseDialog.java
+7 -2
View File
@@ -123,7 +123,12 @@ public abstract class JavaExtractSuperBaseDialog extends ExtractSuperBaseDialog<
@Override
protected void preparePackage() throws OperationFailedException {
final PsiPackage aPackage = JavaPsiFacade.getInstance(myProject).findPackage(getTargetPackageName());
final String targetPackageName = getTargetPackageName();
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
if (!psiFacade.getNameHelper().isIdentifier(targetPackageName)) {
throw new OperationFailedException("Invalid package name: " + targetPackageName);
}
final PsiPackage aPackage = psiFacade.findPackage(targetPackageName);
if (aPackage != null) {
final PsiDirectory[] directories = aPackage.getDirectories(mySourceClass.getResolveScope());
if (directories.length >= 1) {
@@ -132,7 +137,7 @@ public abstract class JavaExtractSuperBaseDialog extends ExtractSuperBaseDialog<
}
final MoveDestination moveDestination =
myDestinationFolderComboBox.selectDirectory(new PackageWrapper(PsiManager.getInstance(myProject), getTargetPackageName()), false);
myDestinationFolderComboBox.selectDirectory(new PackageWrapper(PsiManager.getInstance(myProject), targetPackageName), false);
if (moveDestination == null) return;
myTargetDirectory = myTargetDirectory != null ? ApplicationManager.getApplication().runWriteAction(new Computable<PsiDirectory>() {