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

Fixed NPE in Mappings.integrate.

Browse Source
This commit is contained in:
Dmitry Boulytchev
2011-10-23 14:34:26 +04:00
parent ce11d1f1ee
commit 5c334b7753
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+8 -6
View File
@@ -925,7 +925,7 @@ public class Mappings implements RW.Writable {
for (StringCache.S file : removed) {
final Set<ClassRepr> classes = (Set<ClassRepr>)sourceFileToClasses.foxyGet(file);
final UsageRepr.Cluster cluster = sourceFileToUsages.get(file);
final Set<UsageRepr.Usage> usages = cluster.getUsages();
final Set<UsageRepr.Usage> usages = cluster == null ? null : cluster.getUsages();
if (classes != null) {
for (ClassRepr cr : classes) {
@@ -937,12 +937,14 @@ public class Mappings implements RW.Writable {
classToSubclasses.removeFrom(superSomething, cr.name);
}
for (UsageRepr.Usage u : usages) {
if (u instanceof UsageRepr.ClassUsage) {
final Set<StringCache.S> residents = cluster.getResidence(u);
if (usages != null) {
for (UsageRepr.Usage u : usages) {
if (u instanceof UsageRepr.ClassUsage) {
final Set<StringCache.S> residents = cluster.getResidence(u);
if (residents != null && residents.contains(cr.name)) {
classToClassDependency.removeFrom (((UsageRepr.ClassUsage)u).className, cr.name);
if (residents != null && residents.contains(cr.name)) {
classToClassDependency.removeFrom(((UsageRepr.ClassUsage)u).className, cr.name);
}
}
}
}