Bug 529914 - bug in DetailExpressionProvider
Simple fix that just avoids the NPE but.
Should be improved to still make proposals.
Change-Id: I7bdc140e5517441f88b874ff3613c4bcbbac169b
diff --git a/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DefaultDetailExpressionProvider.xtend b/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DefaultDetailExpressionProvider.xtend
index ecd27bb..b47178b 100644
--- a/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DefaultDetailExpressionProvider.xtend
+++ b/plugins/org.eclipse.etrice.expressions.ui/src/org/eclipse/etrice/expressions/detailcode/DefaultDetailExpressionProvider.xtend
@@ -36,22 +36,24 @@
if(transitionEventData !== null) {
scope += transitionEventData.createExprFeature(ExpressionPostfix.NONE)
}
- scope += actorClass.latestOperations.map[createExprFeature]
- scope += actorClass.allAttributes.map[createExprFeature]
- actorClass.allInterfaceItems.forEach [
- switch it {
- SPP case isEventDriven/* fall through */,
- Port case isEventDriven && isReplicated: {
- scope += createExprFeature(ExpressionPostfix.NONE) // additional feature for broadcast
- scope += createExprFeature(ExpressionPostfix.BRACKETS)
+ if (actorClass!==null) {
+ scope += actorClass.latestOperations.map[createExprFeature]
+ scope += actorClass.allAttributes.map[createExprFeature]
+ actorClass.allInterfaceItems.forEach [
+ switch it {
+ SPP case isEventDriven/* fall through */,
+ Port case isEventDriven && isReplicated: {
+ scope += createExprFeature(ExpressionPostfix.NONE) // additional feature for broadcast
+ scope += createExprFeature(ExpressionPostfix.BRACKETS)
+ }
+ Port case isReplicated/* fall through */,
+ SPP:
+ scope += createExprFeature(ExpressionPostfix.BRACKETS)
+ default:
+ scope += createExprFeature(ExpressionPostfix.NONE)
}
- Port case isReplicated/* fall through */,
- SPP:
- scope += createExprFeature(ExpressionPostfix.BRACKETS)
- default:
- scope += createExprFeature(ExpressionPostfix.NONE)
- }
- ]
+ ]
+ }
return scope.filterNull.filter[id !== null].toList
}
