IDEA-89380 NullPointerException in Project tree view with Flatten Packages set

This commit is contained in:
Konstantin Bulenkov
2012-08-02 22:35:35 +02:00
parent 9aa2e7b8da
commit 9cb507a74d
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -162,7 +162,7 @@ public class PackageUtil {
boolean isFQNameShown) {
final String name;
if (isFQNameShown) {
name = settings.isAbbreviatePackageNames() ? TreeViewUtil.calcAbbreviatedPackageFQName(aPackage) : aPackage.getQualifiedName();
name = settings.isAbbreviatePackageNames() ? TreeViewUtil.calcAbbreviatedPackageFQName(aPackage) : aPackage == null ? defaultShortName : aPackage.getQualifiedName();
}
else if (parentPackageInTree != null || (aPackage != null && aPackage.getParentPackage() != null)) {
PsiPackage parentPackage = aPackage.getParentPackage();