From 0f63a8b8e44788235ff5f62216a7f3ce9c3802b3 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 3 Feb 2012 16:15:33 +0400 Subject: [PATCH] EA-33425 - IOE: JavaDirectoryServiceImpl.checkCreateClassOrInterface --- .../extractSuperclass/JavaExtractSuperBaseDialog.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/JavaExtractSuperBaseDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/JavaExtractSuperBaseDialog.java index 1522e26b11f9..2e9b83218969 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/JavaExtractSuperBaseDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/JavaExtractSuperBaseDialog.java @@ -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() {