From d6f45e7eafda8c3404b67824c4f57604be08f51c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Tue, 1 Sep 2009 17:42:28 +0400
Subject: [PATCH] fix NPE when moving class in default package

---
 .../move/moveClassesOrPackages/MoveJavaFileHandler.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 eb6ec8362833..2c422002712b 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
@@ -34,7 +34,8 @@ public class MoveJavaFileHandler extends MoveFileHandler {
 
   public List<UsageInfo> findUsages(PsiFile psiFile, PsiDirectory newParent, boolean searchInComments, boolean searchInNonJavaFiles) {
     final List<UsageInfo> result = new ArrayList<UsageInfo>();
-    final String qualifiedName = JavaDirectoryService.getInstance().getPackage(newParent).getQualifiedName();
+    final PsiPackage newParentPackage = JavaDirectoryService.getInstance().getPackage(newParent);
+    final String qualifiedName = newParentPackage == null ? "" : newParentPackage.getQualifiedName();
     for (PsiClass aClass : ((PsiJavaFile)psiFile).getClasses()) {
       Collections.addAll(result, MoveClassesOrPackagesUtil.findUsages(aClass, searchInComments, searchInNonJavaFiles,
                                                                       StringUtil.getQualifiedName(qualifiedName, aClass.getName())));