MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-78178 - NPE: DirectoryNode.getDirName

Browse Source
This commit is contained in:
Anna Kozlova
2016-01-27 20:02:35 +03:00
parent 29d0ad5325
commit cd98935bbe
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
+10 -4
View File
@@ -148,16 +148,22 @@ public class DirectoryNode extends PackageDependenciesNode {
public String toString() {
if (myFQName != null) return myFQName;
if (myCompactPackages && myCompactedDirNode != null) {
return myDirName + "/" + myCompactedDirNode.getDirName();
if (myCompactPackages) {
final DirectoryNode compactedDirNode = myCompactedDirNode;
if (compactedDirNode != null) {
return myDirName + "/" + compactedDirNode.getDirName();
}
}
return myDirName;
}
public String getDirName() {
if (myVDirectory == null || !myVDirectory.isValid()) return "";
if (myCompactPackages && myCompactedDirNode != null) {
return myVDirectory.getName() + "/" + myCompactedDirNode.getDirName();
if (myCompactPackages) {
final DirectoryNode compactedDirNode = myCompactedDirNode;
if (compactedDirNode != null) {
return myVDirectory.getName() + "/" + compactedDirNode.getDirName();
}
}
return myDirName;
}