summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2013-03-04 08:22:30 (EST)
committer Juergen Haug2013-03-04 08:22:30 (EST)
commit815542673996f3a0423106eff0dcd0217dc22049 (patch)
tree54965b986c0419c12c897cb52ac90fa8f4813b1d
parente1112e3a38570ceafacada8df981895aab48fd05 (diff)
downloadorg.eclipse.etrice-815542673996f3a0423106eff0dcd0217dc22049.zip
org.eclipse.etrice-815542673996f3a0423106eff0dcd0217dc22049.tar.gz
org.eclipse.etrice-815542673996f3a0423106eff0dcd0217dc22049.tar.bz2
[core] fixed NullPointerException caused by fragment providerrefs/changes/19/10819/1
when invoked by outline refresh Change-Id: I30d3a23caf40268b3ffe2cb58b5cc36f0cbc8c09
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
index 024d832..416ba3e 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
@@ -808,31 +808,31 @@ public class RoomFragmentProvider implements IFragmentProvider {
private RoomClass getRoomClass(RoomModel model, String className) {
for (DataClass dc : model.getDataClasses()) {
- if (dc.getName().equals(className))
+ if (dc.getName() != null && dc.getName().equals(className))
return dc;
}
for (ExternalType et : model.getExternalTypes()) {
- if (et.getName().equals(className))
+ if (et.getName() != null && et.getName().equals(className))
return et;
}
for (PrimitiveType pt : model.getPrimitiveTypes()) {
- if (pt.getName().equals(className))
+ if (pt.getName() != null && pt.getName().equals(className))
return pt;
}
for (GeneralProtocolClass pc : model.getProtocolClasses()) {
- if (pc.getName().equals(className))
+ if (pc.getName() != null && pc.getName().equals(className))
return pc;
}
for (ActorClass ac : model.getActorClasses()) {
- if (ac.getName().equals(className))
+ if (ac.getName() != null && ac.getName().equals(className))
return ac;
}
for (SubSystemClass ssc : model.getSubSystemClasses()) {
- if (ssc.getName().equals(className))
+ if (ssc.getName() != null && ssc.getName().equals(className))
return ssc;
}
for (LogicalSystem ls : model.getSystems()) {
- if (ls.getName().equals(className))
+ if (ls.getName() != null && ls.getName().equals(className))
return ls;
}
return null;