From b8c85818d726ffaadf9c296c96d1d7452e37c055 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 4 Oct 2010 13:16:29 +0400 Subject: [PATCH] EA-22257 - IOE: PsiElementFactoryImpl.createPackageStatement --- .../moveClassesOrPackages/MoveJavaFileHandler.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java index ec5a3c00fcfa..557ccd16e0f9 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java @@ -88,12 +88,18 @@ public class MoveJavaFileHandler extends MoveFileHandler { if (containingDirectory != null) { final PsiPackage aPackage = JavaDirectoryService.getInstance().getPackage(containingDirectory); if (aPackage != null) { - final PsiPackageStatement packageStatement = - JavaPsiFacade.getElementFactory(file.getProject()).createPackageStatement(aPackage.getQualifiedName()); + final String qualifiedName = aPackage.getQualifiedName(); + final PsiPackageStatement packageStatement = qualifiedName.length() > 0 + ? JavaPsiFacade.getElementFactory(file.getProject()).createPackageStatement(qualifiedName) + : null; if (file instanceof PsiJavaFile) { final PsiPackageStatement filePackageStatement = ((PsiJavaFile)file).getPackageStatement(); if (filePackageStatement != null) { - filePackageStatement.getPackageReference().replace(packageStatement.getPackageReference()); + if (packageStatement != null) { + filePackageStatement.getPackageReference().replace(packageStatement.getPackageReference()); + } else { + filePackageStatement.delete(); + } } } }