Skip to content

Commit 0d27360

Browse files
seidewitzkris7t
authored andcommitted
ST6RI-752 Regenerated some methods incorrectly tagged "@generated NOT".
- These methods had invocation delegates implemented, but the "@generated NOT" tag had erroneously not been removed. - Also removed handwritten code for Feature::isOrdered which was not per spec.
1 parent a79888a commit 0d27360

4 files changed

Lines changed: 42 additions & 42 deletions

File tree

org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,22 @@ public static FeatureDirectionKind getDirection(Feature feature) {
9696
}
9797
}
9898

99-
// Typing
99+
public static boolean checkIsOrdered(Feature feature, Set<Feature> visited) {
100+
if (feature.isOrdered()) {
101+
return feature.isOrdered();
102+
} else {
103+
visited.add(feature);
104+
for (Feature subsettedFeature: FeatureUtil.getSubsettedFeaturesOf(feature)) {
105+
if (subsettedFeature != null && !visited.contains(subsettedFeature) &&
106+
checkIsOrdered(subsettedFeature, visited)) {
107+
return true;
108+
}
109+
}
110+
return false;
111+
}
112+
}
113+
114+
// Typing
100115

101116
public static EList<Type> cacheTypesOf(Feature feature, Supplier<EList<Type>> supplier) {
102117
FeatureAdapter adapter = getFeatureAdapter(feature);

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/CaseUsageImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ public RequirementUsage basicGetObjectiveRequirement() {
132132
/**
133133
* <!-- begin-user-doc -->
134134
* <!-- end-user-doc -->
135-
* @generated NOT
135+
* @generated
136136
*/
137137
@Override
138138
public void setObjectiveRequirement(RequirementUsage newObjectiveRequirement) {
139-
throw new UnsupportedOperationException();
139+
OBJECTIVE_REQUIREMENT__ESETTING_DELEGATE.dynamicSet(this, null, 0, newObjectiveRequirement);
140140
}
141141

142142
/**

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FeatureImpl.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424

2525
import java.lang.reflect.InvocationTargetException;
2626
import java.util.Collection;
27-
import java.util.HashSet;
28-
import java.util.Set;
29-
3027
import org.eclipse.emf.common.notify.Notification;
3128
import org.eclipse.emf.common.notify.NotificationChain;
3229
import org.eclipse.emf.common.util.BasicEList;
@@ -42,7 +39,6 @@
4239
import org.eclipse.emf.ecore.util.InternalEList;
4340
import org.omg.sysml.lang.sysml.Type;
4441
import org.omg.sysml.lang.sysml.TypeFeaturing;
45-
import org.omg.sysml.util.FeatureUtil;
4642
import org.omg.sysml.lang.sysml.Feature;
4743
import org.omg.sysml.lang.sysml.FeatureChaining;
4844
import org.omg.sysml.lang.sysml.FeatureDirectionKind;
@@ -456,24 +452,9 @@ public void setIsUnique(boolean newIsUnique) {
456452
*/
457453
@Override
458454
public boolean isOrdered() {
459-
return checkIsOrdered(this, new HashSet<Feature>());
455+
return isOrdered;
460456
}
461457

462-
public static boolean checkIsOrdered(FeatureImpl feature, Set<Feature> visited) {
463-
if (feature.isOrdered) {
464-
return feature.isOrdered;
465-
} else {
466-
visited.add(feature);
467-
for (Feature subsettedFeature: FeatureUtil.getSubsettedFeaturesOf(feature)) {
468-
if (subsettedFeature != null && !visited.contains(subsettedFeature) &&
469-
checkIsOrdered(((FeatureImpl)subsettedFeature), visited)) {
470-
return true;
471-
}
472-
}
473-
return false;
474-
}
475-
}
476-
477458
/**
478459
* <!-- begin-user-doc -->
479460
* <!-- end-user-doc -->

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FlowConnectionUsageImpl.java

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2022 Model Driven Solutions, Inc.
3+
* Copyright (c) 2022, 2024 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -23,31 +23,26 @@
2323

2424
import java.lang.reflect.InvocationTargetException;
2525
import java.util.Collection;
26+
import org.eclipse.emf.common.util.BasicEList;
2627
import org.eclipse.emf.common.util.EList;
2728
import org.eclipse.emf.common.util.WrappedException;
2829
import org.eclipse.emf.ecore.EClass;
2930
import org.eclipse.emf.ecore.EOperation;
3031
import org.eclipse.emf.ecore.EStructuralFeature;
31-
import org.omg.sysml.lang.sysml.ActionDefinition;
3232
import org.omg.sysml.lang.sysml.ActionUsage;
3333
import org.omg.sysml.lang.sysml.Association;
3434
import org.omg.sysml.lang.sysml.AssociationStructure;
3535
import org.omg.sysml.lang.sysml.Behavior;
3636
import org.omg.sysml.lang.sysml.Classifier;
3737
import org.omg.sysml.lang.sysml.Expression;
3838
import org.omg.sysml.lang.sysml.Feature;
39-
import org.omg.sysml.lang.sysml.FeatureMembership;
4039
import org.omg.sysml.lang.sysml.FlowConnectionUsage;
4140
import org.omg.sysml.lang.sysml.Interaction;
4241
import org.omg.sysml.lang.sysml.ItemFeature;
4342
import org.omg.sysml.lang.sysml.ItemFlow;
4443
import org.omg.sysml.lang.sysml.ItemFlowEnd;
45-
import org.omg.sysml.lang.sysml.StateSubactionKind;
46-
import org.omg.sysml.lang.sysml.StateSubactionMembership;
4744
import org.omg.sysml.lang.sysml.Step;
4845
import org.omg.sysml.lang.sysml.SysMLPackage;
49-
import org.omg.sysml.lang.sysml.Type;
50-
import org.omg.sysml.util.UsageUtil;
5146

5247
/**
5348
* <!-- begin-user-doc -->
@@ -478,11 +473,15 @@ public EList<Feature> inputParameters() {
478473
/**
479474
* <!-- begin-user-doc -->
480475
* <!-- end-user-doc -->
481-
* @generated NOT
476+
* @generated
482477
*/
483478
public Feature inputParameter(int i) {
484-
EList<Feature> parameters = inputParameters();
485-
return parameters.size() > i? null: parameters.get(i-1);
479+
try {
480+
return (Feature)INPUT_PARAMETER_INT__EINVOCATION_DELEGATE.dynamicInvoke(this, new BasicEList.UnmodifiableEList<Object>(1, new Object[]{i}));
481+
}
482+
catch (InvocationTargetException ite) {
483+
throw new WrappedException(ite);
484+
}
486485
}
487486

488487
/**
@@ -498,10 +497,15 @@ public Feature inputParameter(int i) {
498497
/**
499498
* <!-- begin-user-doc -->
500499
* <!-- end-user-doc -->
501-
* @generated NOT
500+
* @generated
502501
*/
503502
public Expression argument(int i) {
504-
return UsageUtil.getArgumentOf(this, i);
503+
try {
504+
return (Expression)ARGUMENT_INT__EINVOCATION_DELEGATE.dynamicInvoke(this, new BasicEList.UnmodifiableEList<Object>(1, new Object[]{i}));
505+
}
506+
catch (InvocationTargetException ite) {
507+
throw new WrappedException(ite);
508+
}
505509
}
506510

507511
/**
@@ -517,15 +521,15 @@ public Expression argument(int i) {
517521
/**
518522
* <!-- begin-user-doc -->
519523
* <!-- end-user-doc -->
520-
* @generated NOT
524+
* @generated
521525
*/
522526
public boolean isSubactionUsage() {
523-
Type owningType = getOwningType();
524-
FeatureMembership owningMembership = getOwningFeatureMembership();
525-
return isComposite() &&
526-
(owningType instanceof ActionDefinition || owningType instanceof ActionUsage) &&
527-
(!(owningMembership instanceof StateSubactionMembership) ||
528-
((StateSubactionMembership)owningMembership).getKind() == StateSubactionKind.DO);
527+
try {
528+
return (Boolean)IS_SUBACTION_USAGE__EINVOCATION_DELEGATE.dynamicInvoke(this, null);
529+
}
530+
catch (InvocationTargetException ite) {
531+
throw new WrappedException(ite);
532+
}
529533
}
530534

531535
// Additional overrides

0 commit comments

Comments
 (0)