Skip to content

Commit 3f310b6

Browse files
committed
Support the shorthand notation for AssertConstraintUsage as well.
1 parent 9ef400e commit 3f310b6

3 files changed

Lines changed: 52 additions & 28 deletions

File tree

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

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.omg.sysml.lang.sysml.AllocationUsage;
3838
import org.omg.sysml.lang.sysml.AnalysisCaseDefinition;
3939
import org.omg.sysml.lang.sysml.AnalysisCaseUsage;
40+
import org.omg.sysml.lang.sysml.AssertConstraintUsage;
4041
import org.omg.sysml.lang.sysml.Behavior;
4142
import org.omg.sysml.lang.sysml.BindingConnector;
4243
import org.omg.sysml.lang.sysml.Class;
@@ -507,6 +508,11 @@ public String caseSatisfyRequirementUsage(SatisfyRequirementUsage satisfyRequire
507508
return " --> ";
508509
}
509510

511+
@Override
512+
public String caseAssertConstraintUsage(AssertConstraintUsage acu) {
513+
return " --> ";
514+
}
515+
510516
@Override
511517
public String casePerformActionUsage(PerformActionUsage pau) {
512518
return " --> ";
@@ -536,6 +542,36 @@ public String caseClass(Class object) {
536542
return null;
537543
}
538544

545+
@Override
546+
public String caseAcceptActionUsage(AcceptActionUsage aau) {
547+
return " accept action>> ";
548+
}
549+
550+
@Override
551+
public String caseSendActionUsage(SendActionUsage sau) {
552+
return " send action>> ";
553+
}
554+
555+
@Override
556+
public String caseAnalysisCaseUsage(AnalysisCaseUsage acu) {
557+
return " analysis>> ";
558+
}
559+
560+
@Override
561+
public String caseAnalysisCaseDefinition(AnalysisCaseDefinition acd) {
562+
return " analysis def>> ";
563+
}
564+
565+
@Override
566+
public String caseVerificationCaseUsage(VerificationCaseUsage acu) {
567+
return " verification>> ";
568+
}
569+
570+
@Override
571+
public String caseVerificationCaseDefinition(VerificationCaseDefinition acd) {
572+
return " verification def>> ";
573+
}
574+
539575
@Override
540576
public String caseExhibitStateUsage(ExhibitStateUsage esu) {
541577
if (Visitor.getSpecialReference(esu) != null) {
@@ -573,34 +609,13 @@ public String casePerformActionUsage(PerformActionUsage pau) {
573609
}
574610

575611
@Override
576-
public String caseAcceptActionUsage(AcceptActionUsage aau) {
577-
return " accept action>> ";
578-
}
579-
580-
@Override
581-
public String caseSendActionUsage(SendActionUsage sau) {
582-
return " send action>> ";
583-
}
584-
585-
@Override
586-
public String caseAnalysisCaseUsage(AnalysisCaseUsage acu) {
587-
return " analysis>> ";
588-
}
589-
590-
@Override
591-
public String caseAnalysisCaseDefinition(AnalysisCaseDefinition acd) {
592-
return " analysis def>> ";
593-
}
594-
595-
@Override
596-
public String caseVerificationCaseUsage(VerificationCaseUsage acu) {
597-
return " verification>> ";
598-
}
599-
600-
@Override
601-
public String caseVerificationCaseDefinition(VerificationCaseDefinition acd) {
602-
return " verification def>> ";
603-
}
612+
public String caseAssertConstraintUsage(AssertConstraintUsage acu) {
613+
if (Visitor.getSpecialReference(acu) != null) {
614+
return " assert>> ";
615+
} else {
616+
return " assert constraint>> ";
617+
}
618+
}
604619

605620
@Override
606621
public String caseEventOccurrenceUsage(EventOccurrenceUsage eou) {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import org.omg.sysml.lang.sysml.AnnotatingElement;
3232
import org.omg.sysml.lang.sysml.Annotation;
33+
import org.omg.sysml.lang.sysml.AssertConstraintUsage;
3334
import org.omg.sysml.lang.sysml.AssignmentActionUsage;
3435
import org.omg.sysml.lang.sysml.BindingConnector;
3536
import org.omg.sysml.lang.sysml.BindingConnectorAsUsage;
@@ -391,6 +392,12 @@ public String caseIncludeUseCaseUsage(IncludeUseCaseUsage iuc) {
391392
return null;
392393
}
393394

395+
@Override
396+
public String caseAssertConstraintUsage(AssertConstraintUsage acu) {
397+
if (addShorthandRelation(acu, "<<assert>>")) return "";
398+
return null;
399+
}
400+
394401
@Override
395402
public String caseImport(Import imp) {
396403
VImport v = new VImport(this);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.Set;
3434

3535
import org.eclipse.emf.ecore.EObject;
36+
import org.omg.sysml.lang.sysml.AssertConstraintUsage;
3637
import org.omg.sysml.lang.sysml.Element;
3738
import org.omg.sysml.lang.sysml.EventOccurrenceUsage;
3839
import org.omg.sysml.lang.sysml.ExhibitStateUsage;
@@ -348,6 +349,7 @@ public static Feature getSpecialReference(Element e) {
348349
|| e instanceof ExhibitStateUsage
349350
|| e instanceof EventOccurrenceUsage
350351
|| e instanceof IncludeUseCaseUsage
352+
|| e instanceof AssertConstraintUsage
351353
|| e instanceof SatisfyRequirementUsage)) return null;
352354
Feature f = (Feature) e;
353355
if (f.getDeclaredName() != null) return null;

0 commit comments

Comments
 (0)