Skip to content

ST6RI-850 Generating XMI with implicit elements can cause an exception #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seidewitz merged 3 commits into from
May 19, 2025
Merged

ST6RI-850 Generating XMI with implicit elements can cause an exception #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0dad29
ST6RI-850 Updated ConnectorUtil::addConnectorEnd for feature chains.
seidewitz May 16, 2025
1eed04d
ST6RI-850 Added protective null pointer check in TransitionUsageAdapter.
seidewitz May 16, 2025
cb19bed
ST6RI-850 Added further protective null pointer checks in...
seidewitz May 16, 2025
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
7 changes: 5 additions & 2 deletions org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,11 @@ protected Feature getBoundValueResult() {
Expression value = valuation.getValue();
if (value != null) {
ElementUtil.transform(value);
Feature result = FeatureUtil.chainFeatures(value, value.getResult());
return result;
Feature valueResult = value.getResult();
if (valueResult != null) {
Feature result = FeatureUtil.chainFeatures(value, value.getResult());
return result;
}
}
}
return null;
Expand Down
8 changes: 5 additions & 3 deletions org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ protected Feature computeTransitionLinkConnectors() {
Feature transitionLinkFeature = UsageUtil.getTransitionLinkFeatureOf(transition);
if (transitionLinkFeature == null) {
// checkTransitionUsageSuccessionBindingConnector
transitionLinkFeature = SysMLFactory.eINSTANCE.createReferenceUsage();
TypeUtil.addOwnedFeatureTo(transition, transitionLinkFeature);
Succession succession = transition.getSuccession();
addBindingConnector(succession, transitionLinkFeature);
if (succession != null) {
transitionLinkFeature = SysMLFactory.eINSTANCE.createReferenceUsage();
TypeUtil.addOwnedFeatureTo(transition, transitionLinkFeature);
addBindingConnector(succession, transitionLinkFeature);
}

// checkTransitionUsageSourceBindingConnector
List<Feature> parameters = TypeUtil.getOwnedParametersOf(transition);
Expand Down
3 changes: 2 additions & 1 deletion org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,8 @@ public BindingConnector addBindingConnector(Feature source, Feature target) {

public BindingConnector addResultBinding(Expression sourceExpression, Feature target) {
ElementUtil.transform(sourceExpression);
return addBindingConnector(sourceExpression.getResult(), target);
Feature sourceResult = sourceExpression.getResult();
return sourceResult == null || target == null? null: addBindingConnector(sourceResult, target);
}

public void createResultConnector(Feature result) {
Expand Down
3 changes: 3 additions & 0 deletions org.omg.sysml/src/org/omg/sysml/util/ConnectorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ public static void transformBindingConnector(BindingConnector connector, Type ow
public static Feature addConnectorEndTo(Connector connector, Feature relatedFeature) {
Feature endFeature = SysMLFactory.eINSTANCE.createFeature();
ReferenceSubsetting subsetting = SysMLFactory.eINSTANCE.createReferenceSubsetting();
if (relatedFeature.getOwner() == null) {
subsetting.getOwnedRelatedElement().add(relatedFeature);
}
subsetting.setReferencedFeature(relatedFeature);
endFeature.getOwnedRelationship().add(subsetting);
endFeature.setIsEnd(true);
Expand Down