ST6RI-799 Marked more semantic constraint related code with comments

TheKorpos · TheKorpos · commit 93f269075ce7 · 2024-11-19T17:12:07.000+01:00
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java
@@ -86,6 +86,7 @@ protected String getSubactionType() {
 		//checkMergeNodeSpecialization
 		return isActionOwnedComposite()? "subaction": 
 			//checkActionUsageOwnedActionSpecialization
+			//checkStateUsageOwnedStateSpecialization
 			   isPartOwnedComposite()? "ownedAction":
 			   null;	
 	}
@@ -124,6 +125,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 	}
 	
 	protected static String getRedefinedFeature(Feature target) {
+		//checkTransitionUsageTransitionFeatureSpecialization
 		FeatureMembership membership = target.getOwningFeatureMembership();
 		String kind = 
 				membership instanceof StateSubactionMembership?
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java
@@ -38,6 +38,7 @@ public AssertConstraintUsage getTarget() {
 	
 	@Override
 	protected String getDefaultSupertype() {
+		//checkAssertConstraintUsageSpecialization
 		return getTarget().isNegated()?
 				getDefaultSupertype("negated"):
 				getDefaultSupertype("base");						
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java
@@ -41,6 +41,8 @@ public CalculationUsage getTarget() {
 	
 	@Override
 	protected String getSubactionType() {
+		//checkCalculationUsageSpecialization
+		//checkCalculationUsageSubcalculationSpecialization
 		return isSubcalculation()? "subcalculation": super.getSubactionType();	
 	}		
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java
@@ -50,6 +50,7 @@ protected String getDefaultSupertype() {
 	@Override
 	public void addRequirementConstraintSubsetting() {
 		if (UsageUtil.isFramedConcern(getTarget())) {
+			//checkConcernUsageFramedConcernSpecialization
 			addSubsetting(getDefaultSupertype("concern"));
 		} else {
 			super.addRequirementConstraintSubsetting();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java
@@ -46,9 +46,11 @@ public ConstraintUsage getTarget() {
 	
 	@Override
 	public void computeImplicitGeneralTypes() {
+		//checkConstraintUsageRequirementConstraintSpecialization
 		addRequirementConstraintSubsetting();
 		super.computeImplicitGeneralTypes();
 		if (isCheckedConstraint()) {
+			//checkConstraintUsageCheckedConstraintSpecialization
 			addDefaultGeneralType("checkedConstraint");
 		}
 		if (isStructureOwnedComposite()) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java
@@ -40,6 +40,7 @@ public PortUsage getTarget() {
 	@Override
 	protected String getDefaultSupertype() {
 		return isOwnedPort()?
+					//checkPortUsageOwnedPortSpecialization
 					getDefaultSupertype("ownedPort"):
 			   isSubport()?
 					//checkPortUsageSubportSpecialization
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ReferenceUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ReferenceUsageAdapter.java
@@ -53,6 +53,7 @@ public void addDefaultGeneralType() {
 		ReferenceUsage target = getTarget();
 		Type type = target.getOwningType();
 		if (type instanceof TransitionUsage) {
+			//checkTransitionUsagePayloadSpecialization
 			if (target == UsageUtil.getPayloadParameterOf((TransitionUsage)type)) {
 				Feature accepterParameter = UsageUtil.getAccepterPayloadParameterOf((TransitionUsage)type);
 				if (accepterParameter != null) {
@@ -87,6 +88,7 @@ protected void addRedefinitions(Element skip) {
 		ReferenceUsage target = getTarget();
 		Type type = target.getOwningType();
 		if ((type instanceof TransitionUsage) && target == UsageUtil.getTransitionLinkFeatureOf((TransitionUsage)type)) {
+			//checkTransitionUsageSuccessionBindingConnector
 			addImplicitGeneralType(SysMLPackage.eINSTANCE.getRedefinition(), 
 					(Feature)SysMLLibraryUtil.getLibraryType(getTarget(), TRANSITION_LINK_FEATURE));
 		} else {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RequirementUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/RequirementUsageAdapter.java
@@ -55,13 +55,16 @@ public boolean hasRelevantSubjectParameter() {
 	@Override
 	protected String getDefaultSupertype() {
 		return UsageUtil.isSubrequirement(getTarget())? 
+					//checkRequirementUsageSubrequirementSpecialization
 				getDefaultSupertype("subrequirement"):
+					//checkRequirementUsageSpecialization
 				getDefaultSupertype("base");
 	}
 	
 	@Override
 	public void addRequirementConstraintSubsetting() {
 		if (UsageUtil.isVerifiedRequirement(getTarget())) {
+			//checkRequirementUsageRequirementVerificationSpecialization
 			addDefaultGeneralType("verification");
 		} else {
 			super.addRequirementConstraintSubsetting();
@@ -72,7 +75,8 @@ public void addRequirementConstraintSubsetting() {
 	
 	@Override
 	protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
-		return UsageUtil.isObjective(getTarget())? 
+		return UsageUtil.isObjective(getTarget())?
+				//checkRequirementUsageObjectiveRedefinition
 				Collections.singletonList(UsageUtil.getObjectiveRequirementOf(type)):
 			    super.getRelevantFeatures(type, skip);
 	}
@@ -81,6 +85,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 	
 	@Override
 	public void addAdditionalMembers() {
+		//checkSatisfyRequirementUsageBindingConnector
 		UsageUtil.addSubjectParameterTo(getTarget());
 		super.addAdditionalMembers();
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StateUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/StateUsageAdapter.java
@@ -36,7 +36,9 @@ public StateUsage getTarget() {
 
 	@Override
 	protected String getSubactionType() {
+		//checkStateUsageExclusiveStateSpecialization
 		return isExclusiveState()? "exclusiveState":
+			//checkStateUsageSubstateSpecialization
 			   isSubstate()? "substate": 
 			   super.getSubactionType();	
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java
@@ -52,8 +52,11 @@ public TransitionUsage getTarget() {
 	
 	@Override
 	protected String getDefaultSupertype() {
+					//checkTransitionUsageStateSpecialization
 		return isStateTransition()? getDefaultSupertype("stateTransition"):
+					//checkTransitionUsageActionSpecialization
 			   isActionTransition()? getDefaultSupertype("actionTransition"):
+				   //checkTransitionUsageSpecialization
 			   getDefaultSupertype("base");
 	}
 	
@@ -106,8 +109,10 @@ protected Feature computeTransitionLinkConnectors() {
 	@Override
 	public void addAdditionalMembers() {
 		// Note: Needs to come before computeTransitionLinkConnectors.
+		//checkTransitionUsageSuccessionSourceSpecialization
 		computeSource();
 		// Note: Needs to come before clearing and recomputation of inheritance cache.
+		//checkTransitionUsageSuccessionBindingConnector
 		computeTransitionLinkConnectors();		
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java
@@ -67,6 +67,7 @@ public void addReceiverBinding() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkTransitionUsageSourceBindingConnector
 		addReceiverBinding();
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java b/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java
@@ -175,8 +175,11 @@ protected ImplicitGeneralizationMap() {
 		put(ActionUsageImpl.class, "do", "States::StateAction::doAction");
 		//checkActionUsageStateActionRedefinition
 		put(ActionUsageImpl.class, "exit", "States::StateAction::exitAction");
+		//checkTransitionUsageTransitionFeatureSpecialization
 		put(ActionUsageImpl.class, "trigger", "Actions::TransitionAction::accepter");
+		//checkTransitionUsageTransitionFeatureSpecialization
 		put(ActionUsageImpl.class, "guard", "Actions::TransitionAction::guard");
+		//checkTransitionUsageTransitionFeatureSpecialization
 		put(ActionUsageImpl.class, "effect", "Actions::TransitionAction::effect");
 		
 		//checkAllocationDefinitionSpecialization
@@ -192,7 +195,9 @@ protected ImplicitGeneralizationMap() {
 		put(AnalysisCaseUsageImpl.class, "base", "AnalysisCases::analysisCases");
 		put(AnalysisCaseUsageImpl.class, "subAnalysisCase", "AnalysisCases::AnalysisCase::subAnalysisCases");
 		
+		//checkAssertConstraintUsageSpecialization
 		put(AssertConstraintUsageImpl.class, "base", "Constraints::assertedConstraintChecks");
+		//checkAssertConstraintUsageSpecialization
 		put(AssertConstraintUsageImpl.class, "negated", "Constraints::negatedConstraintChecks");
 		
 		//checkAssignmentActionUsageSpecialization
@@ -209,16 +214,21 @@ protected ImplicitGeneralizationMap() {
 		put(BindingConnectorAsUsageImpl.class, "base", "Links::links");
 		put(BindingConnectorAsUsageImpl.class, "binary", "Links::selfLinks");
 		
+		//checkCalculationDefinitionSpecialization
 		put(CalculationDefinitionImpl.class, "base", "Calculations::Calculation");
+		//checkCalculationUsageSpecialization
 		put(CalculationUsageImpl.class, "base", "Calculations::calculations");
 		put(CalculationUsageImpl.class, "subcalculation", "Calculations::Calculation::subcalculations");
 		
 		put(CaseDefinitionImpl.class, "base", "Cases::Case");
 		put(CaseUsageImpl.class, "base", "Cases::cases");
 		put(CaseUsageImpl.class, "subcase", "Cases::Case::subcases");
 		
+		//checkConcernDefinitionSpecialization
 		put(ConcernDefinitionImpl.class, "base", "Requirements::ConcernCheck");
+		//checkConcernUsageSpecialization
 		put(ConcernUsageImpl.class, "base", "Requirements::concernChecks");
+		//checkConcernUsageFramedConcernSpecialization
 		put(ConcernUsageImpl.class, "concern", "Requirements::RequirementCheck::concerns");
 		
 		//checkConnectionDefinitionSpecializations
@@ -230,21 +240,27 @@ protected ImplicitGeneralizationMap() {
 		//checkConnectionUsageBinarySpecialization
 		put(ConnectionUsageImpl.class, "binary", "Connections::binaryConnections");
 		
+		//checkConstraintDefinitionSpecialization
 		put(ConstraintDefinitionImpl.class, "base", "Constraints::ConstraintCheck");
+		//checkConstraintUsageSpecialization
 		put(ConstraintUsageImpl.class, "base", "Constraints::constraintChecks");
+		//checkConstraintUsageCheckedConstraintSpecialization
 		put(ConstraintUsageImpl.class, "checkedConstraint", "Items::Item::checkedConstraints");
 		put(ConstraintUsageImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
 		put(ConstraintUsageImpl.class, "subperformance", "Performances::Performance::subperformances");
 		put(ConstraintUsageImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
+		//checkConstraintUsageRequirementConstraintSpecialization
 		put(ConstraintUsageImpl.class, "assumption", "Requirements::RequirementCheck::assumptions");
+		//checkConstraintUsageRequirementConstraintSpecialization
 		put(ConstraintUsageImpl.class, "requirement", "Requirements::RequirementCheck::constraints");
 		
 		//checkDecisionNodeSpecialization
 		put(DecisionNodeImpl.class, "subaction", "Actions::Action::decisions");
 		
 		//checkEventOccurrenceUsageSpecialization
 		put(EventOccurrenceUsageImpl.class, "suboccurrence", "Occurrences::Occurrence::timeEnclosedOccurrences");
-
+		
+		//checkStateUsageSpecialization
 		put(ExhibitStateUsageImpl.class, "performedAction", "Parts::Part::exhibitedStates");
 		
 		//checkFlowConnectionDefinitionSpecialization
@@ -335,7 +351,7 @@ protected ImplicitGeneralizationMap() {
 		put(PortDefinitionImpl.class, "base", "Ports::Port");
 		//checkPortUsageSpecialization
 		put(PortUsageImpl.class, "base", "Ports::ports");
-		//TODO: find semantic constraint
+		//checkPortUsageOwnedPortSpecialization
 		put(PortUsageImpl.class, "ownedPort", "Parts::Part::ownedPort");
 		//checkPortUsageSubportSpecialization
 		put(PortUsageImpl.class, "subport", "Ports::Port::subports");
@@ -346,8 +362,11 @@ protected ImplicitGeneralizationMap() {
 		put(RenderingUsageImpl.class, "viewRendering", "Views::View::viewRendering");
 		
 		put(RequirementDefinitionImpl.class, "base", "Requirements::RequirementCheck");
+		//checkRequirementUsageSpecialization
 		put(RequirementUsageImpl.class, "base", "Requirements::requirementChecks");
+		//checkRequirementUsageSubrequirementSpecialization
 		put(RequirementUsageImpl.class, "subrequirement", "Requirements::RequirementCheck::subrequirements");
+		//checkRequirementUsageRequirementVerificationSpecialization
 		put(RequirementUsageImpl.class, "verification", "Verifications::VerificationCase::obj::requirementVerifications");
 		
 		put(SatisfyRequirementUsageImpl.class, "base", "Requirements::satisfiedRequirementChecks");
@@ -356,10 +375,15 @@ protected ImplicitGeneralizationMap() {
 		put(SendActionUsageImpl.class, "base", "Actions::sendActions");
 		put(SendActionUsageImpl.class, "subaction", "Actions::Action::sendSubactions");
 		
+		//checkStateDefinitionSpecialization
 		put(StateDefinitionImpl.class, "base", "States::StateAction");
+		//checkStateUsageSpecialization
 		put(StateUsageImpl.class, "base", "States::stateActions");
+		//checkStateUsageSubstateSpecialization
 		put(StateUsageImpl.class, "substate", "States::StateAction::substates");
+		//checkStateUsageExclusiveStateSpecialization
 		put(StateUsageImpl.class, "exclusiveState", "States::StateAction::exclusiveStates");
+		//checkStateUsageOwnedStateSpecialization
 		put(StateUsageImpl.class, "ownedAction", "Parts::Part::ownedStates");
 		
 		put(SuccessionAsUsageImpl.class, "base", "Links::links");
@@ -369,9 +393,12 @@ protected ImplicitGeneralizationMap() {
 		put(SuccessionFlowConnectionUsageImpl.class, "base", "Connections::successionFlowConnections");
 		//TODO: find semantic constraint
 		put(SuccessionFlowConnectionUsageImpl.class, "message", "Connections::successionFlowConnections");
-
+		
+		//checkTransitionUsageSpecialization
 		put(TransitionUsageImpl.class, "base", "Actions::transitionActions");
+		//checkTransitionUsageActionSpecialization
 		put(TransitionUsageImpl.class, "actionTransition", "Actions::Action::decisionTransitions");
+		//checkTransitionUsageStateSpecialization
 		put(TransitionUsageImpl.class, "stateTransition", "States::StateAction::stateTransitions");
 		
 		//checkTriggerInvocationExpressionSpecialization

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ protected String getSubactionType() {`
`86`	`86`	`//checkMergeNodeSpecialization`
`87`	`87`	`return isActionOwnedComposite()? "subaction":`
`88`	`88`	`//checkActionUsageOwnedActionSpecialization`
	`89`	`+ //checkStateUsageOwnedStateSpecialization`
`89`	`90`	`isPartOwnedComposite()? "ownedAction":`
`90`	`91`	`null;`
`91`	`92`	`}`
`@@ -124,6 +125,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {`
`124`	`125`	`}`
`125`	`126`
`126`	`127`	`protected static String getRedefinedFeature(Feature target) {`
	`128`	`+ //checkTransitionUsageTransitionFeatureSpecialization`
`127`	`129`	`FeatureMembership membership = target.getOwningFeatureMembership();`
`128`	`130`	`String kind =`
`129`	`131`	`membership instanceof StateSubactionMembership?`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public CalculationUsage getTarget() {`
`41`	`41`
`42`	`42`	`@Override`
`43`	`43`	`protected String getSubactionType() {`
	`44`	`+ //checkCalculationUsageSpecialization`
	`45`	`+ //checkCalculationUsageSubcalculationSpecialization`
`44`	`46`	`return isSubcalculation()? "subcalculation": super.getSubactionType();`
`45`	`47`	`}`
`46`	`48`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,9 @@ public StateUsage getTarget() {`
`36`	`36`
`37`	`37`	`@Override`
`38`	`38`	`protected String getSubactionType() {`
	`39`	`+ //checkStateUsageExclusiveStateSpecialization`
`39`	`40`	`return isExclusiveState()? "exclusiveState":`
	`41`	`+ //checkStateUsageSubstateSpecialization`
`40`	`42`	`isSubstate()? "substate":`
`41`	`43`	`super.getSubactionType();`
`42`	`44`	`}`