Merged
Conversation
- The test fails with a StackOverflowError, as expected.
- Added check if importedElement is excluded before recursing.
makeInheritKeyForReferer() to properly set up PCNamespace() (PCFlowEnd): Renamed from PCItemFromEnd (PCNamespace): Added. (addContextForFeature, addContextForFeatureChainExpression, addContextForFeatureReferenceExpression): Use makeRefPCForReferer(). (addContextForFlowEnd): Renamed from addContextForItemFlowEnd(), and use makeRefPCForReferer()
- Added general mechanism for model-level evaluation of library features. - Renamed some of the methods of interface LibraryFunction.
- Updated ModelLevelExpressionEvaluator to implement the new interface. - Changed "evaluator" parameters to be typed by the new interface.
- Corrected instantiateInvocation to copy instantiatedType from the original InvocationExpression, rather than the ownedTyping. - Updated the evaluation of Features so that unbound input parameters are considered to have a null value (rather than returning the Feature itself).
- Also updated installation instructions in the repo README.
ST6RI-907 Cannot correctly render nested inherited connections with SHOWINHERITED style (PlantUML)
Removed non-generated code for: - CommentImpl.setBody - ElementImpl.setDeclaredName and setDeclaredShortName - LiteralString.setValue - Membership.setMemberName and setMemberShortName - RequirementDefinition.setReqId - RequirementUsage.setReqId - TextualRepresentation.setLanguage and setBody
- Removed overrides of isComposite in subclasses, setting isComposite in constructors instead.
- For UsageImpl and PortIsageImpl
In subclasses of: - ExportImpl (isImportAll) - OperatorImpl (operator) - RequirementConstraintMembership (kind)
- Setting isEnd for EndFeatureMembership moved to EndFeatureMembershipAdapter.postProcess. - Setting direction for ParameterMembership moved to ParameterMembershipAdapter.postProcess. (Note that this means that simply being owned via a ParameterMembership no longer ensures that the parameter direction will be "in".) - Setting direction for the owned Feature of a FlowEnd moved to FlowEndAdapter.doTransform(). (Can't be done in postProcess, because of need for proxy resolution.)
- This was left over and no longer necessary.
- Updated CustomUML2EcoreConverter to add SysML EAnnotation to the Feature::isNonunique EAttribute, when it adds that to the Ecore metamodel.
- This a prospective redefinition pending resolution to SYSML21-302.
- Creation of IDs overridden in NamespaceAdapter, LibraryPackageAdapter and OwningMembershipAdapter. - Updated CustomUML2EcoreConverter to add SysML EAnnotation to the Element::elementID EAttribute, so that a setting delegation is generated.
- Updated CustomUML2EcoreConverter to add SysML EAnnotation to the Element::operand EAttribute, when it adds that to the Ecore metamodel, so that a setting delegation is generated. - Also changed uses of getOperand to getArgument in plantuml/VPath and VSequence.
- Re-introduced necessary remaining non-generated code, eliminating any remaining non-generated legacy code not previously identified.
ST6RI-906 Evaluation of functions from TrigFunctions
ST6RI-910 Update Eclipse environment to 2025-12
- This avoids a possible infinite recursion in the construction of elementIds on demand.
ST6RI-909 Circular recursive import causes infinite recursion in getImportedMembership
ST6RI-897 Remove as much non-generated code as possible from EMF Impl classes
ST6RI-903 Comment.getLocale() returns a quoted locale name
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merging the changes made in master into ST6RI-904 branch in order to continue refactoring of the Validation.