fix NPE when moving class in default package

This commit is contained in:
Dmitry Jemerov
2009-09-01 17:42:28 +04:00
parent 6a7c3b4a03
commit d6f45e7eaf
@@ -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())));