Skip to content

Commit d232884

Browse files
committed
* VMixed (process): Do not use the target element itself as a
relationship * VDefault (isEmptySubject, isEmptyObjective): Check if the name is null.
1 parent 93249d2 commit d232884

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VDefault.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,15 @@ protected Relationship findBindingLikeRel(Feature f) {
304304

305305
protected static boolean isEmptySubject(SubjectMembership sm) {
306306
Usage u = sm.getOwnedSubjectParameter();
307-
if (!"subj".equals(u.getName())) return false;
307+
String name = u.getName();
308+
if (name != null && !"subj".equals(u.getName())) return false;
308309
return u.getOwnedRelationship().isEmpty();
309310
}
310311

311312
protected static boolean isEmptyObjective(ObjectiveMembership om) {
312313
Usage u = om.getOwnedObjectiveRequirement();
313-
if (!"obj".equals(u.getName())) return false;
314+
String name = u.getName();
315+
if (name != null && !"obj".equals(u.getName())) return false;
314316
return isEmpty(u);
315317
}
316318

org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VMixed.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected VTree newVTree(Namespace namespace, Membership membership) {
5757

5858
private String process(Visitor v, Element e) {
5959
v.visit(e);
60-
addRel(e, e, null);
60+
addRel(e, null);
6161
v.flush();
6262
return "";
6363
}
@@ -69,19 +69,13 @@ private String process(Visitor v, Element e) {
6969
@Override
7070
public String caseActionDefinition(ActionDefinition ad) {
7171
VAction va = new VAction(this);
72-
va.caseActionDefinition(ad);
73-
addRel(ad, null);
74-
va.flush();
75-
return "";
72+
return process(va, ad);
7673
}
7774

7875
@Override
7976
public String caseActionUsage(ActionUsage au) {
8077
VAction va = new VAction(this);
81-
va.caseActionUsage(au);
82-
addRel(au, null);
83-
va.flush();
84-
return "";
78+
return process(va, au);
8579
}
8680

8781
/***************************************************

0 commit comments

Comments
 (0)