Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VBehavior.java
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,9 @@ private String triggerToText(AcceptActionUsage aau) {
StringBuilder sb = new StringBuilder();

Expression payload = aau.getPayloadArgument();
if (payload != null) {
sb.append(getText(payload));
String payloadText = getText(payload);
if (payloadText != null) {
sb.append(payloadText);
} else {
ReferenceUsage ru = aau.getPayloadParameter();
appendNameAndType(sb, ru, "payload");
Expand All @@ -281,31 +282,31 @@ private String convertToDescription(TransitionUsage tu) {

List<AcceptActionUsage> triggerActions = tu.getTriggerAction();
if (!triggerActions.isEmpty()) {
String triggerString = triggerToText(triggerActions.get(0)).trim();
if (!(triggerString.isEmpty())) {
ls.append(triggerString);
String triggerString = triggerToText(triggerActions.get(0));
if (triggerString != null && !(triggerString.isEmpty())) {
ls.append(triggerString.trim());
ls.append(' ');
}
}

List<Expression> guardExpressions = tu.getGuardExpression();
if (!guardExpressions.isEmpty()) {
String guardString = getText(guardExpressions.get(0)).trim();
if (!guardString.isEmpty()) {
String guardString = getText(guardExpressions.get(0));
if (guardString != null && !guardString.isEmpty()) {
ls.fold();
ls.append('[');
ls.append(guardString);
ls.append(guardString.trim());
ls.append(']');
}
}

List<ActionUsage> effectActions = tu.getEffectAction();
if (!effectActions.isEmpty()) {
String effectString = getText(effectActions.get(0)).trim();
if (!effectString.isEmpty()) {
String effectString = getText(effectActions.get(0));
if (effectString != null && !effectString.isEmpty()) {
ls.fold();
ls.append('/');
ls.append(effectString);
ls.append(effectString.trim());
}
}

Expand Down