Skip to content

Commit 83f67d9

Browse files
committed
Fix two common model parsing problems
- empty guards - Cameo MCSE export problem unset signal
1 parent 23441d3 commit 83f67d9

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>net.ziegelmeier</groupId>
44
<artifactId>net.ziegelmeier.statemachinegenerator</artifactId>
5-
<version>1.8.0</version>
5+
<version>1.8.1</version>
66
<description>Dirk Ziegelmeiers Statemachine Generator</description>
77
<build>
88
<sourceDirectory>src</sourceDirectory>

generator/src/generator/XmiModel.egl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ operation StateMachine getModel() : Tuple {
88
if (stereotype != "") {
99
result.generate = false;
1010

11-
// Cameo "Applied stereotype"
11+
// Cameo "Applied stereotype"
1212
for (rels in self.getTargetDirectedRelationships()) {
1313
for (rel in rels.getRelatedElements()) {
1414
if (rel.name == stereotype) {
@@ -110,10 +110,12 @@ operation Transition getModel(sm : Tuple, state : Tuple) : Tuple {
110110
// Trigger
111111
if (self.trigger.isDefined() and (self.trigger != null) and (self.trigger.first != null)) {
112112
var trigger = self.trigger.first.event;
113-
if (trigger.isKindOf(SignalEvent) and (trigger.signal != null)) {
114-
result.trigger = trigger.signal.name;
115-
} else {
116-
result.trigger = trigger.name;
113+
if (trigger != null) {
114+
if (trigger.isKindOf(SignalEvent) and (trigger.signal != null)) {
115+
result.trigger = trigger.signal.name;
116+
} else {
117+
result.trigger = trigger.name;
118+
}
117119
}
118120
}
119121

@@ -130,7 +132,7 @@ operation Transition getModel(sm : Tuple, state : Tuple) : Tuple {
130132
} else {
131133
guard = self.guard.name;
132134
}
133-
if (guard != "else") {
135+
if ((guard != "") and (guard != "else")) {
134136
result.guards.add(guard.trim());
135137
}
136138
}

0 commit comments

Comments
 (0)