From 5b582e8a57d16e1996de08548f94c7ebfd018e27 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Mon, 29 Aug 2022 21:12:56 -0400 Subject: [PATCH 1/5] feat: ST5AS-204 Commit.previousCommit as array in OpenAPI spec --- public/swagger/openapi.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/public/swagger/openapi.yaml b/public/swagger/openapi.yaml index d940b0fe..0647fc7a 100644 --- a/public/swagger/openapi.yaml +++ b/public/swagger/openapi.yaml @@ -1210,12 +1210,15 @@ definitions: type: string format: uuid previousCommit: - description: Commit - type: object - properties: - '@id': - type: string - format: uuid + description: array(Commit) + type: array + items: + description: Commit + type: object + properties: + '@id': + type: string + format: uuid DataVersion: type: object properties: From ce0c88ac6d1f2927d5a7952df2173d1493735078 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Mon, 29 Aug 2022 21:23:00 -0400 Subject: [PATCH 2/5] fix: ST5AS-203 include @type in DataVersion response --- app/org/omg/sysml/lifecycle/impl/DataVersionImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/org/omg/sysml/lifecycle/impl/DataVersionImpl.java b/app/org/omg/sysml/lifecycle/impl/DataVersionImpl.java index f8117aef..f09aecde 100644 --- a/app/org/omg/sysml/lifecycle/impl/DataVersionImpl.java +++ b/app/org/omg/sysml/lifecycle/impl/DataVersionImpl.java @@ -66,7 +66,7 @@ public void setIdentity(DataIdentity identity) { @Transient @JsonProperty("@type") - public static String getType() { + public String getType() { return DataVersion.NAME; } } From df3b30ac64ea00914fc171c47c4e67ae2bdcd264 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Thu, 8 Sep 2022 20:29:45 -0400 Subject: [PATCH 3/5] ST5AS-208 Update to 2022-08 baseline --- .../sysml/lifecycle/impl/package-info.java | 7 +- .../metamodel/BindingConnectorAsUsage.java | 2 +- app/org/omg/sysml/metamodel/Connector.java | 6 +- .../omg/sysml/metamodel/ConnectorAsUsage.java | 2 +- app/org/omg/sysml/metamodel/Definition.java | 2 + app/org/omg/sysml/metamodel/Differencing.java | 33 + app/org/omg/sysml/metamodel/Element.java | 6 +- app/org/omg/sysml/metamodel/Feature.java | 2 + .../sysml/metamodel/FeatureMembership.java | 2 +- .../{PrefixComment.java => Featuring.java} | 4 +- .../metamodel/FlowConnectionDefinition.java | 31 + .../sysml/metamodel/FlowConnectionUsage.java | 4 +- .../sysml/metamodel/IncludeUseCaseUsage.java | 2 +- app/org/omg/sysml/metamodel/Intersecting.java | 33 + app/org/omg/sysml/metamodel/ItemFlow.java | 8 +- .../omg/sysml/metamodel/MetadataUsage.java | 2 +- .../sysml/metamodel/ReferenceSubsetting.java | 33 + app/org/omg/sysml/metamodel/Relationship.java | 2 + .../SuccessionFlowConnectionUsage.java | 2 +- app/org/omg/sysml/metamodel/Type.java | 14 +- .../omg/sysml/metamodel/TypeFeaturing.java | 2 +- app/org/omg/sysml/metamodel/Unioning.java | 33 + app/org/omg/sysml/metamodel/Usage.java | 2 + .../metamodel/impl/AcceptActionUsageImpl.java | 223 ++ .../metamodel/impl/ActionDefinitionImpl.java | 200 ++ .../sysml/metamodel/impl/ActionUsageImpl.java | 223 ++ .../metamodel/impl/ActorMembershipImpl.java | 97 +- .../impl/AllocationDefinitionImpl.java | 216 ++ .../metamodel/impl/AllocationUsageImpl.java | 257 +- .../impl/AnalysisCaseDefinitionImpl.java | 200 ++ .../metamodel/impl/AnalysisCaseUsageImpl.java | 223 ++ .../metamodel/impl/AnnotatingElementImpl.java | 18 + .../sysml/metamodel/impl/AnnotationImpl.java | 34 + .../impl/AssertConstraintUsageImpl.java | 223 ++ .../impl/AssignmentActionUsageImpl.java | 223 ++ .../sysml/metamodel/impl/AssociationImpl.java | 190 ++ .../impl/AssociationStructureImpl.java | 190 ++ .../impl/AttributeDefinitionImpl.java | 200 ++ .../metamodel/impl/AttributeUsageImpl.java | 223 ++ .../sysml/metamodel/impl/BehaviorImpl.java | 174 ++ .../impl/BindingConnectorAsUsageImpl.java | 257 +- .../metamodel/impl/BindingConnectorImpl.java | 231 +- .../metamodel/impl/BooleanExpressionImpl.java | 197 ++ .../impl/CalculationDefinitionImpl.java | 200 ++ .../metamodel/impl/CalculationUsageImpl.java | 223 ++ .../metamodel/impl/CaseDefinitionImpl.java | 200 ++ .../sysml/metamodel/impl/CaseUsageImpl.java | 223 ++ .../omg/sysml/metamodel/impl/ClassImpl.java | 174 ++ .../sysml/metamodel/impl/ClassifierImpl.java | 174 ++ .../metamodel/impl/CollectExpressionImpl.java | 197 ++ .../omg/sysml/metamodel/impl/CommentImpl.java | 18 + .../metamodel/impl/ConcernDefinitionImpl.java | 200 ++ .../metamodel/impl/ConcernUsageImpl.java | 223 ++ .../impl/ConjugatedPortDefinitionImpl.java | 200 ++ .../impl/ConjugatedPortTypingImpl.java | 34 + .../sysml/metamodel/impl/ConjugationImpl.java | 34 + .../impl/ConnectionDefinitionImpl.java | 216 ++ .../metamodel/impl/ConnectionUsageImpl.java | 257 +- .../metamodel/impl/ConnectorAsUsageImpl.java | 257 +- .../sysml/metamodel/impl/ConnectorImpl.java | 231 +- .../impl/ConstraintDefinitionImpl.java | 200 ++ .../metamodel/impl/ConstraintUsageImpl.java | 223 ++ .../sysml/metamodel/impl/ControlNodeImpl.java | 223 ++ .../sysml/metamodel/impl/DataTypeImpl.java | 174 ++ .../metamodel/impl/DecisionNodeImpl.java | 223 ++ .../sysml/metamodel/impl/DefinitionImpl.java | 200 ++ .../sysml/metamodel/impl/DependencyImpl.java | 34 + .../metamodel/impl/DifferencingImpl.java | 587 ++++ .../sysml/metamodel/impl/DisjoiningImpl.java | 34 + .../metamodel/impl/DocumentationImpl.java | 18 + .../impl/ElementFilterMembershipImpl.java | 38 + .../omg/sysml/metamodel/impl/ElementImpl.java | 18 + .../impl/EndFeatureMembershipImpl.java | 93 +- .../impl/EnumerationDefinitionImpl.java | 200 ++ .../metamodel/impl/EnumerationUsageImpl.java | 223 ++ .../impl/EventOccurrenceUsageImpl.java | 223 ++ .../metamodel/impl/ExhibitStateUsageImpl.java | 223 ++ .../omg/sysml/metamodel/impl/ExposeImpl.java | 34 + .../sysml/metamodel/impl/ExpressionImpl.java | 197 ++ .../impl/FeatureChainExpressionImpl.java | 197 ++ .../metamodel/impl/FeatureChainingImpl.java | 34 + .../omg/sysml/metamodel/impl/FeatureImpl.java | 197 ++ .../metamodel/impl/FeatureInvertingImpl.java | 34 + .../metamodel/impl/FeatureMembershipImpl.java | 93 +- .../impl/FeatureReferenceExpressionImpl.java | 197 ++ .../metamodel/impl/FeatureTypingImpl.java | 34 + .../metamodel/impl/FeatureValueImpl.java | 38 + ...fixCommentImpl.java => FeaturingImpl.java} | 303 ++- .../impl/FlowConnectionDefinitionImpl.java | 2377 +++++++++++++++++ .../impl/FlowConnectionUsageImpl.java | 392 ++- .../impl/ForLoopActionUsageImpl.java | 223 ++ .../sysml/metamodel/impl/ForkNodeImpl.java | 223 ++ .../impl/FramedConcernMembershipImpl.java | 97 +- .../sysml/metamodel/impl/FunctionImpl.java | 174 ++ .../metamodel/impl/IfActionUsageImpl.java | 223 ++ .../omg/sysml/metamodel/impl/ImportImpl.java | 34 + .../impl/IncludeUseCaseUsageImpl.java | 223 ++ .../sysml/metamodel/impl/InteractionImpl.java | 190 ++ .../impl/InterfaceDefinitionImpl.java | 216 ++ .../metamodel/impl/InterfaceUsageImpl.java | 257 +- .../metamodel/impl/IntersectingImpl.java | 587 ++++ .../sysml/metamodel/impl/InvariantImpl.java | 197 ++ .../impl/InvocationExpressionImpl.java | 197 ++ .../metamodel/impl/ItemDefinitionImpl.java | 200 ++ .../sysml/metamodel/impl/ItemFeatureImpl.java | 197 ++ .../sysml/metamodel/impl/ItemFlowEndImpl.java | 197 ++ .../metamodel/impl/ItemFlowFeatureImpl.java | 197 ++ .../sysml/metamodel/impl/ItemFlowImpl.java | 314 ++- .../sysml/metamodel/impl/ItemUsageImpl.java | 223 ++ .../sysml/metamodel/impl/JoinNodeImpl.java | 223 ++ .../sysml/metamodel/impl/LifeClassImpl.java | 174 ++ .../metamodel/impl/LiteralBooleanImpl.java | 197 ++ .../metamodel/impl/LiteralExpressionImpl.java | 197 ++ .../metamodel/impl/LiteralInfinityImpl.java | 197 ++ .../metamodel/impl/LiteralIntegerImpl.java | 197 ++ .../metamodel/impl/LiteralRationalImpl.java | 197 ++ .../metamodel/impl/LiteralStringImpl.java | 197 ++ .../metamodel/impl/LoopActionUsageImpl.java | 223 ++ .../sysml/metamodel/impl/MembershipImpl.java | 34 + .../sysml/metamodel/impl/MergeNodeImpl.java | 223 ++ .../sysml/metamodel/impl/MetaclassImpl.java | 174 ++ .../impl/MetadataDefinitionImpl.java | 200 ++ .../metamodel/impl/MetadataFeatureImpl.java | 197 ++ .../metamodel/impl/MetadataUsageImpl.java | 223 ++ .../metamodel/impl/MultiplicityImpl.java | 197 ++ .../metamodel/impl/MultiplicityRangeImpl.java | 197 ++ .../sysml/metamodel/impl/NamespaceImpl.java | 18 + .../metamodel/impl/NullExpressionImpl.java | 197 ++ .../impl/ObjectiveMembershipImpl.java | 95 +- .../impl/OccurrenceDefinitionImpl.java | 200 ++ .../metamodel/impl/OccurrenceUsageImpl.java | 223 ++ .../impl/OperatorExpressionImpl.java | 197 ++ .../metamodel/impl/OwningMembershipImpl.java | 36 + .../omg/sysml/metamodel/impl/PackageImpl.java | 18 + .../impl/ParameterMembershipImpl.java | 95 +- .../metamodel/impl/PartDefinitionImpl.java | 200 ++ .../sysml/metamodel/impl/PartUsageImpl.java | 223 ++ .../impl/PerformActionUsageImpl.java | 223 ++ .../metamodel/impl/PortConjugationImpl.java | 34 + .../metamodel/impl/PortDefinitionImpl.java | 200 ++ .../sysml/metamodel/impl/PortUsageImpl.java | 223 ++ .../metamodel/impl/PortioningFeatureImpl.java | 197 ++ .../sysml/metamodel/impl/PredicateImpl.java | 174 ++ .../metamodel/impl/RedefinitionImpl.java | 34 + .../impl/ReferenceSubsettingImpl.java | 705 +++++ .../metamodel/impl/ReferenceUsageImpl.java | 223 ++ .../metamodel/impl/RelationshipImpl.java | 34 + .../impl/RenderingDefinitionImpl.java | 200 ++ .../metamodel/impl/RenderingUsageImpl.java | 223 ++ .../RequirementConstraintMembershipImpl.java | 95 +- .../impl/RequirementDefinitionImpl.java | 200 ++ .../metamodel/impl/RequirementUsageImpl.java | 223 ++ ...RequirementVerificationMembershipImpl.java | 97 +- .../impl/ResultExpressionMembershipImpl.java | 95 +- .../impl/ReturnParameterMembershipImpl.java | 95 +- .../impl/SatisfyRequirementUsageImpl.java | 223 ++ .../metamodel/impl/SelectExpressionImpl.java | 197 ++ .../metamodel/impl/SendActionUsageImpl.java | 223 ++ .../sysml/metamodel/impl/SourceEndImpl.java | 197 ++ .../metamodel/impl/SpecializationImpl.java | 34 + .../impl/StakeholderMembershipImpl.java | 97 +- .../metamodel/impl/StateDefinitionImpl.java | 200 ++ .../impl/StateSubactionMembershipImpl.java | 95 +- .../sysml/metamodel/impl/StateUsageImpl.java | 223 ++ .../omg/sysml/metamodel/impl/StepImpl.java | 197 ++ .../sysml/metamodel/impl/StructureImpl.java | 174 ++ .../metamodel/impl/SubclassificationImpl.java | 34 + .../metamodel/impl/SubjectMembershipImpl.java | 97 +- .../sysml/metamodel/impl/SubsettingImpl.java | 34 + .../metamodel/impl/SuccessionAsUsageImpl.java | 257 +- .../SuccessionFlowConnectionUsageImpl.java | 392 ++- .../sysml/metamodel/impl/SuccessionImpl.java | 231 +- .../impl/SuccessionItemFlowImpl.java | 314 ++- .../sysml/metamodel/impl/TargetEndImpl.java | 197 ++ .../impl/TextualRepresentationImpl.java | 18 + .../impl/TransitionFeatureMembershipImpl.java | 95 +- .../metamodel/impl/TransitionUsageImpl.java | 223 ++ .../impl/TriggerInvocationExpressionImpl.java | 197 ++ .../metamodel/impl/TypeFeaturingImpl.java | 72 + .../omg/sysml/metamodel/impl/TypeImpl.java | 174 ++ .../sysml/metamodel/impl/UnioningImpl.java | 587 ++++ .../omg/sysml/metamodel/impl/UsageImpl.java | 223 ++ .../metamodel/impl/UseCaseDefinitionImpl.java | 200 ++ .../metamodel/impl/UseCaseUsageImpl.java | 223 ++ .../metamodel/impl/VariantMembershipImpl.java | 38 + .../impl/VerificationCaseDefinitionImpl.java | 200 ++ .../impl/VerificationCaseUsageImpl.java | 223 ++ .../metamodel/impl/ViewDefinitionImpl.java | 200 ++ .../impl/ViewRenderingMembershipImpl.java | 95 +- .../sysml/metamodel/impl/ViewUsageImpl.java | 223 ++ .../impl/ViewpointDefinitionImpl.java | 200 ++ .../metamodel/impl/ViewpointUsageImpl.java | 223 ++ .../impl/WhileLoopActionUsageImpl.java | 223 ++ .../sysml/metamodel/impl/package-info.java | 100 +- conf/META-INF/persistence.xml | 7 +- .../impl/AcceptActionUsageImpl_.java | 188 +- .../metamodel/impl/ActionDefinitionImpl_.java | 21 + .../metamodel/impl/ActionUsageImpl_.java | 188 +- .../metamodel/impl/ActorMembershipImpl_.java | 4 + .../impl/AllocationDefinitionImpl_.java | 22 + .../metamodel/impl/AllocationUsageImpl_.java | 28 +- .../impl/AnalysisCaseDefinitionImpl_.java | 21 + .../impl/AnalysisCaseUsageImpl_.java | 192 +- .../impl/AnnotatingElementImpl_.java | 2 + .../sysml/metamodel/impl/AnnotationImpl_.java | 4 + .../impl/AssertConstraintUsageImpl_.java | 192 +- .../impl/AssignmentActionUsageImpl_.java | 188 +- .../metamodel/impl/AssociationImpl_.java | 87 +- .../impl/AssociationStructureImpl_.java | 87 +- .../impl/AttributeDefinitionImpl_.java | 21 + .../metamodel/impl/AttributeUsageImpl_.java | 20 + .../sysml/metamodel/impl/BehaviorImpl_.java | 18 + .../impl/BindingConnectorAsUsageImpl_.java | 204 +- .../metamodel/impl/BindingConnectorImpl_.java | 25 +- .../impl/BooleanExpressionImpl_.java | 17 + .../impl/CalculationDefinitionImpl_.java | 21 + .../metamodel/impl/CalculationUsageImpl_.java | 188 +- .../metamodel/impl/CaseDefinitionImpl_.java | 21 + .../sysml/metamodel/impl/CaseUsageImpl_.java | 188 +- .../omg/sysml/metamodel/impl/ClassImpl_.java | 18 + .../sysml/metamodel/impl/ClassifierImpl_.java | 18 + .../impl/CollectExpressionImpl_.java | 17 + .../sysml/metamodel/impl/CommentImpl_.java | 2 + .../impl/ConcernDefinitionImpl_.java | 21 + .../metamodel/impl/ConcernUsageImpl_.java | 20 + .../impl/ConjugatedPortDefinitionImpl_.java | 21 + .../impl/ConjugatedPortTypingImpl_.java | 4 + .../metamodel/impl/ConjugationImpl_.java | 4 + .../impl/ConnectionDefinitionImpl_.java | 22 + .../metamodel/impl/ConnectionUsageImpl_.java | 28 +- .../metamodel/impl/ConnectorAsUsageImpl_.java | 204 +- .../sysml/metamodel/impl/ConnectorImpl_.java | 25 +- .../impl/ConstraintDefinitionImpl_.java | 21 + .../metamodel/impl/ConstraintUsageImpl_.java | 188 +- .../metamodel/impl/ControlNodeImpl_.java | 188 +- .../sysml/metamodel/impl/DataTypeImpl_.java | 18 + .../metamodel/impl/DecisionNodeImpl_.java | 188 +- .../sysml/metamodel/impl/DefinitionImpl_.java | 21 + .../sysml/metamodel/impl/DependencyImpl_.java | 4 + .../metamodel/impl/DifferencingImpl_.java | 55 + .../sysml/metamodel/impl/DisjoiningImpl_.java | 4 + .../metamodel/impl/DocumentationImpl_.java | 2 + .../impl/ElementFilterMembershipImpl_.java | 4 + .../sysml/metamodel/impl/ElementImpl_.java | 2 + .../impl/EndFeatureMembershipImpl_.java | 4 + .../impl/EnumerationDefinitionImpl_.java | 21 + .../metamodel/impl/EnumerationUsageImpl_.java | 20 + .../impl/EventOccurrenceUsageImpl_.java | 20 + .../impl/ExhibitStateUsageImpl_.java | 192 +- .../omg/sysml/metamodel/impl/ExposeImpl_.java | 4 + .../sysml/metamodel/impl/ExpressionImpl_.java | 17 + .../impl/FeatureChainExpressionImpl_.java | 17 + .../metamodel/impl/FeatureChainingImpl_.java | 4 + .../sysml/metamodel/impl/FeatureImpl_.java | 17 + .../metamodel/impl/FeatureInvertingImpl_.java | 4 + .../impl/FeatureMembershipImpl_.java | 4 + .../impl/FeatureReferenceExpressionImpl_.java | 17 + .../metamodel/impl/FeatureTypingImpl_.java | 4 + .../metamodel/impl/FeatureValueImpl_.java | 40 +- .../sysml/metamodel/impl/FeaturingImpl_.java | 55 + .../impl/FlowConnectionDefinitionImpl_.java | 234 ++ .../impl/FlowConnectionUsageImpl_.java | 42 +- .../impl/ForLoopActionUsageImpl_.java | 188 +- .../sysml/metamodel/impl/ForkNodeImpl_.java | 188 +- .../impl/FramedConcernMembershipImpl_.java | 40 +- .../sysml/metamodel/impl/FunctionImpl_.java | 18 + .../metamodel/impl/IfActionUsageImpl_.java | 188 +- .../omg/sysml/metamodel/impl/ImportImpl_.java | 4 + .../impl/IncludeUseCaseUsageImpl_.java | 192 +- .../metamodel/impl/InteractionImpl_.java | 87 +- .../impl/InterfaceDefinitionImpl_.java | 22 + .../metamodel/impl/InterfaceUsageImpl_.java | 28 +- .../metamodel/impl/IntersectingImpl_.java | 55 + .../sysml/metamodel/impl/InvariantImpl_.java | 17 + .../impl/InvocationExpressionImpl_.java | 17 + .../metamodel/impl/ItemDefinitionImpl_.java | 21 + .../metamodel/impl/ItemFeatureImpl_.java | 17 + .../metamodel/impl/ItemFlowEndImpl_.java | 17 + .../metamodel/impl/ItemFlowFeatureImpl_.java | 17 + .../sysml/metamodel/impl/ItemFlowImpl_.java | 35 +- .../sysml/metamodel/impl/ItemUsageImpl_.java | 20 + .../sysml/metamodel/impl/JoinNodeImpl_.java | 188 +- .../sysml/metamodel/impl/LifeClassImpl_.java | 18 + .../metamodel/impl/LiteralBooleanImpl_.java | 17 + .../impl/LiteralExpressionImpl_.java | 17 + .../metamodel/impl/LiteralInfinityImpl_.java | 17 + .../metamodel/impl/LiteralIntegerImpl_.java | 17 + .../metamodel/impl/LiteralRationalImpl_.java | 17 + .../metamodel/impl/LiteralStringImpl_.java | 17 + .../metamodel/impl/LoopActionUsageImpl_.java | 188 +- .../sysml/metamodel/impl/MembershipImpl_.java | 4 + .../sysml/metamodel/impl/MergeNodeImpl_.java | 188 +- .../sysml/metamodel/impl/MetaclassImpl_.java | 18 + .../impl/MetadataDefinitionImpl_.java | 21 + .../metamodel/impl/MetadataFeatureImpl_.java | 17 + .../metamodel/impl/MetadataUsageImpl_.java | 188 +- .../metamodel/impl/MultiplicityImpl_.java | 17 + .../impl/MultiplicityRangeImpl_.java | 17 + .../sysml/metamodel/impl/NamespaceImpl_.java | 2 + .../metamodel/impl/NullExpressionImpl_.java | 17 + .../impl/ObjectiveMembershipImpl_.java | 4 + .../impl/OccurrenceDefinitionImpl_.java | 21 + .../metamodel/impl/OccurrenceUsageImpl_.java | 20 + .../impl/OperatorExpressionImpl_.java | 17 + .../metamodel/impl/OwningMembershipImpl_.java | 4 + .../sysml/metamodel/impl/PackageImpl_.java | 2 + .../impl/ParameterMembershipImpl_.java | 4 + .../metamodel/impl/PartDefinitionImpl_.java | 21 + .../sysml/metamodel/impl/PartUsageImpl_.java | 188 +- .../impl/PerformActionUsageImpl_.java | 188 +- .../metamodel/impl/PortConjugationImpl_.java | 4 + .../metamodel/impl/PortDefinitionImpl_.java | 21 + .../sysml/metamodel/impl/PortUsageImpl_.java | 20 + .../impl/PortioningFeatureImpl_.java | 17 + .../sysml/metamodel/impl/PredicateImpl_.java | 18 + .../metamodel/impl/PrefixCommentImpl_.java | 51 - .../metamodel/impl/RedefinitionImpl_.java | 4 + .../impl/ReferenceSubsettingImpl_.java | 55 + .../metamodel/impl/ReferenceUsageImpl_.java | 20 + .../metamodel/impl/RelationshipImpl_.java | 4 + .../impl/RenderingDefinitionImpl_.java | 21 + .../metamodel/impl/RenderingUsageImpl_.java | 188 +- .../RequirementConstraintMembershipImpl_.java | 40 +- .../impl/RequirementDefinitionImpl_.java | 21 + .../metamodel/impl/RequirementUsageImpl_.java | 20 + ...equirementVerificationMembershipImpl_.java | 40 +- .../impl/ResultExpressionMembershipImpl_.java | 4 + .../impl/ReturnParameterMembershipImpl_.java | 4 + .../impl/SatisfyRequirementUsageImpl_.java | 20 + .../metamodel/impl/SelectExpressionImpl_.java | 17 + .../metamodel/impl/SendActionUsageImpl_.java | 188 +- .../sysml/metamodel/impl/SourceEndImpl_.java | 17 + .../metamodel/impl/SpecializationImpl_.java | 4 + .../impl/StakeholderMembershipImpl_.java | 4 + .../metamodel/impl/StateDefinitionImpl_.java | 21 + .../impl/StateSubactionMembershipImpl_.java | 40 +- .../sysml/metamodel/impl/StateUsageImpl_.java | 192 +- .../omg/sysml/metamodel/impl/StepImpl_.java | 17 + .../sysml/metamodel/impl/StructureImpl_.java | 18 + .../impl/SubclassificationImpl_.java | 4 + .../impl/SubjectMembershipImpl_.java | 4 + .../sysml/metamodel/impl/SubsettingImpl_.java | 4 + .../impl/SuccessionAsUsageImpl_.java | 210 +- .../SuccessionFlowConnectionUsageImpl_.java | 42 +- .../sysml/metamodel/impl/SuccessionImpl_.java | 25 +- .../impl/SuccessionItemFlowImpl_.java | 35 +- .../sysml/metamodel/impl/TargetEndImpl_.java | 17 + .../impl/TextualRepresentationImpl_.java | 2 + .../TransitionFeatureMembershipImpl_.java | 40 +- .../metamodel/impl/TransitionUsageImpl_.java | 192 +- .../TriggerInvocationExpressionImpl_.java | 17 + .../metamodel/impl/TypeFeaturingImpl_.java | 4 + .../omg/sysml/metamodel/impl/TypeImpl_.java | 18 + .../sysml/metamodel/impl/UnioningImpl_.java | 55 + .../omg/sysml/metamodel/impl/UsageImpl_.java | 20 + .../impl/UseCaseDefinitionImpl_.java | 21 + .../metamodel/impl/UseCaseUsageImpl_.java | 192 +- .../impl/VariantMembershipImpl_.java | 4 + .../impl/VerificationCaseDefinitionImpl_.java | 21 + .../impl/VerificationCaseUsageImpl_.java | 188 +- .../metamodel/impl/ViewDefinitionImpl_.java | 21 + .../impl/ViewRenderingMembershipImpl_.java | 4 + .../sysml/metamodel/impl/ViewUsageImpl_.java | 196 +- .../impl/ViewpointDefinitionImpl_.java | 21 + .../metamodel/impl/ViewpointUsageImpl_.java | 20 + .../impl/WhileLoopActionUsageImpl_.java | 188 +- .../jsonld/metamodel/AcceptActionUsage.jsonld | 9 + .../jsonld/metamodel/ActionDefinition.jsonld | 8 + public/jsonld/metamodel/ActionUsage.jsonld | 9 + .../jsonld/metamodel/ActorMembership.jsonld | 7 +- .../metamodel/AllocationDefinition.jsonld | 9 + .../jsonld/metamodel/AllocationUsage.jsonld | 10 + .../metamodel/AnalysisCaseDefinition.jsonld | 8 + .../jsonld/metamodel/AnalysisCaseUsage.jsonld | 9 + .../jsonld/metamodel/AnnotatingElement.jsonld | 1 + public/jsonld/metamodel/Annotation.jsonld | 2 + .../metamodel/AssertConstraintUsage.jsonld | 9 + .../metamodel/AssignmentActionUsage.jsonld | 9 + public/jsonld/metamodel/Association.jsonld | 10 +- .../metamodel/AssociationStructure.jsonld | 10 +- .../metamodel/AttributeDefinition.jsonld | 8 + public/jsonld/metamodel/AttributeUsage.jsonld | 9 + public/jsonld/metamodel/Behavior.jsonld | 9 +- .../jsonld/metamodel/BindingConnector.jsonld | 11 +- .../metamodel/BindingConnectorAsUsage.jsonld | 10 + .../jsonld/metamodel/BooleanExpression.jsonld | 10 +- .../metamodel/CalculationDefinition.jsonld | 8 + .../jsonld/metamodel/CalculationUsage.jsonld | 9 + public/jsonld/metamodel/CaseDefinition.jsonld | 8 + public/jsonld/metamodel/CaseUsage.jsonld | 9 + public/jsonld/metamodel/Class.jsonld | 9 +- public/jsonld/metamodel/Classifier.jsonld | 9 +- .../jsonld/metamodel/CollectExpression.jsonld | 10 +- public/jsonld/metamodel/Comment.jsonld | 1 + .../jsonld/metamodel/ConcernDefinition.jsonld | 8 + public/jsonld/metamodel/ConcernUsage.jsonld | 9 + .../metamodel/ConjugatedPortDefinition.jsonld | 8 + .../metamodel/ConjugatedPortTyping.jsonld | 2 + public/jsonld/metamodel/Conjugation.jsonld | 2 + .../metamodel/ConnectionDefinition.jsonld | 9 + .../jsonld/metamodel/ConnectionUsage.jsonld | 10 + public/jsonld/metamodel/Connector.jsonld | 11 +- .../jsonld/metamodel/ConnectorAsUsage.jsonld | 10 + .../metamodel/ConstraintDefinition.jsonld | 8 + .../jsonld/metamodel/ConstraintUsage.jsonld | 9 + public/jsonld/metamodel/ControlNode.jsonld | 9 + public/jsonld/metamodel/DataType.jsonld | 9 +- public/jsonld/metamodel/DecisionNode.jsonld | 9 + public/jsonld/metamodel/Definition.jsonld | 8 + public/jsonld/metamodel/Dependency.jsonld | 2 + public/jsonld/metamodel/Differencing.jsonld | 34 + public/jsonld/metamodel/Disjoining.jsonld | 2 + public/jsonld/metamodel/Documentation.jsonld | 1 + public/jsonld/metamodel/Element.jsonld | 1 + .../metamodel/ElementFilterMembership.jsonld | 2 + .../metamodel/EndFeatureMembership.jsonld | 7 +- .../metamodel/EnumerationDefinition.jsonld | 8 + .../jsonld/metamodel/EnumerationUsage.jsonld | 9 + .../metamodel/EventOccurrenceUsage.jsonld | 9 + .../jsonld/metamodel/ExhibitStateUsage.jsonld | 9 + public/jsonld/metamodel/Expose.jsonld | 2 + public/jsonld/metamodel/Expression.jsonld | 10 +- public/jsonld/metamodel/Feature.jsonld | 10 +- .../metamodel/FeatureChainExpression.jsonld | 10 +- .../jsonld/metamodel/FeatureChaining.jsonld | 2 + .../jsonld/metamodel/FeatureInverting.jsonld | 2 + .../jsonld/metamodel/FeatureMembership.jsonld | 7 +- .../FeatureReferenceExpression.jsonld | 10 +- public/jsonld/metamodel/FeatureTyping.jsonld | 2 + public/jsonld/metamodel/FeatureValue.jsonld | 2 + ...{PrefixComment.jsonld => Featuring.jsonld} | 15 +- .../metamodel/FlowConnectionDefinition.jsonld | 105 + .../metamodel/FlowConnectionUsage.jsonld | 13 + .../metamodel/ForLoopActionUsage.jsonld | 9 + public/jsonld/metamodel/ForkNode.jsonld | 9 + .../metamodel/FramedConcernMembership.jsonld | 7 +- public/jsonld/metamodel/Function.jsonld | 9 +- public/jsonld/metamodel/IfActionUsage.jsonld | 9 + public/jsonld/metamodel/Import.jsonld | 2 + .../metamodel/IncludeUseCaseUsage.jsonld | 9 + public/jsonld/metamodel/Interaction.jsonld | 10 +- .../metamodel/InterfaceDefinition.jsonld | 9 + public/jsonld/metamodel/InterfaceUsage.jsonld | 10 + public/jsonld/metamodel/Intersecting.jsonld | 34 + public/jsonld/metamodel/Invariant.jsonld | 10 +- .../metamodel/InvocationExpression.jsonld | 10 +- public/jsonld/metamodel/ItemDefinition.jsonld | 8 + public/jsonld/metamodel/ItemFeature.jsonld | 10 +- public/jsonld/metamodel/ItemFlow.jsonld | 12 +- public/jsonld/metamodel/ItemFlowEnd.jsonld | 10 +- .../jsonld/metamodel/ItemFlowFeature.jsonld | 10 +- public/jsonld/metamodel/ItemUsage.jsonld | 9 + public/jsonld/metamodel/JoinNode.jsonld | 9 + public/jsonld/metamodel/LifeClass.jsonld | 9 +- public/jsonld/metamodel/LiteralBoolean.jsonld | 8 + .../jsonld/metamodel/LiteralExpression.jsonld | 10 +- .../jsonld/metamodel/LiteralInfinity.jsonld | 10 +- public/jsonld/metamodel/LiteralInteger.jsonld | 8 + .../jsonld/metamodel/LiteralRational.jsonld | 8 + public/jsonld/metamodel/LiteralString.jsonld | 8 + .../jsonld/metamodel/LoopActionUsage.jsonld | 9 + public/jsonld/metamodel/Membership.jsonld | 2 + public/jsonld/metamodel/MergeNode.jsonld | 9 + public/jsonld/metamodel/Metaclass.jsonld | 9 +- .../metamodel/MetadataDefinition.jsonld | 8 + .../jsonld/metamodel/MetadataFeature.jsonld | 10 +- public/jsonld/metamodel/MetadataUsage.jsonld | 9 + public/jsonld/metamodel/Multiplicity.jsonld | 10 +- .../jsonld/metamodel/MultiplicityRange.jsonld | 8 + public/jsonld/metamodel/Namespace.jsonld | 1 + public/jsonld/metamodel/NullExpression.jsonld | 10 +- .../metamodel/ObjectiveMembership.jsonld | 7 +- .../metamodel/OccurrenceDefinition.jsonld | 8 + .../jsonld/metamodel/OccurrenceUsage.jsonld | 9 + .../metamodel/OperatorExpression.jsonld | 10 +- .../jsonld/metamodel/OwningMembership.jsonld | 2 + public/jsonld/metamodel/Package.jsonld | 1 + .../metamodel/ParameterMembership.jsonld | 7 +- public/jsonld/metamodel/PartDefinition.jsonld | 8 + public/jsonld/metamodel/PartUsage.jsonld | 9 + .../metamodel/PerformActionUsage.jsonld | 9 + .../jsonld/metamodel/PortConjugation.jsonld | 2 + public/jsonld/metamodel/PortDefinition.jsonld | 8 + public/jsonld/metamodel/PortUsage.jsonld | 9 + .../jsonld/metamodel/PortioningFeature.jsonld | 10 +- public/jsonld/metamodel/Predicate.jsonld | 9 +- public/jsonld/metamodel/Redefinition.jsonld | 2 + .../metamodel/ReferenceSubsetting.jsonld | 40 + public/jsonld/metamodel/ReferenceUsage.jsonld | 9 + public/jsonld/metamodel/Relationship.jsonld | 2 + .../metamodel/RenderingDefinition.jsonld | 8 + public/jsonld/metamodel/RenderingUsage.jsonld | 9 + .../RequirementConstraintMembership.jsonld | 7 +- .../metamodel/RequirementDefinition.jsonld | 8 + .../jsonld/metamodel/RequirementUsage.jsonld | 9 + .../RequirementVerificationMembership.jsonld | 7 +- .../ResultExpressionMembership.jsonld | 7 +- .../ReturnParameterMembership.jsonld | 7 +- .../metamodel/SatisfyRequirementUsage.jsonld | 9 + .../jsonld/metamodel/SelectExpression.jsonld | 10 +- .../jsonld/metamodel/SendActionUsage.jsonld | 9 + public/jsonld/metamodel/SourceEnd.jsonld | 10 +- public/jsonld/metamodel/Specialization.jsonld | 2 + .../metamodel/StakeholderMembership.jsonld | 7 +- .../jsonld/metamodel/StateDefinition.jsonld | 8 + .../metamodel/StateSubactionMembership.jsonld | 7 +- public/jsonld/metamodel/StateUsage.jsonld | 9 + public/jsonld/metamodel/Step.jsonld | 10 +- public/jsonld/metamodel/Structure.jsonld | 9 +- .../jsonld/metamodel/Subclassification.jsonld | 2 + .../jsonld/metamodel/SubjectMembership.jsonld | 7 +- public/jsonld/metamodel/Subsetting.jsonld | 2 + public/jsonld/metamodel/Succession.jsonld | 11 +- .../jsonld/metamodel/SuccessionAsUsage.jsonld | 10 + .../SuccessionFlowConnectionUsage.jsonld | 13 + .../metamodel/SuccessionItemFlow.jsonld | 12 +- public/jsonld/metamodel/TargetEnd.jsonld | 10 +- .../metamodel/TextualRepresentation.jsonld | 1 + .../TransitionFeatureMembership.jsonld | 7 +- .../jsonld/metamodel/TransitionUsage.jsonld | 9 + .../TriggerInvocationExpression.jsonld | 10 +- public/jsonld/metamodel/Type.jsonld | 9 +- public/jsonld/metamodel/TypeFeaturing.jsonld | 6 +- public/jsonld/metamodel/Unioning.jsonld | 34 + public/jsonld/metamodel/Usage.jsonld | 9 + .../jsonld/metamodel/UseCaseDefinition.jsonld | 8 + public/jsonld/metamodel/UseCaseUsage.jsonld | 9 + .../jsonld/metamodel/VariantMembership.jsonld | 2 + .../VerificationCaseDefinition.jsonld | 8 + .../metamodel/VerificationCaseUsage.jsonld | 9 + public/jsonld/metamodel/ViewDefinition.jsonld | 8 + .../metamodel/ViewRenderingMembership.jsonld | 7 +- public/jsonld/metamodel/ViewUsage.jsonld | 9 + .../metamodel/ViewpointDefinition.jsonld | 8 + public/jsonld/metamodel/ViewpointUsage.jsonld | 9 + .../metamodel/WhileLoopActionUsage.jsonld | 9 + 536 files changed, 39961 insertions(+), 4116 deletions(-) create mode 100644 app/org/omg/sysml/metamodel/Differencing.java rename app/org/omg/sysml/metamodel/{PrefixComment.java => Featuring.java} (90%) create mode 100644 app/org/omg/sysml/metamodel/FlowConnectionDefinition.java create mode 100644 app/org/omg/sysml/metamodel/Intersecting.java create mode 100644 app/org/omg/sysml/metamodel/ReferenceSubsetting.java create mode 100644 app/org/omg/sysml/metamodel/Unioning.java create mode 100644 app/org/omg/sysml/metamodel/impl/DifferencingImpl.java rename app/org/omg/sysml/metamodel/impl/{PrefixCommentImpl.java => FeaturingImpl.java} (66%) create mode 100644 app/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl.java create mode 100644 app/org/omg/sysml/metamodel/impl/IntersectingImpl.java create mode 100644 app/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl.java create mode 100644 app/org/omg/sysml/metamodel/impl/UnioningImpl.java create mode 100644 generated/org/omg/sysml/metamodel/impl/DifferencingImpl_.java create mode 100644 generated/org/omg/sysml/metamodel/impl/FeaturingImpl_.java create mode 100644 generated/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl_.java create mode 100644 generated/org/omg/sysml/metamodel/impl/IntersectingImpl_.java delete mode 100644 generated/org/omg/sysml/metamodel/impl/PrefixCommentImpl_.java create mode 100644 generated/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl_.java create mode 100644 generated/org/omg/sysml/metamodel/impl/UnioningImpl_.java create mode 100644 public/jsonld/metamodel/Differencing.jsonld rename public/jsonld/metamodel/{PrefixComment.jsonld => Featuring.jsonld} (66%) create mode 100644 public/jsonld/metamodel/FlowConnectionDefinition.jsonld create mode 100644 public/jsonld/metamodel/Intersecting.jsonld create mode 100644 public/jsonld/metamodel/ReferenceSubsetting.jsonld create mode 100644 public/jsonld/metamodel/Unioning.jsonld diff --git a/app/org/omg/sysml/lifecycle/impl/package-info.java b/app/org/omg/sysml/lifecycle/impl/package-info.java index 5d5f51d6..6c9cd5c2 100644 --- a/app/org/omg/sysml/lifecycle/impl/package-info.java +++ b/app/org/omg/sysml/lifecycle/impl/package-info.java @@ -71,6 +71,7 @@ @MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class), @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class), @MetaValue(value = "Dependency", targetEntity = DependencyImpl.class), + @MetaValue(value = "Differencing", targetEntity = DifferencingImpl.class), @MetaValue(value = "Disjoining", targetEntity = DisjoiningImpl.class), @MetaValue(value = "Documentation", targetEntity = DocumentationImpl.class), @MetaValue(value = "Element", targetEntity = ElementImpl.class), @@ -90,6 +91,8 @@ @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class), @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class), @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class), + @MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class), @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class), @@ -101,6 +104,7 @@ @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class), + @MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class), @MetaValue(value = "Invariant", targetEntity = InvariantImpl.class), @MetaValue(value = "InvocationExpression", targetEntity = InvocationExpressionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @@ -143,8 +147,8 @@ @MetaValue(value = "PortUsage", targetEntity = PortUsageImpl.class), @MetaValue(value = "PortioningFeature", targetEntity = PortioningFeatureImpl.class), @MetaValue(value = "Predicate", targetEntity = PredicateImpl.class), - @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class), @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), @MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class), @MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class), @MetaValue(value = "RenderingDefinition", targetEntity = RenderingDefinitionImpl.class), @@ -180,6 +184,7 @@ @MetaValue(value = "TriggerInvocationExpression", targetEntity = TriggerInvocationExpressionImpl.class), @MetaValue(value = "Type", targetEntity = TypeImpl.class), @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), + @MetaValue(value = "Unioning", targetEntity = UnioningImpl.class), @MetaValue(value = "Usage", targetEntity = UsageImpl.class), @MetaValue(value = "UseCaseDefinition", targetEntity = UseCaseDefinitionImpl.class), @MetaValue(value = "UseCaseUsage", targetEntity = UseCaseUsageImpl.class), diff --git a/app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java b/app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java index a20bb8ae..8286c445 100644 --- a/app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java +++ b/app/org/omg/sysml/metamodel/BindingConnectorAsUsage.java @@ -26,6 +26,6 @@ import java.util.List; import java.util.Set; -public interface BindingConnectorAsUsage extends BindingConnector, ConnectorAsUsage, SysMLType { +public interface BindingConnectorAsUsage extends ConnectorAsUsage, BindingConnector, SysMLType { } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Connector.java b/app/org/omg/sysml/metamodel/Connector.java index 7aa6e0ce..b8b4e362 100644 --- a/app/org/omg/sysml/metamodel/Connector.java +++ b/app/org/omg/sysml/metamodel/Connector.java @@ -29,13 +29,13 @@ public interface Connector extends Feature, Relationship, SysMLType { List getRelatedFeature(); - Collection getAssociation(); + List getAssociation(); Boolean getIsDirected(); - Collection getConnectorEnd(); + List getConnectorEnd(); Feature getSourceFeature(); - Collection getTargetFeature(); + List getTargetFeature(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/ConnectorAsUsage.java b/app/org/omg/sysml/metamodel/ConnectorAsUsage.java index 94cd6530..7a3c61eb 100644 --- a/app/org/omg/sysml/metamodel/ConnectorAsUsage.java +++ b/app/org/omg/sysml/metamodel/ConnectorAsUsage.java @@ -26,6 +26,6 @@ import java.util.List; import java.util.Set; -public interface ConnectorAsUsage extends Connector, Usage, SysMLType { +public interface ConnectorAsUsage extends Usage, Connector, SysMLType { } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Definition.java b/app/org/omg/sysml/metamodel/Definition.java index f0166390..7a7ca3b4 100644 --- a/app/org/omg/sysml/metamodel/Definition.java +++ b/app/org/omg/sysml/metamodel/Definition.java @@ -88,4 +88,6 @@ public interface Definition extends Classifier, SysMLType { List getOwnedUseCase(); Collection getOwnedFlow(); + + List getOwnedMetadata(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Differencing.java b/app/org/omg/sysml/metamodel/Differencing.java new file mode 100644 index 00000000..e2472afc --- /dev/null +++ b/app/org/omg/sysml/metamodel/Differencing.java @@ -0,0 +1,33 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +public interface Differencing extends Relationship, SysMLType { + Type getTypeDifferenced(); + + Type getDifferencingType(); +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Element.java b/app/org/omg/sysml/metamodel/Element.java index 5f1a5a0c..d49c8489 100644 --- a/app/org/omg/sysml/metamodel/Element.java +++ b/app/org/omg/sysml/metamodel/Element.java @@ -51,9 +51,11 @@ public interface Element extends SysMLType { String getShortName(); - String getEffectiveName(); - String getName(); + String getEffectiveName(); + String getQualifiedName(); + + Boolean getIsImpliedIncluded(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Feature.java b/app/org/omg/sysml/metamodel/Feature.java index 027c62e6..a6b104b5 100644 --- a/app/org/omg/sysml/metamodel/Feature.java +++ b/app/org/omg/sysml/metamodel/Feature.java @@ -67,5 +67,7 @@ public interface Feature extends Type, SysMLType { FeatureDirectionKind getDirection(); + ReferenceSubsetting getOwnedReferenceSubsetting(); + Boolean getIsNonunique(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/FeatureMembership.java b/app/org/omg/sysml/metamodel/FeatureMembership.java index d9c019c4..4a069b2e 100644 --- a/app/org/omg/sysml/metamodel/FeatureMembership.java +++ b/app/org/omg/sysml/metamodel/FeatureMembership.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -public interface FeatureMembership extends OwningMembership, TypeFeaturing, SysMLType { +public interface FeatureMembership extends OwningMembership, Featuring, SysMLType { Type getOwningType(); Feature getOwnedMemberFeature(); diff --git a/app/org/omg/sysml/metamodel/PrefixComment.java b/app/org/omg/sysml/metamodel/Featuring.java similarity index 90% rename from app/org/omg/sysml/metamodel/PrefixComment.java rename to app/org/omg/sysml/metamodel/Featuring.java index b4419a6c..0aabbd6f 100644 --- a/app/org/omg/sysml/metamodel/PrefixComment.java +++ b/app/org/omg/sysml/metamodel/Featuring.java @@ -26,6 +26,8 @@ import java.util.List; import java.util.Set; -public interface PrefixComment extends Comment, SysMLType { +public interface Featuring extends Relationship, SysMLType { + Type getType(); + Feature getFeature(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/FlowConnectionDefinition.java b/app/org/omg/sysml/metamodel/FlowConnectionDefinition.java new file mode 100644 index 00000000..c0e78597 --- /dev/null +++ b/app/org/omg/sysml/metamodel/FlowConnectionDefinition.java @@ -0,0 +1,31 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +public interface FlowConnectionDefinition extends Interaction, ActionDefinition, ConnectionDefinition, SysMLType { + +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/FlowConnectionUsage.java b/app/org/omg/sysml/metamodel/FlowConnectionUsage.java index fc027be0..055a948c 100644 --- a/app/org/omg/sysml/metamodel/FlowConnectionUsage.java +++ b/app/org/omg/sysml/metamodel/FlowConnectionUsage.java @@ -26,6 +26,6 @@ import java.util.List; import java.util.Set; -public interface FlowConnectionUsage extends ItemFlow, ConnectionUsage, SysMLType { - +public interface FlowConnectionUsage extends ActionUsage, ItemFlow, ConnectionUsage, SysMLType { + List getFlowConnectionDefinition(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java b/app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java index b3e6d127..6137b807 100644 --- a/app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java +++ b/app/org/omg/sysml/metamodel/IncludeUseCaseUsage.java @@ -26,6 +26,6 @@ import java.util.List; import java.util.Set; -public interface IncludeUseCaseUsage extends UseCaseUsage, PerformActionUsage, SysMLType { +public interface IncludeUseCaseUsage extends PerformActionUsage, UseCaseUsage, SysMLType { UseCaseUsage getUseCaseIncluded(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Intersecting.java b/app/org/omg/sysml/metamodel/Intersecting.java new file mode 100644 index 00000000..3fbc88a7 --- /dev/null +++ b/app/org/omg/sysml/metamodel/Intersecting.java @@ -0,0 +1,33 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +public interface Intersecting extends Relationship, SysMLType { + Type getTypeIntersected(); + + Type getIntersectingType(); +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/ItemFlow.java b/app/org/omg/sysml/metamodel/ItemFlow.java index bed49fbe..c4c3b7fe 100644 --- a/app/org/omg/sysml/metamodel/ItemFlow.java +++ b/app/org/omg/sysml/metamodel/ItemFlow.java @@ -29,13 +29,15 @@ public interface ItemFlow extends Connector, Step, SysMLType { List getItemType(); - List getTargetInputFeature(); + Feature getTargetInputFeature(); - List getSourceOutputFeature(); + Feature getSourceOutputFeature(); Collection getItemFlowEnd(); - Collection getItemFeature(); + ItemFeature getItemFeature(); Collection getItemFlowFeature(); + + List getInteraction(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/MetadataUsage.java b/app/org/omg/sysml/metamodel/MetadataUsage.java index 3c63422a..f4ee9dce 100644 --- a/app/org/omg/sysml/metamodel/MetadataUsage.java +++ b/app/org/omg/sysml/metamodel/MetadataUsage.java @@ -26,6 +26,6 @@ import java.util.List; import java.util.Set; -public interface MetadataUsage extends ItemUsage, MetadataFeature, SysMLType { +public interface MetadataUsage extends MetadataFeature, ItemUsage, SysMLType { Metaclass getMetadataDefinition(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/ReferenceSubsetting.java b/app/org/omg/sysml/metamodel/ReferenceSubsetting.java new file mode 100644 index 00000000..66aa84d1 --- /dev/null +++ b/app/org/omg/sysml/metamodel/ReferenceSubsetting.java @@ -0,0 +1,33 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +public interface ReferenceSubsetting extends Subsetting, SysMLType { + Feature getReferencedFeature(); + + Feature getReferencingFeature(); +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Relationship.java b/app/org/omg/sysml/metamodel/Relationship.java index 7cd24e5d..f4431222 100644 --- a/app/org/omg/sysml/metamodel/Relationship.java +++ b/app/org/omg/sysml/metamodel/Relationship.java @@ -36,4 +36,6 @@ public interface Relationship extends Element, SysMLType { Element getOwningRelatedElement(); List getOwnedRelatedElement(); + + Boolean getIsImplied(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java b/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java index bb6b414d..3146a89a 100644 --- a/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java +++ b/app/org/omg/sysml/metamodel/SuccessionFlowConnectionUsage.java @@ -26,6 +26,6 @@ import java.util.List; import java.util.Set; -public interface SuccessionFlowConnectionUsage extends FlowConnectionUsage, SuccessionItemFlow, SysMLType { +public interface SuccessionFlowConnectionUsage extends SuccessionItemFlow, FlowConnectionUsage, SysMLType { } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Type.java b/app/org/omg/sysml/metamodel/Type.java index 47d1aeb1..247f9a0f 100644 --- a/app/org/omg/sysml/metamodel/Type.java +++ b/app/org/omg/sysml/metamodel/Type.java @@ -57,9 +57,21 @@ public interface Type extends Namespace, SysMLType { Multiplicity getMultiplicity(); - List getDirectedFeature(); + List getUnioningType(); + + List getOwnedIntersecting(); + + List getIntersectingType(); + + List getOwnedUnioning(); Collection getOwnedDisjoining(); List getFeatureMembership(); + + List getDifferencingType(); + + List getOwnedDifferencing(); + + List getDirectedFeature(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/TypeFeaturing.java b/app/org/omg/sysml/metamodel/TypeFeaturing.java index 4d0c365a..a287d55f 100644 --- a/app/org/omg/sysml/metamodel/TypeFeaturing.java +++ b/app/org/omg/sysml/metamodel/TypeFeaturing.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Set; -public interface TypeFeaturing extends Relationship, SysMLType { +public interface TypeFeaturing extends Featuring, SysMLType { Feature getFeatureOfType(); Type getFeaturingType(); diff --git a/app/org/omg/sysml/metamodel/Unioning.java b/app/org/omg/sysml/metamodel/Unioning.java new file mode 100644 index 00000000..34dcd888 --- /dev/null +++ b/app/org/omg/sysml/metamodel/Unioning.java @@ -0,0 +1,33 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel; + +import java.util.Collection; +import java.util.List; +import java.util.Set; + +public interface Unioning extends Relationship, SysMLType { + Type getTypeUnioned(); + + Type getUnioningType(); +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/Usage.java b/app/org/omg/sysml/metamodel/Usage.java index efd65dc2..43336ad4 100644 --- a/app/org/omg/sysml/metamodel/Usage.java +++ b/app/org/omg/sysml/metamodel/Usage.java @@ -96,4 +96,6 @@ public interface Usage extends Feature, SysMLType { Boolean getIsReference(); Collection getNestedFlow(); + + List getNestedMetadata(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java index e28d9ebc..7db18e01 100644 --- a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AcceptActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "AcceptActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "AcceptActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AcceptActionUsage") public OwningMembership getOwningMembership() { @@ -2469,6 +2666,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java index e5c196b0..b22b1ce7 100644 --- a/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ActionDefinitionImpl.java @@ -119,6 +119,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -415,6 +441,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -449,6 +501,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ActionDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -916,6 +984,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1150,6 +1244,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1228,6 +1348,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1512,6 +1658,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1663,11 +1835,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ActionDefinition") public OwningMembership getOwningMembership() { @@ -1838,6 +2012,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java index 75748597..055de449 100644 --- a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ActionUsage") public OwningMembership getOwningMembership() { @@ -2406,6 +2603,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java index 0a6aa699..34bc7a46 100644 --- a/app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ActorMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "ActorMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "ActorMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "ActorMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "ActorMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ActorMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -307,11 +320,13 @@ public void setName(String name) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedActorParameter") private PartUsage ownedActorParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "PartUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedActorParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedActorParameter_id", table = "ActorMembership") public PartUsage getOwnedActorParameter() { @@ -378,11 +393,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ActorMembership") public Element getOwnedMemberElement() { @@ -417,11 +434,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "ActorMembership") public Feature getOwnedMemberFeature() { @@ -456,11 +475,13 @@ public void setOwnedMemberName(String ownedMemberName) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberParameter") private Feature ownedMemberParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberParameter_id", table = "ActorMembership") public Feature getOwnedMemberParameter() { @@ -565,31 +586,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "ActorMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ActorMembership") public OwningMembership getOwningMembership() { @@ -822,6 +824,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "ActorMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java index c39428c8..e6f88571 100644 --- a/app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl.java @@ -171,6 +171,32 @@ public void setConnectionEnd(List connectionEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -467,6 +493,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -501,6 +553,38 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "AllocationDefinition") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AllocationDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -968,6 +1052,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1202,6 +1312,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1280,6 +1416,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1588,6 +1750,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1739,11 +1927,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AllocationDefinition") public OwningMembership getOwningMembership() { @@ -2028,6 +2218,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java index ccfa92cc..e41b6b89 100644 --- a/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AllocationUsageImpl.java @@ -121,7 +121,7 @@ public void setAllocationDefinition(List allocationDefinit // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -130,7 +130,7 @@ public void setAllocationDefinition(List allocationDefinit @JoinTable(name = "AllocationUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -139,7 +139,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -199,7 +199,7 @@ public void setConnectionDefinition(List connectionDefinit // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -208,7 +208,7 @@ public void setConnectionDefinition(List connectionDefinit @JoinTable(name = "AllocationUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -217,7 +217,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -249,6 +249,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -631,6 +657,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -729,6 +781,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "AllocationUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AllocationUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1332,6 +1416,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1769,6 +1879,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1977,6 +2113,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2055,6 +2217,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "AllocationUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2207,6 +2390,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2249,11 +2458,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "AllocationUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2268,11 +2479,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AllocationUsage") public OwningMembership getOwningMembership() { @@ -2614,7 +2827,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2623,7 +2836,7 @@ public void setTarget(List target) { @JoinTable(name = "AllocationUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2632,7 +2845,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2690,6 +2903,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AllocationUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java index ee93b665..b9268aa2 100644 --- a/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl.java @@ -197,6 +197,32 @@ public void setCalculation(List calculation) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -519,6 +545,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -553,6 +605,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AnalysisCaseDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1059,6 +1127,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1293,6 +1387,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1371,6 +1491,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1655,6 +1801,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1806,11 +1978,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AnalysisCaseDefinition") public OwningMembership getOwningMembership() { @@ -2044,6 +2218,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java index fbd78746..dde3d06e 100644 --- a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java @@ -312,6 +312,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -715,6 +741,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -797,6 +849,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AnalysisCaseUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1392,6 +1460,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1850,6 +1944,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2058,6 +2178,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2136,6 +2282,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "AnalysisCaseUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2264,6 +2431,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2306,11 +2499,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "AnalysisCaseUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2325,11 +2520,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AnalysisCaseUsage") public OwningMembership getOwningMembership() { @@ -2644,6 +2841,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java index 122215d3..f61393d4 100644 --- a/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AnnotatingElementImpl.java @@ -205,6 +205,22 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AnnotatingElement") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -320,11 +336,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AnnotatingElement") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java b/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java index 608d4513..eb8f2a8d 100644 --- a/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AnnotationImpl.java @@ -193,6 +193,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Annotation") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Annotation") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -353,11 +385,13 @@ public void setOwningAnnotatedElement(Element owningAnnotatedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Annotation") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java index 10fb64ec..f7b752da 100644 --- a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java @@ -213,6 +213,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -616,6 +642,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -698,6 +750,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AssertConstraintUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1309,6 +1377,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1746,6 +1840,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1954,6 +2074,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2032,6 +2178,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "AssertConstraintUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2160,6 +2327,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2202,11 +2395,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "AssertConstraintUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2221,11 +2416,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AssertConstraintUsage") public OwningMembership getOwningMembership() { @@ -2519,6 +2716,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl.java index d4a41034..b5b442b5 100644 --- a/app/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AssignmentActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "AssignmentActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "AssignmentActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AssignmentActionUsage") public OwningMembership getOwningMembership() { @@ -2448,6 +2645,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssignmentActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AssociationImpl.java b/app/org/omg/sysml/metamodel/impl/AssociationImpl.java index 0f097a63..bf66eb99 100644 --- a/app/org/omg/sysml/metamodel/impl/AssociationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AssociationImpl.java @@ -119,6 +119,32 @@ public void setAssociationEnd(Collection associationEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Association_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Association_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,38 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Association") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Association") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -603,6 +687,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Association_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -759,6 +869,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Association_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -911,6 +1047,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Association_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -932,11 +1094,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Association") public OwningMembership getOwningMembership() { @@ -1221,4 +1385,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Association_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/AssociationStructureImpl.java b/app/org/omg/sysml/metamodel/impl/AssociationStructureImpl.java index 469f3602..cbc99853 100644 --- a/app/org/omg/sysml/metamodel/impl/AssociationStructureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AssociationStructureImpl.java @@ -119,6 +119,32 @@ public void setAssociationEnd(Collection associationEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssociationStructure_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssociationStructure_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,38 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "AssociationStructure") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AssociationStructure") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -603,6 +687,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssociationStructure_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -759,6 +869,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssociationStructure_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -911,6 +1047,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssociationStructure_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -932,11 +1094,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AssociationStructure") public OwningMembership getOwningMembership() { @@ -1221,4 +1385,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AssociationStructure_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java index 1e8d3234..2fd93eff 100644 --- a/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AttributeDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -853,6 +921,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1087,6 +1181,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1165,6 +1285,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1449,6 +1595,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1600,11 +1772,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AttributeDefinition") public OwningMembership getOwningMembership() { @@ -1723,6 +1897,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java index 85135ec7..152c08a0 100644 --- a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java @@ -171,6 +171,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -532,6 +558,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -614,6 +666,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "AttributeUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1173,6 +1241,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1584,6 +1678,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1792,6 +1912,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1870,6 +2016,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "AttributeUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1998,6 +2165,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2040,11 +2233,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "AttributeUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2059,11 +2254,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "AttributeUsage") public OwningMembership getOwningMembership() { @@ -2250,6 +2447,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java b/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java index 2ba59d86..d8fa5b4c 100644 --- a/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BehaviorImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Behavior_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Behavior_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Behavior") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Behavior_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Behavior_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Behavior_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Behavior") public OwningMembership getOwningMembership() { @@ -1057,4 +1205,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Behavior_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl.java b/app/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl.java index e535bd46..b91d7340 100644 --- a/app/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "BindingConnectorAsUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -147,7 +147,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -156,7 +156,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "BindingConnectorAsUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -165,7 +165,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -558,6 +584,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -656,6 +708,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "BindingConnectorAsUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "BindingConnectorAsUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1217,6 +1301,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1628,6 +1738,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1836,6 +1972,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1914,6 +2076,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "BindingConnectorAsUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2066,6 +2249,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2108,11 +2317,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "BindingConnectorAsUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2127,11 +2338,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "BindingConnectorAsUsage") public OwningMembership getOwningMembership() { @@ -2408,7 +2621,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2417,7 +2630,7 @@ public void setTarget(List target) { @JoinTable(name = "BindingConnectorAsUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2426,7 +2639,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2484,6 +2697,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnectorAsUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java index 57795b9e..d7420386 100644 --- a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "BindingConnector_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -147,7 +147,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -156,7 +156,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "BindingConnector_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -165,12 +165,38 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -506,6 +532,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -604,6 +656,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "BindingConnector") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "BindingConnector") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -866,6 +950,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1074,6 +1184,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1152,6 +1288,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "BindingConnector") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -1304,6 +1461,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1325,11 +1508,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "BindingConnector") public FeatureMembership getOwningFeatureMembership() { @@ -1344,11 +1529,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "BindingConnector") public OwningMembership getOwningMembership() { @@ -1604,7 +1791,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -1613,7 +1800,7 @@ public void setTarget(List target) { @JoinTable(name = "BindingConnector_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -1622,7 +1809,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -1680,4 +1867,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java index 93166ed0..40cfa3db 100644 --- a/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "BooleanExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "BooleanExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "BooleanExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "BooleanExpression") public OwningMembership getOwningMembership() { @@ -1555,4 +1726,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java index 3083a50c..6bc7ebe9 100644 --- a/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl.java @@ -145,6 +145,32 @@ public void setCalculation(List calculation) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -467,6 +493,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -501,6 +553,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "CalculationDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -986,6 +1054,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1220,6 +1314,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1298,6 +1418,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1582,6 +1728,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1733,11 +1905,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "CalculationDefinition") public OwningMembership getOwningMembership() { @@ -1929,6 +2103,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java index 4ab85e4f..86a28a49 100644 --- a/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java @@ -218,6 +218,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -621,6 +647,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -703,6 +755,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "CalculationUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1298,6 +1366,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1735,6 +1829,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1943,6 +2063,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2021,6 +2167,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "CalculationUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2149,6 +2316,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2191,11 +2384,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "CalculationUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2210,11 +2405,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "CalculationUsage") public OwningMembership getOwningMembership() { @@ -2487,6 +2684,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java index 4c63a661..f46e21c9 100644 --- a/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CaseDefinitionImpl.java @@ -171,6 +171,32 @@ public void setCalculation(List calculation) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -493,6 +519,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -527,6 +579,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "CaseDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1033,6 +1101,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1267,6 +1361,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1345,6 +1465,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1629,6 +1775,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1780,11 +1952,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "CaseDefinition") public OwningMembership getOwningMembership() { @@ -1997,6 +2171,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java index f190a1b7..7b4501e5 100644 --- a/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java @@ -265,6 +265,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -668,6 +694,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -750,6 +802,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "CaseUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1345,6 +1413,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1803,6 +1897,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2011,6 +2131,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2089,6 +2235,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "CaseUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2217,6 +2384,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2259,11 +2452,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "CaseUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2278,11 +2473,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "CaseUsage") public OwningMembership getOwningMembership() { @@ -2576,6 +2773,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ClassImpl.java b/app/org/omg/sysml/metamodel/impl/ClassImpl.java index 4f158d5d..d96a45f1 100644 --- a/app/org/omg/sysml/metamodel/impl/ClassImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ClassImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Class_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Class_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Class") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Class_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Class_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Class_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Class") public OwningMembership getOwningMembership() { @@ -1005,4 +1153,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Class_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java b/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java index 19433e1e..696b8656 100644 --- a/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ClassifierImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Classifier_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Classifier_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Classifier") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Classifier_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Classifier_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Classifier_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Classifier") public OwningMembership getOwningMembership() { @@ -1005,4 +1153,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Classifier_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/CollectExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/CollectExpressionImpl.java index 6d376e9d..2b7b4e1f 100644 --- a/app/org/omg/sysml/metamodel/impl/CollectExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CollectExpressionImpl.java @@ -171,6 +171,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CollectExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CollectExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "CollectExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -933,6 +1001,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CollectExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1141,6 +1235,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CollectExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1219,6 +1339,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "CollectExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1347,6 +1488,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CollectExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1368,11 +1535,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "CollectExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1387,11 +1556,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "CollectExpression") public OwningMembership getOwningMembership() { @@ -1604,4 +1775,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "CollectExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/CommentImpl.java b/app/org/omg/sysml/metamodel/impl/CommentImpl.java index 7bc275db..e11205e9 100644 --- a/app/org/omg/sysml/metamodel/impl/CommentImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CommentImpl.java @@ -223,6 +223,22 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Comment") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("locale") private String locale; @@ -356,11 +372,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Comment") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl.java index a10024db..10c0f9e3 100644 --- a/app/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl.java @@ -145,6 +145,32 @@ public void setAssumedConstraint(List assumedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -493,6 +519,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -527,6 +579,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConcernDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1012,6 +1080,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1246,6 +1340,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1324,6 +1444,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1608,6 +1754,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1759,11 +1931,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConcernDefinition") public OwningMembership getOwningMembership() { @@ -2071,6 +2245,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConcernUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConcernUsageImpl.java index 7439ec7a..19c417b9 100644 --- a/app/org/omg/sysml/metamodel/impl/ConcernUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConcernUsageImpl.java @@ -265,6 +265,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -694,6 +720,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -776,6 +828,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConcernUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1371,6 +1439,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1808,6 +1902,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2016,6 +2136,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2094,6 +2240,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ConcernUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2222,6 +2389,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2264,11 +2457,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ConcernUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2283,11 +2478,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConcernUsage") public OwningMembership getOwningMembership() { @@ -2718,6 +2915,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConcernUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java index ba297dfa..77068ba6 100644 --- a/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl.java @@ -114,6 +114,32 @@ public void setConjugatedPortDefinition(ConjugatedPortDefinition conjugatedPortD + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -410,6 +436,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -444,6 +496,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConjugatedPortDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -932,6 +1000,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1166,6 +1260,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1244,6 +1364,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1549,6 +1695,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1700,11 +1872,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConjugatedPortDefinition") public OwningMembership getOwningMembership() { @@ -1823,6 +1997,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConjugatedPortDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java b/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java index caa14752..9eb19d7d 100644 --- a/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl.java @@ -195,6 +195,38 @@ public void setGeneral(Type general) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ConjugatedPortTyping") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConjugatedPortTyping") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -355,11 +387,13 @@ public void setOwningFeature(Feature owningFeature) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConjugatedPortTyping") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java b/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java index 4b4049f7..b4e066ec 100644 --- a/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConjugationImpl.java @@ -174,6 +174,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Conjugation") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Conjugation") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -332,11 +364,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Conjugation") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java index 5cbbf03c..0c975f85 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java @@ -145,6 +145,32 @@ public void setConnectionEnd(List connectionEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -441,6 +467,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -475,6 +527,38 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ConnectionDefinition") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConnectionDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -942,6 +1026,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1176,6 +1286,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1254,6 +1390,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1562,6 +1724,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1713,11 +1901,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConnectionDefinition") public OwningMembership getOwningMembership() { @@ -2002,6 +2192,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java index d23eef20..2ff05a47 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "ConnectionUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -173,7 +173,7 @@ public void setConnectionDefinition(List connectionDefinit // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -182,7 +182,7 @@ public void setConnectionDefinition(List connectionDefinit @JoinTable(name = "ConnectionUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -191,7 +191,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -223,6 +223,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -605,6 +631,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -703,6 +755,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ConnectionUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConnectionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1306,6 +1390,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1743,6 +1853,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1951,6 +2087,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2029,6 +2191,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ConnectionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2181,6 +2364,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2223,11 +2432,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ConnectionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2242,11 +2453,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConnectionUsage") public OwningMembership getOwningMembership() { @@ -2588,7 +2801,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2597,7 +2810,7 @@ public void setTarget(List target) { @JoinTable(name = "ConnectionUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2606,7 +2819,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2664,6 +2877,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl.java index 5e515d37..b49b6346 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "ConnectorAsUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -147,7 +147,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -156,7 +156,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "ConnectorAsUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -165,7 +165,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -558,6 +584,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -656,6 +708,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ConnectorAsUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConnectorAsUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1217,6 +1301,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1628,6 +1738,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1836,6 +1972,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1914,6 +2076,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ConnectorAsUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2066,6 +2249,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2108,11 +2317,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ConnectorAsUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2127,11 +2338,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConnectorAsUsage") public OwningMembership getOwningMembership() { @@ -2408,7 +2621,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2417,7 +2630,7 @@ public void setTarget(List target) { @JoinTable(name = "ConnectorAsUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2426,7 +2639,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2484,6 +2697,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectorAsUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java index e14c4b18..37f1c7bc 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "Connector_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -147,7 +147,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -156,7 +156,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "Connector_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -165,12 +165,38 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -506,6 +532,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -604,6 +656,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Connector") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Connector") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -866,6 +950,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1074,6 +1184,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1152,6 +1288,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Connector") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -1304,6 +1461,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1325,11 +1508,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Connector") public FeatureMembership getOwningFeatureMembership() { @@ -1344,11 +1529,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Connector") public OwningMembership getOwningMembership() { @@ -1604,7 +1791,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -1613,7 +1800,7 @@ public void setTarget(List target) { @JoinTable(name = "Connector_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -1622,7 +1809,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -1680,4 +1867,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java index 7ec802f5..a2746847 100644 --- a/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -415,6 +441,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -449,6 +501,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConstraintDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -934,6 +1002,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1168,6 +1262,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1246,6 +1366,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1530,6 +1676,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1681,11 +1853,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConstraintDefinition") public OwningMembership getOwningMembership() { @@ -1877,6 +2051,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java index e1a3506d..b4efc93c 100644 --- a/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java @@ -192,6 +192,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -595,6 +621,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -677,6 +729,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ConstraintUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1272,6 +1340,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1709,6 +1803,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1917,6 +2037,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1995,6 +2141,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ConstraintUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2123,6 +2290,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2165,11 +2358,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ConstraintUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2184,11 +2379,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ConstraintUsage") public OwningMembership getOwningMembership() { @@ -2482,6 +2679,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java b/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java index 4f2a75d9..b12d22fd 100644 --- a/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ControlNode") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ControlNode") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ControlNode") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ControlNode") public OwningMembership getOwningMembership() { @@ -2406,6 +2603,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java b/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java index f59c3132..cdf1eb90 100644 --- a/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DataTypeImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DataType_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DataType_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "DataType") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DataType_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DataType_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DataType_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "DataType") public OwningMembership getOwningMembership() { @@ -1005,4 +1153,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DataType_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java b/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java index 899c8b60..4a09d0fd 100644 --- a/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "DecisionNode") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "DecisionNode") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "DecisionNode") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "DecisionNode") public OwningMembership getOwningMembership() { @@ -2406,6 +2603,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java index 9dd41e51..53b1bfa6 100644 --- a/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Definition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -853,6 +921,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1087,6 +1181,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1165,6 +1285,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1449,6 +1595,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1600,11 +1772,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Definition") public OwningMembership getOwningMembership() { @@ -1723,6 +1897,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Definition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/DependencyImpl.java b/app/org/omg/sysml/metamodel/impl/DependencyImpl.java index ae25edf2..713e7e16 100644 --- a/app/org/omg/sysml/metamodel/impl/DependencyImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DependencyImpl.java @@ -179,6 +179,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Dependency") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Dependency") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -318,11 +350,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Dependency") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/DifferencingImpl.java b/app/org/omg/sysml/metamodel/impl/DifferencingImpl.java new file mode 100644 index 00000000..78b06c67 --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/DifferencingImpl.java @@ -0,0 +1,587 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel.impl; + +import org.omg.sysml.metamodel.*; + +import org.omg.sysml.metamodel.Package; +import org.omg.sysml.metamodel.Class; + +import jackson.DataSerializer; +import jackson.DataDeserializer; + +import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import org.hibernate.annotations.Any; +import org.hibernate.annotations.ManyToAny; +import org.hibernate.annotations.FetchMode; + +// import info.archinnov.achilles.annotations.UDT; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.EnumType; +import javax.persistence.ElementCollection; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Lob; +import javax.persistence.FetchType; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Table; +import javax.persistence.SecondaryTable; +import javax.persistence.CollectionTable; + +import java.util.Collection; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +@Entity(name = "DifferencingImpl") +@SecondaryTable(name = "Differencing") +@org.hibernate.annotations.Table(appliesTo = "Differencing", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "Differencing") +@DiscriminatorValue(value = "Differencing") +@JsonTypeName(value = "Differencing") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class DifferencingImpl extends SysMLTypeImpl implements Differencing { + // @info.archinnov.achilles.annotations.Column("aliasIds") + private List aliasIds; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "Differencing_aliasIds", + joinColumns = @JoinColumn(name = "Differencing_id")) + public List getAliasIds() { + if (aliasIds == null) { + aliasIds = new ArrayList<>(); + } + return aliasIds; + } + + @JsonSetter + public void setAliasIds(List aliasIds) { + this.aliasIds = aliasIds; + } + + + + // @info.archinnov.achilles.annotations.Column("differencingType") + private Type differencingType; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "differencingType_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "differencingType_id", table = "Differencing") + public Type getDifferencingType() { + return differencingType; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setDifferencingType(Type differencingType) { + this.differencingType = differencingType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentation") + private List documentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_documentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(List documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("effectiveName") + private String effectiveName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "effectiveName", table = "Differencing") + public String getEffectiveName() { + return effectiveName; + } + + @JsonSetter + public void setEffectiveName(String effectiveName) { + this.effectiveName = effectiveName; + } + + + + // @info.archinnov.achilles.annotations.Column("elementId") + private java.util.UUID elementId; + + @JsonGetter + @javax.persistence.Column(name = "elementId", table = "Differencing") + public java.util.UUID getElementId() { + return elementId; + } + + @JsonSetter + public void setElementId(java.util.UUID elementId) { + this.elementId = elementId; + } + + + + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Differencing") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Differencing") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "name", table = "Differencing") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private List ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_ownedAnnotation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(List ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private List ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_ownedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(List ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_ownedRelatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_ownedRelationship", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owner_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owner_id", table = "Differencing") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningMembership") + private OwningMembership owningMembership; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembership_id", table = "Differencing") + public OwningMembership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = OwningMembershipImpl.class) + public void setOwningMembership(OwningMembership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Namespace owningNamespace; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespace_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespace_id", table = "Differencing") + public Namespace getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class) + public void setOwningNamespace(Namespace owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElement_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElement_id", table = "Differencing") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationship_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationship_id", table = "Differencing") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("qualifiedName") + private String qualifiedName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "qualifiedName", table = "Differencing") + public String getQualifiedName() { + return qualifiedName; + } + + @JsonSetter + public void setQualifiedName(String qualifiedName) { + this.qualifiedName = qualifiedName; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_relatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("shortName") + private String shortName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "shortName", table = "Differencing") + public String getShortName() { + return shortName; + } + + @JsonSetter + public void setShortName(String shortName) { + this.shortName = shortName; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_source", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_target", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("textualRepresentation") + private List textualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Differencing_textualRepresentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTextualRepresentation() { + if (textualRepresentation == null) { + textualRepresentation = new ArrayList<>(); + } + return textualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setTextualRepresentation(List textualRepresentation) { + this.textualRepresentation = textualRepresentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("typeDifferenced") + private Type typeDifferenced; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "typeDifferenced_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "typeDifferenced_id", table = "Differencing") + public Type getTypeDifferenced() { + return typeDifferenced; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setTypeDifferenced(Type typeDifferenced) { + this.typeDifferenced = typeDifferenced; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/DisjoiningImpl.java b/app/org/omg/sysml/metamodel/impl/DisjoiningImpl.java index db0c4ace..2c6c3b91 100644 --- a/app/org/omg/sysml/metamodel/impl/DisjoiningImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DisjoiningImpl.java @@ -174,6 +174,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Disjoining") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Disjoining") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -313,11 +345,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Disjoining") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java b/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java index 4df34423..5d584cb6 100644 --- a/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DocumentationImpl.java @@ -244,6 +244,22 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Documentation") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("locale") private String locale; @@ -377,11 +393,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Documentation") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl.java index 68675167..e2ae67ea 100644 --- a/app/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl.java @@ -93,11 +93,13 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("condition") private Expression condition; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "condition_type"), fetch = FetchType.LAZY) @JoinColumn(name = "condition_id", table = "ElementFilterMembership") public Expression getCondition() { @@ -174,6 +176,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ElementFilterMembership") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ElementFilterMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("memberElement") private Element memberElement; @@ -340,11 +374,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ElementFilterMembership") public Element getOwnedMemberElement() { @@ -488,11 +524,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ElementFilterMembership") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ElementImpl.java b/app/org/omg/sysml/metamodel/impl/ElementImpl.java index 34571c89..21961f51 100644 --- a/app/org/omg/sysml/metamodel/impl/ElementImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ElementImpl.java @@ -155,6 +155,22 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Element") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -270,11 +286,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Element") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java index e2c10a55..fff16066 100644 --- a/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "EndFeatureMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "EndFeatureMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "EndFeatureMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "EndFeatureMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "EndFeatureMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "EndFeatureMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "EndFeatureMembership") public Feature getOwnedMemberFeature() { @@ -527,31 +544,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "EndFeatureMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "EndFeatureMembership") public OwningMembership getOwningMembership() { @@ -784,6 +782,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "EndFeatureMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java index fac82e28..49e174b6 100644 --- a/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -415,6 +441,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -449,6 +501,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "EnumerationDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -879,6 +947,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1113,6 +1207,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1191,6 +1311,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1475,6 +1621,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1626,11 +1798,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "EnumerationDefinition") public OwningMembership getOwningMembership() { @@ -1749,6 +1923,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/EnumerationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/EnumerationUsageImpl.java index 2eaca26d..d8f99970 100644 --- a/app/org/omg/sysml/metamodel/impl/EnumerationUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/EnumerationUsageImpl.java @@ -171,6 +171,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -553,6 +579,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -635,6 +687,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "EnumerationUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1194,6 +1262,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1605,6 +1699,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1813,6 +1933,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1891,6 +2037,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "EnumerationUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2019,6 +2186,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2061,11 +2254,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "EnumerationUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2080,11 +2275,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "EnumerationUsage") public OwningMembership getOwningMembership() { @@ -2271,6 +2468,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EnumerationUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl.java index 412836f0..460f2028 100644 --- a/app/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -548,6 +574,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -630,6 +682,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "EventOccurrenceUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1207,6 +1275,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1644,6 +1738,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1852,6 +1972,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1930,6 +2076,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "EventOccurrenceUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2058,6 +2225,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2100,11 +2293,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "EventOccurrenceUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2119,11 +2314,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "EventOccurrenceUsage") public OwningMembership getOwningMembership() { @@ -2349,6 +2546,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "EventOccurrenceUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java index 108e5089..28e3a689 100644 --- a/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -684,6 +710,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -766,6 +818,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ExhibitStateUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1359,6 +1427,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1796,6 +1890,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2004,6 +2124,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2082,6 +2228,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ExhibitStateUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2210,6 +2377,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2252,11 +2445,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ExhibitStateUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2271,11 +2466,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ExhibitStateUsage") public OwningMembership getOwningMembership() { @@ -2574,6 +2771,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ExposeImpl.java b/app/org/omg/sysml/metamodel/impl/ExposeImpl.java index e3f97def..618f6676 100644 --- a/app/org/omg/sysml/metamodel/impl/ExposeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ExposeImpl.java @@ -213,6 +213,38 @@ public void setImportedNamespace(Namespace importedNamespace) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Expose") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Expose") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isImportAll") private Boolean isImportAll; @@ -384,11 +416,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Expose") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java index 7898dc9b..d747eeeb 100644 --- a/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Expression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Expression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Expression") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Expression") public OwningMembership getOwningMembership() { @@ -1534,4 +1705,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl.java index c6067055..63340ab0 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl.java @@ -171,6 +171,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureChainExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureChainExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureChainExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -933,6 +1001,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureChainExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1141,6 +1235,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureChainExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1219,6 +1339,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "FeatureChainExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1347,6 +1488,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureChainExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1368,11 +1535,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "FeatureChainExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1387,11 +1556,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureChainExpression") public OwningMembership getOwningMembership() { @@ -1625,4 +1796,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureChainExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/FeatureChainingImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureChainingImpl.java index d519ef9a..90fc96ea 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureChainingImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureChainingImpl.java @@ -195,6 +195,38 @@ public void setFeatureChained(Feature featureChained) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "FeatureChaining") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureChaining") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -334,11 +366,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureChaining") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/FeatureImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureImpl.java index d08d2eeb..cc20620c 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Feature") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Feature") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Feature") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Feature") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/FeatureInvertingImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureInvertingImpl.java index 78562352..58890296 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureInvertingImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureInvertingImpl.java @@ -193,6 +193,38 @@ public void setInvertingFeature(Feature invertingFeature) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "FeatureInverting") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureInverting") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -353,11 +385,13 @@ public void setOwningFeature(Feature owningFeature) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureInverting") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java index 743c6302..f7f836d4 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "FeatureMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "FeatureMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "FeatureMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "FeatureMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "FeatureMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "FeatureMembership") public Feature getOwnedMemberFeature() { @@ -527,31 +544,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "FeatureMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureMembership") public OwningMembership getOwningMembership() { @@ -784,6 +782,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "FeatureMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java index a05c6f9b..a7ab4811 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureReferenceExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "FeatureReferenceExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "FeatureReferenceExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureReferenceExpression") public OwningMembership getOwningMembership() { @@ -1555,4 +1726,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/FeatureTypingImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureTypingImpl.java index 805af3c1..164ac61a 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureTypingImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureTypingImpl.java @@ -174,6 +174,38 @@ public void setGeneral(Type general) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "FeatureTyping") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureTyping") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -334,11 +366,13 @@ public void setOwningFeature(Feature owningFeature) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureTyping") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java index bd30596d..cf4ebbaa 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java @@ -192,6 +192,38 @@ public void setIsDefault(Boolean isDefault) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "FeatureValue") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FeatureValue") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isInitial") private Boolean isInitial; @@ -374,11 +406,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "FeatureValue") public Element getOwnedMemberElement() { @@ -522,11 +556,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FeatureValue") public OwningMembership getOwningMembership() { @@ -738,11 +774,13 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("value") private Expression value; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "value_type"), fetch = FetchType.LAZY) @JoinColumn(name = "value_id", table = "FeatureValue") public Expression getValue() { diff --git a/app/org/omg/sysml/metamodel/impl/PrefixCommentImpl.java b/app/org/omg/sysml/metamodel/impl/FeaturingImpl.java similarity index 66% rename from app/org/omg/sysml/metamodel/impl/PrefixCommentImpl.java rename to app/org/omg/sysml/metamodel/impl/FeaturingImpl.java index b08d599f..52212a12 100644 --- a/app/org/omg/sysml/metamodel/impl/PrefixCommentImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeaturingImpl.java @@ -62,14 +62,14 @@ import java.util.Set; import java.util.HashSet; -@Entity(name = "PrefixCommentImpl") -@SecondaryTable(name = "PrefixComment") -@org.hibernate.annotations.Table(appliesTo = "PrefixComment", fetch = FetchMode.SELECT, optional = false) -// @info.archinnov.achilles.annotations.Table(table = "PrefixComment") -@DiscriminatorValue(value = "PrefixComment") -@JsonTypeName(value = "PrefixComment") +@Entity(name = "FeaturingImpl") +@SecondaryTable(name = "Featuring") +@org.hibernate.annotations.Table(appliesTo = "Featuring", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "Featuring") +@DiscriminatorValue(value = "Featuring") +@JsonTypeName(value = "Featuring") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME) -public class PrefixCommentImpl extends SysMLTypeImpl implements PrefixComment { +public abstract class FeaturingImpl extends SysMLTypeImpl implements Featuring { // @info.archinnov.achilles.annotations.Column("aliasIds") private List aliasIds; @@ -77,8 +77,8 @@ public class PrefixCommentImpl extends SysMLTypeImpl implements PrefixComment { @Lob @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") @ElementCollection(targetClass = String.class) - @CollectionTable(name = "PrefixComment_aliasIds", - joinColumns = @JoinColumn(name = "PrefixComment_id")) + @CollectionTable(name = "Featuring_aliasIds", + joinColumns = @JoinColumn(name = "Featuring_id")) public List getAliasIds() { if (aliasIds == null) { aliasIds = new ArrayList<>(); @@ -93,74 +93,6 @@ public void setAliasIds(List aliasIds) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("annotatedElement") - private List annotatedElement; - - @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_annotatedElement", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getAnnotatedElement() { - if (annotatedElement == null) { - annotatedElement = new ArrayList<>(); - } - return annotatedElement; - } - - @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) - public void setAnnotatedElement(List annotatedElement) { - this.annotatedElement = annotatedElement; - } - - - - // @info.archinnov.achilles.annotations.Column("annotation") - private List annotation; - - @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) - @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_annotation", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getAnnotation() { - if (annotation == null) { - annotation = new ArrayList<>(); - } - return annotation; - } - - @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class) - public void setAnnotation(List annotation) { - this.annotation = annotation; - } - - - - // @info.archinnov.achilles.annotations.Column("body") - private String body; - - @JsonGetter - @Lob - @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") - @javax.persistence.Column(name = "body", table = "PrefixComment") - public String getBody() { - return body; - } - - @JsonSetter - public void setBody(String body) { - this.body = body; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("documentation") private List documentation; @@ -169,7 +101,7 @@ public void setBody(String body) { @JsonSerialize(contentUsing = DataSerializer.class) // @javax.persistence.Transient @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_documentation", + @JoinTable(name = "Featuring_documentation", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) public List getDocumentation() { @@ -195,7 +127,7 @@ public void setDocumentation(List documentation) { @Lob @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") // @javax.persistence.Transient - @javax.persistence.Column(name = "effectiveName", table = "PrefixComment") + @javax.persistence.Column(name = "effectiveName", table = "Featuring") public String getEffectiveName() { return effectiveName; } @@ -211,7 +143,7 @@ public void setEffectiveName(String effectiveName) { private java.util.UUID elementId; @JsonGetter - @javax.persistence.Column(name = "elementId", table = "PrefixComment") + @javax.persistence.Column(name = "elementId", table = "Featuring") public java.util.UUID getElementId() { return elementId; } @@ -223,20 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("locale") - private String locale; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter - @Lob - @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") - @javax.persistence.Column(name = "locale", table = "PrefixComment") - public String getLocale() { - return locale; + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "Featuring") + public Feature getFeature() { + return feature; } @JsonSetter - public void setLocale(String locale) { - this.locale = locale; + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setFeature(Feature feature) { + this.feature = feature; + } + + + + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Featuring") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Featuring") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -247,7 +212,7 @@ public void setLocale(String locale) { @JsonGetter @Lob @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") - @javax.persistence.Column(name = "name", table = "PrefixComment") + @javax.persistence.Column(name = "name", table = "Featuring") public String getName() { return name; } @@ -267,7 +232,7 @@ public void setName(String name) { @JsonSerialize(contentUsing = DataSerializer.class) // @javax.persistence.Transient @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_ownedAnnotation", + @JoinTable(name = "Featuring_ownedAnnotation", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) public List getOwnedAnnotation() { @@ -293,7 +258,7 @@ public void setOwnedAnnotation(List ownedAnnotation) { @JsonSerialize(contentUsing = DataSerializer.class) // @javax.persistence.Transient @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_ownedElement", + @JoinTable(name = "Featuring_ownedElement", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) public List getOwnedElement() { @@ -311,13 +276,37 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Featuring_ownedRelatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_ownedRelationship", + @JoinTable(name = "Featuring_ownedRelationship", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) public List getOwnedRelationship() { @@ -343,7 +332,7 @@ public void setOwnedRelationship(List ownedRelationship) { @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owner_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owner_id", table = "PrefixComment") + @JoinColumn(name = "owner_id", table = "Featuring") public Element getOwner() { return owner; } @@ -356,13 +345,15 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningMembership_id", table = "PrefixComment") + @JoinColumn(name = "owningMembership_id", table = "Featuring") public OwningMembership getOwningMembership() { return owningMembership; } @@ -383,7 +374,7 @@ public void setOwningMembership(OwningMembership owningMembership) { @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespace_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningNamespace_id", table = "PrefixComment") + @JoinColumn(name = "owningNamespace_id", table = "Featuring") public Namespace getOwningNamespace() { return owningNamespace; } @@ -396,13 +387,32 @@ public void setOwningNamespace(Namespace owningNamespace) { + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElement_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElement_id", table = "Featuring") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") private Relationship owningRelationship; @JsonGetter @JsonSerialize(using = DataSerializer.class) @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationship_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningRelationship_id", table = "PrefixComment") + @JoinColumn(name = "owningRelationship_id", table = "Featuring") public Relationship getOwningRelationship() { return owningRelationship; } @@ -423,7 +433,7 @@ public void setOwningRelationship(Relationship owningRelationship) { @Lob @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") // @javax.persistence.Transient - @javax.persistence.Column(name = "qualifiedName", table = "PrefixComment") + @javax.persistence.Column(name = "qualifiedName", table = "Featuring") public String getQualifiedName() { return qualifiedName; } @@ -435,13 +445,39 @@ public void setQualifiedName(String qualifiedName) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Featuring_relatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + // @info.archinnov.achilles.annotations.Column("shortName") private String shortName; @JsonGetter @Lob @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") - @javax.persistence.Column(name = "shortName", table = "PrefixComment") + @javax.persistence.Column(name = "shortName", table = "Featuring") public String getShortName() { return shortName; } @@ -453,6 +489,54 @@ public void setShortName(String shortName) { + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Featuring_source", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Featuring_target", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("textualRepresentation") private List textualRepresentation; @@ -461,7 +545,7 @@ public void setShortName(String shortName) { @JsonSerialize(contentUsing = DataSerializer.class) // @javax.persistence.Transient @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "PrefixComment_textualRepresentation", + @JoinTable(name = "Featuring_textualRepresentation", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) public List getTextualRepresentation() { @@ -479,4 +563,23 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "Featuring") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl.java new file mode 100644 index 00000000..f10af310 --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl.java @@ -0,0 +1,2377 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel.impl; + +import org.omg.sysml.metamodel.*; + +import org.omg.sysml.metamodel.Package; +import org.omg.sysml.metamodel.Class; + +import jackson.DataSerializer; +import jackson.DataDeserializer; + +import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import org.hibernate.annotations.Any; +import org.hibernate.annotations.ManyToAny; +import org.hibernate.annotations.FetchMode; + +// import info.archinnov.achilles.annotations.UDT; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.EnumType; +import javax.persistence.ElementCollection; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Lob; +import javax.persistence.FetchType; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Table; +import javax.persistence.SecondaryTable; +import javax.persistence.CollectionTable; + +import java.util.Collection; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +@Entity(name = "FlowConnectionDefinitionImpl") +@SecondaryTable(name = "FlowConnectionDefinition") +@org.hibernate.annotations.Table(appliesTo = "FlowConnectionDefinition", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "FlowConnectionDefinition") +@DiscriminatorValue(value = "FlowConnectionDefinition") +@JsonTypeName(value = "FlowConnectionDefinition") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class FlowConnectionDefinitionImpl extends SysMLTypeImpl implements FlowConnectionDefinition { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("action") + private List action; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ActionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_action", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getAction() { + if (action == null) { + action = new ArrayList<>(); + } + return action; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ActionUsageImpl.class) + public void setAction(List action) { + this.action = action; + } + + + + // @info.archinnov.achilles.annotations.Column("aliasIds") + private List aliasIds; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "FlowConnectionDefinition_aliasIds", + joinColumns = @JoinColumn(name = "FlowConnectionDefinition_id")) + public List getAliasIds() { + if (aliasIds == null) { + aliasIds = new ArrayList<>(); + } + return aliasIds; + } + + @JsonSetter + public void setAliasIds(List aliasIds) { + this.aliasIds = aliasIds; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("associationEnd") + private Collection associationEnd; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_associationEnd", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getAssociationEnd() { + if (associationEnd == null) { + associationEnd = new ArrayList<>(); + } + return associationEnd; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setAssociationEnd(Collection associationEnd) { + this.associationEnd = associationEnd; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("connectionEnd") + private List connectionEnd; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_connectionEnd", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getConnectionEnd() { + if (connectionEnd == null) { + connectionEnd = new ArrayList<>(); + } + return connectionEnd; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UsageImpl.class) + public void setConnectionEnd(List connectionEnd) { + this.connectionEnd = connectionEnd; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("directedFeature") + private List directedFeature; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_directedFeature", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDirectedFeature() { + if (directedFeature == null) { + directedFeature = new ArrayList<>(); + } + return directedFeature; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setDirectedFeature(List directedFeature) { + this.directedFeature = directedFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("directedUsage") + private List directedUsage; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_directedUsage", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDirectedUsage() { + if (directedUsage == null) { + directedUsage = new ArrayList<>(); + } + return directedUsage; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UsageImpl.class) + public void setDirectedUsage(List directedUsage) { + this.directedUsage = directedUsage; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentation") + private List documentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_documentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(List documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("effectiveName") + private String effectiveName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "effectiveName", table = "FlowConnectionDefinition") + public String getEffectiveName() { + return effectiveName; + } + + @JsonSetter + public void setEffectiveName(String effectiveName) { + this.effectiveName = effectiveName; + } + + + + // @info.archinnov.achilles.annotations.Column("elementId") + private java.util.UUID elementId; + + @JsonGetter + @javax.persistence.Column(name = "elementId", table = "FlowConnectionDefinition") + public java.util.UUID getElementId() { + return elementId; + } + + @JsonSetter + public void setElementId(java.util.UUID elementId) { + this.elementId = elementId; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("endFeature") + private List endFeature; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_endFeature", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getEndFeature() { + if (endFeature == null) { + endFeature = new ArrayList<>(); + } + return endFeature; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setEndFeature(List endFeature) { + this.endFeature = endFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("feature") + private List feature; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_feature", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getFeature() { + if (feature == null) { + feature = new ArrayList<>(); + } + return feature; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setFeature(List feature) { + this.feature = feature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featureMembership") + private List featureMembership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_featureMembership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getFeatureMembership() { + if (featureMembership == null) { + featureMembership = new ArrayList<>(); + } + return featureMembership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureMembershipImpl.class) + public void setFeatureMembership(List featureMembership) { + this.featureMembership = featureMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("importedMembership") + private List importedMembership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_importedMembership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getImportedMembership() { + if (importedMembership == null) { + importedMembership = new ArrayList<>(); + } + return importedMembership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MembershipImpl.class) + public void setImportedMembership(List importedMembership) { + this.importedMembership = importedMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("inheritedFeature") + private List inheritedFeature; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_inheritedFeature", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInheritedFeature() { + if (inheritedFeature == null) { + inheritedFeature = new ArrayList<>(); + } + return inheritedFeature; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setInheritedFeature(List inheritedFeature) { + this.inheritedFeature = inheritedFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("inheritedMembership") + private List inheritedMembership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_inheritedMembership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInheritedMembership() { + if (inheritedMembership == null) { + inheritedMembership = new ArrayList<>(); + } + return inheritedMembership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MembershipImpl.class) + public void setInheritedMembership(List inheritedMembership) { + this.inheritedMembership = inheritedMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("input") + private List input; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_input", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInput() { + if (input == null) { + input = new ArrayList<>(); + } + return input; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setInput(List input) { + this.input = input; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + + // @info.archinnov.achilles.annotations.Column("isAbstract") + private Boolean isAbstract; + + @JsonGetter + @javax.persistence.Column(name = "isAbstract", table = "FlowConnectionDefinition") + public Boolean getIsAbstract() { + return isAbstract; + } + + @JsonSetter + public void setIsAbstract(Boolean isAbstract) { + this.isAbstract = isAbstract; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("isConjugated") + private Boolean isConjugated; + + @JsonGetter + // @javax.persistence.Transient + @javax.persistence.Column(name = "isConjugated", table = "FlowConnectionDefinition") + public Boolean getIsConjugated() { + return isConjugated; + } + + @JsonSetter + public void setIsConjugated(Boolean isConjugated) { + this.isConjugated = isConjugated; + } + + + + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "FlowConnectionDefinition") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FlowConnectionDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + + // @info.archinnov.achilles.annotations.Column("isIndividual") + private Boolean isIndividual; + + @JsonGetter + @javax.persistence.Column(name = "isIndividual", table = "FlowConnectionDefinition") + public Boolean getIsIndividual() { + return isIndividual; + } + + @JsonSetter + public void setIsIndividual(Boolean isIndividual) { + this.isIndividual = isIndividual; + } + + + + // @info.archinnov.achilles.annotations.Column("isSufficient") + private Boolean isSufficient; + + @JsonGetter + @javax.persistence.Column(name = "isSufficient", table = "FlowConnectionDefinition") + public Boolean getIsSufficient() { + return isSufficient; + } + + @JsonSetter + public void setIsSufficient(Boolean isSufficient) { + this.isSufficient = isSufficient; + } + + + + // @info.archinnov.achilles.annotations.Column("isVariation") + private Boolean isVariation; + + @JsonGetter + @javax.persistence.Column(name = "isVariation", table = "FlowConnectionDefinition") + public Boolean getIsVariation() { + return isVariation; + } + + @JsonSetter + public void setIsVariation(Boolean isVariation) { + this.isVariation = isVariation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("lifeClass") + private LifeClass lifeClass; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "LifeClassMetaDef", metaColumn = @javax.persistence.Column(name = "lifeClass_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "lifeClass_id", table = "FlowConnectionDefinition") + public LifeClass getLifeClass() { + return lifeClass; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = LifeClassImpl.class) + public void setLifeClass(LifeClass lifeClass) { + this.lifeClass = lifeClass; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("member") + private List member; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_member", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getMember() { + if (member == null) { + member = new ArrayList<>(); + } + return member; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setMember(List member) { + this.member = member; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("membership") + private List membership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_membership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getMembership() { + if (membership == null) { + membership = new ArrayList<>(); + } + return membership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MembershipImpl.class) + public void setMembership(List membership) { + this.membership = membership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("multiplicity") + private Multiplicity multiplicity; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "MultiplicityMetaDef", metaColumn = @javax.persistence.Column(name = "multiplicity_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "multiplicity_id", table = "FlowConnectionDefinition") + public Multiplicity getMultiplicity() { + return multiplicity; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = MultiplicityImpl.class) + public void setMultiplicity(Multiplicity multiplicity) { + this.multiplicity = multiplicity; + } + + + + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "name", table = "FlowConnectionDefinition") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("output") + private List output; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_output", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOutput() { + if (output == null) { + output = new ArrayList<>(); + } + return output; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setOutput(List output) { + this.output = output; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAction") + private List ownedAction; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ActionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedAction", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAction() { + if (ownedAction == null) { + ownedAction = new ArrayList<>(); + } + return ownedAction; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ActionUsageImpl.class) + public void setOwnedAction(List ownedAction) { + this.ownedAction = ownedAction; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAllocation") + private List ownedAllocation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AllocationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedAllocation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAllocation() { + if (ownedAllocation == null) { + ownedAllocation = new ArrayList<>(); + } + return ownedAllocation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AllocationUsageImpl.class) + public void setOwnedAllocation(List ownedAllocation) { + this.ownedAllocation = ownedAllocation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAnalysisCase") + private List ownedAnalysisCase; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AnalysisCaseUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedAnalysisCase", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAnalysisCase() { + if (ownedAnalysisCase == null) { + ownedAnalysisCase = new ArrayList<>(); + } + return ownedAnalysisCase; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnalysisCaseUsageImpl.class) + public void setOwnedAnalysisCase(List ownedAnalysisCase) { + this.ownedAnalysisCase = ownedAnalysisCase; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private List ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedAnnotation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(List ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAttribute") + private List ownedAttribute; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AttributeUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedAttribute", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAttribute() { + if (ownedAttribute == null) { + ownedAttribute = new ArrayList<>(); + } + return ownedAttribute; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AttributeUsageImpl.class) + public void setOwnedAttribute(List ownedAttribute) { + this.ownedAttribute = ownedAttribute; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedCalculation") + private List ownedCalculation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "CalculationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedCalculation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedCalculation() { + if (ownedCalculation == null) { + ownedCalculation = new ArrayList<>(); + } + return ownedCalculation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = CalculationUsageImpl.class) + public void setOwnedCalculation(List ownedCalculation) { + this.ownedCalculation = ownedCalculation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedCase") + private List ownedCase; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "CaseUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedCase", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedCase() { + if (ownedCase == null) { + ownedCase = new ArrayList<>(); + } + return ownedCase; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = CaseUsageImpl.class) + public void setOwnedCase(List ownedCase) { + this.ownedCase = ownedCase; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedConcern") + private Collection ownedConcern; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ConcernUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedConcern", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getOwnedConcern() { + if (ownedConcern == null) { + ownedConcern = new ArrayList<>(); + } + return ownedConcern; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ConcernUsageImpl.class) + public void setOwnedConcern(Collection ownedConcern) { + this.ownedConcern = ownedConcern; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedConjugator") + private Conjugation ownedConjugator; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ConjugationMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConjugator_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedConjugator_id", table = "FlowConnectionDefinition") + public Conjugation getOwnedConjugator() { + return ownedConjugator; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ConjugationImpl.class) + public void setOwnedConjugator(Conjugation ownedConjugator) { + this.ownedConjugator = ownedConjugator; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedConnection") + private List ownedConnection; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ConnectorAsUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedConnection", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedConnection() { + if (ownedConnection == null) { + ownedConnection = new ArrayList<>(); + } + return ownedConnection; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ConnectorAsUsageImpl.class) + public void setOwnedConnection(List ownedConnection) { + this.ownedConnection = ownedConnection; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedConstraint") + private List ownedConstraint; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ConstraintUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedConstraint", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedConstraint() { + if (ownedConstraint == null) { + ownedConstraint = new ArrayList<>(); + } + return ownedConstraint; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ConstraintUsageImpl.class) + public void setOwnedConstraint(List ownedConstraint) { + this.ownedConstraint = ownedConstraint; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDisjoining") + private Collection ownedDisjoining; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DisjoiningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedDisjoining", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getOwnedDisjoining() { + if (ownedDisjoining == null) { + ownedDisjoining = new ArrayList<>(); + } + return ownedDisjoining; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DisjoiningImpl.class) + public void setOwnedDisjoining(Collection ownedDisjoining) { + this.ownedDisjoining = ownedDisjoining; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private List ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(List ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedEndFeature") + private List ownedEndFeature; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedEndFeature", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedEndFeature() { + if (ownedEndFeature == null) { + ownedEndFeature = new ArrayList<>(); + } + return ownedEndFeature; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setOwnedEndFeature(List ownedEndFeature) { + this.ownedEndFeature = ownedEndFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedEnumeration") + private List ownedEnumeration; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "EnumerationUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedEnumeration", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedEnumeration() { + if (ownedEnumeration == null) { + ownedEnumeration = new ArrayList<>(); + } + return ownedEnumeration; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = EnumerationUsageImpl.class) + public void setOwnedEnumeration(List ownedEnumeration) { + this.ownedEnumeration = ownedEnumeration; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedFeature") + private List ownedFeature; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedFeature", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedFeature() { + if (ownedFeature == null) { + ownedFeature = new ArrayList<>(); + } + return ownedFeature; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setOwnedFeature(List ownedFeature) { + this.ownedFeature = ownedFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedFeatureMembership") + private List ownedFeatureMembership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedFeatureMembership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedFeatureMembership() { + if (ownedFeatureMembership == null) { + ownedFeatureMembership = new ArrayList<>(); + } + return ownedFeatureMembership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureMembershipImpl.class) + public void setOwnedFeatureMembership(List ownedFeatureMembership) { + this.ownedFeatureMembership = ownedFeatureMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedFlow") + private Collection ownedFlow; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FlowConnectionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedFlow", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getOwnedFlow() { + if (ownedFlow == null) { + ownedFlow = new ArrayList<>(); + } + return ownedFlow; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FlowConnectionUsageImpl.class) + public void setOwnedFlow(Collection ownedFlow) { + this.ownedFlow = ownedFlow; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedImport") + private List ownedImport; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ImportMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedImport", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedImport() { + if (ownedImport == null) { + ownedImport = new ArrayList<>(); + } + return ownedImport; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ImportImpl.class) + public void setOwnedImport(List ownedImport) { + this.ownedImport = ownedImport; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedInterface") + private List ownedInterface; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InterfaceUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedInterface", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedInterface() { + if (ownedInterface == null) { + ownedInterface = new ArrayList<>(); + } + return ownedInterface; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InterfaceUsageImpl.class) + public void setOwnedInterface(List ownedInterface) { + this.ownedInterface = ownedInterface; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedItem") + private List ownedItem; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ItemUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedItem", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedItem() { + if (ownedItem == null) { + ownedItem = new ArrayList<>(); + } + return ownedItem; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ItemUsageImpl.class) + public void setOwnedItem(List ownedItem) { + this.ownedItem = ownedItem; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMember") + private List ownedMember; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedMember", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMember() { + if (ownedMember == null) { + ownedMember = new ArrayList<>(); + } + return ownedMember; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedMember(List ownedMember) { + this.ownedMember = ownedMember; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMembership") + private List ownedMembership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedMembership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMembership() { + if (ownedMembership == null) { + ownedMembership = new ArrayList<>(); + } + return ownedMembership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MembershipImpl.class) + public void setOwnedMembership(List ownedMembership) { + this.ownedMembership = ownedMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedOccurrence") + private List ownedOccurrence; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "OccurrenceUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedOccurrence", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedOccurrence() { + if (ownedOccurrence == null) { + ownedOccurrence = new ArrayList<>(); + } + return ownedOccurrence; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = OccurrenceUsageImpl.class) + public void setOwnedOccurrence(List ownedOccurrence) { + this.ownedOccurrence = ownedOccurrence; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedPart") + private List ownedPart; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "PartUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedPart", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedPart() { + if (ownedPart == null) { + ownedPart = new ArrayList<>(); + } + return ownedPart; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = PartUsageImpl.class) + public void setOwnedPart(List ownedPart) { + this.ownedPart = ownedPart; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedPort") + private List ownedPort; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "PortUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedPort", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedPort() { + if (ownedPort == null) { + ownedPort = new ArrayList<>(); + } + return ownedPort; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = PortUsageImpl.class) + public void setOwnedPort(List ownedPort) { + this.ownedPort = ownedPort; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReference") + private List ownedReference; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ReferenceUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedReference", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedReference() { + if (ownedReference == null) { + ownedReference = new ArrayList<>(); + } + return ownedReference; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ReferenceUsageImpl.class) + public void setOwnedReference(List ownedReference) { + this.ownedReference = ownedReference; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedRelatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedRelationship", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedRendering") + private List ownedRendering; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "RenderingUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedRendering", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRendering() { + if (ownedRendering == null) { + ownedRendering = new ArrayList<>(); + } + return ownedRendering; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RenderingUsageImpl.class) + public void setOwnedRendering(List ownedRendering) { + this.ownedRendering = ownedRendering; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedRequirement") + private List ownedRequirement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedRequirement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRequirement() { + if (ownedRequirement == null) { + ownedRequirement = new ArrayList<>(); + } + return ownedRequirement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RequirementUsageImpl.class) + public void setOwnedRequirement(List ownedRequirement) { + this.ownedRequirement = ownedRequirement; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedSpecialization") + private List ownedSpecialization; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "SpecializationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedSpecialization", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedSpecialization() { + if (ownedSpecialization == null) { + ownedSpecialization = new ArrayList<>(); + } + return ownedSpecialization; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = SpecializationImpl.class) + public void setOwnedSpecialization(List ownedSpecialization) { + this.ownedSpecialization = ownedSpecialization; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedState") + private List ownedState; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "StateUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedState", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedState() { + if (ownedState == null) { + ownedState = new ArrayList<>(); + } + return ownedState; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = StateUsageImpl.class) + public void setOwnedState(List ownedState) { + this.ownedState = ownedState; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedSubclassification") + private Collection ownedSubclassification; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "SubclassificationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedSubclassification", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getOwnedSubclassification() { + if (ownedSubclassification == null) { + ownedSubclassification = new ArrayList<>(); + } + return ownedSubclassification; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = SubclassificationImpl.class) + public void setOwnedSubclassification(Collection ownedSubclassification) { + this.ownedSubclassification = ownedSubclassification; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedTransition") + private Collection ownedTransition; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TransitionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedTransition", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getOwnedTransition() { + if (ownedTransition == null) { + ownedTransition = new ArrayList<>(); + } + return ownedTransition; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TransitionUsageImpl.class) + public void setOwnedTransition(Collection ownedTransition) { + this.ownedTransition = ownedTransition; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUsage") + private List ownedUsage; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedUsage", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUsage() { + if (ownedUsage == null) { + ownedUsage = new ArrayList<>(); + } + return ownedUsage; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UsageImpl.class) + public void setOwnedUsage(List ownedUsage) { + this.ownedUsage = ownedUsage; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUseCase") + private List ownedUseCase; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UseCaseUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedUseCase", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUseCase() { + if (ownedUseCase == null) { + ownedUseCase = new ArrayList<>(); + } + return ownedUseCase; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UseCaseUsageImpl.class) + public void setOwnedUseCase(List ownedUseCase) { + this.ownedUseCase = ownedUseCase; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedVerificationCase") + private List ownedVerificationCase; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "VerificationCaseUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedVerificationCase", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedVerificationCase() { + if (ownedVerificationCase == null) { + ownedVerificationCase = new ArrayList<>(); + } + return ownedVerificationCase; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = VerificationCaseUsageImpl.class) + public void setOwnedVerificationCase(List ownedVerificationCase) { + this.ownedVerificationCase = ownedVerificationCase; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedView") + private List ownedView; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ViewUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedView", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedView() { + if (ownedView == null) { + ownedView = new ArrayList<>(); + } + return ownedView; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ViewUsageImpl.class) + public void setOwnedView(List ownedView) { + this.ownedView = ownedView; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedViewpoint") + private List ownedViewpoint; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ViewpointUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_ownedViewpoint", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedViewpoint() { + if (ownedViewpoint == null) { + ownedViewpoint = new ArrayList<>(); + } + return ownedViewpoint; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ViewpointUsageImpl.class) + public void setOwnedViewpoint(List ownedViewpoint) { + this.ownedViewpoint = ownedViewpoint; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owner_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owner_id", table = "FlowConnectionDefinition") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningMembership") + private OwningMembership owningMembership; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembership_id", table = "FlowConnectionDefinition") + public OwningMembership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = OwningMembershipImpl.class) + public void setOwningMembership(OwningMembership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Namespace owningNamespace; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespace_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespace_id", table = "FlowConnectionDefinition") + public Namespace getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class) + public void setOwningNamespace(Namespace owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElement_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElement_id", table = "FlowConnectionDefinition") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationship_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationship_id", table = "FlowConnectionDefinition") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("parameter") + private List parameter; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_parameter", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getParameter() { + if (parameter == null) { + parameter = new ArrayList<>(); + } + return parameter; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) + public void setParameter(List parameter) { + this.parameter = parameter; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("qualifiedName") + private String qualifiedName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "qualifiedName", table = "FlowConnectionDefinition") + public String getQualifiedName() { + return qualifiedName; + } + + @JsonSetter + public void setQualifiedName(String qualifiedName) { + this.qualifiedName = qualifiedName; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_relatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedType") + private List relatedType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_relatedType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedType() { + if (relatedType == null) { + relatedType = new ArrayList<>(); + } + return relatedType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setRelatedType(List relatedType) { + this.relatedType = relatedType; + } + + + + // @info.archinnov.achilles.annotations.Column("shortName") + private String shortName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "shortName", table = "FlowConnectionDefinition") + public String getShortName() { + return shortName; + } + + @JsonSetter + public void setShortName(String shortName) { + this.shortName = shortName; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_source", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("sourceType") + private Type sourceType; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "sourceType_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "sourceType_id", table = "FlowConnectionDefinition") + public Type getSourceType() { + return sourceType; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setSourceType(Type sourceType) { + this.sourceType = sourceType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("step") + private Collection step; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "StepMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_step", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getStep() { + if (step == null) { + step = new ArrayList<>(); + } + return step; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = StepImpl.class) + public void setStep(Collection step) { + this.step = step; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_target", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("targetType") + private Collection targetType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_targetType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getTargetType() { + if (targetType == null) { + targetType = new ArrayList<>(); + } + return targetType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setTargetType(Collection targetType) { + this.targetType = targetType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("textualRepresentation") + private List textualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_textualRepresentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTextualRepresentation() { + if (textualRepresentation == null) { + textualRepresentation = new ArrayList<>(); + } + return textualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setTextualRepresentation(List textualRepresentation) { + this.textualRepresentation = textualRepresentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("usage") + private List usage; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_usage", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUsage() { + if (usage == null) { + usage = new ArrayList<>(); + } + return usage; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UsageImpl.class) + public void setUsage(List usage) { + this.usage = usage; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("variant") + private Collection variant; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_variant", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getVariant() { + if (variant == null) { + variant = new ArrayList<>(); + } + return variant; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UsageImpl.class) + public void setVariant(Collection variant) { + this.variant = variant; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("variantMembership") + private Collection variantMembership; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "VariantMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionDefinition_variantMembership", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public Collection getVariantMembership() { + if (variantMembership == null) { + variantMembership = new ArrayList<>(); + } + return variantMembership; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = VariantMembershipImpl.class) + public void setVariantMembership(Collection variantMembership) { + this.variantMembership = variantMembership; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl.java index eef73bf7..e56bdbb8 100644 --- a/app/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl.java @@ -70,6 +70,32 @@ @JsonTypeName(value = "FlowConnectionUsage") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME) public class FlowConnectionUsageImpl extends SysMLTypeImpl implements FlowConnectionUsage { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("actionDefinition") + private List actionDefinition; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "BehaviorMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_actionDefinition", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getActionDefinition() { + if (actionDefinition == null) { + actionDefinition = new ArrayList<>(); + } + return actionDefinition; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = BehaviorImpl.class) + public void setActionDefinition(List actionDefinition) { + this.actionDefinition = actionDefinition; + } + + + // @info.archinnov.achilles.annotations.Column("aliasIds") private List aliasIds; @@ -95,7 +121,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +130,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "FlowConnectionUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +139,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -199,7 +225,7 @@ public void setConnectionDefinition(List connectionDefinit // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -208,7 +234,7 @@ public void setConnectionDefinition(List connectionDefinit @JoinTable(name = "FlowConnectionUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -217,7 +243,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -249,6 +275,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -506,6 +558,32 @@ public void setFeaturingType(List featuringType) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("flowConnectionDefinition") + private List flowConnectionDefinition; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InteractionMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_flowConnectionDefinition", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getFlowConnectionDefinition() { + if (flowConnectionDefinition == null) { + flowConnectionDefinition = new ArrayList<>(); + } + return flowConnectionDefinition; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InteractionImpl.class) + public void setFlowConnectionDefinition(List flowConnectionDefinition) { + this.flowConnectionDefinition = flowConnectionDefinition; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("importedMembership") private List importedMembership; @@ -631,6 +709,58 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("interaction") + private List interaction; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InteractionMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_interaction", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInteraction() { + if (interaction == null) { + interaction = new ArrayList<>(); + } + return interaction; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InteractionImpl.class) + public void setInteraction(List interaction) { + this.interaction = interaction; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -729,6 +859,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "FlowConnectionUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FlowConnectionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -905,25 +1067,20 @@ public void setItemDefinition(List itemDefinition) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("itemFeature") - private Collection itemFeature; + private ItemFeature itemFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "FlowConnectionUsage_itemFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getItemFeature() { - if (itemFeature == null) { - itemFeature = new ArrayList<>(); - } + @Any(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "itemFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "itemFeature_id", table = "FlowConnectionUsage") + public ItemFeature getItemFeature() { return itemFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ItemFeatureImpl.class) - public void setItemFeature(Collection itemFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = ItemFeatureImpl.class) + public void setItemFeature(ItemFeature itemFeature) { this.itemFeature = itemFeature; } @@ -1436,6 +1593,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1873,6 +2056,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2081,6 +2290,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2159,6 +2394,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "FlowConnectionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2311,6 +2567,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2353,11 +2635,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "FlowConnectionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2372,11 +2656,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FlowConnectionUsage") public OwningMembership getOwningMembership() { @@ -2720,25 +3006,20 @@ public void setSourceFeature(Feature sourceFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("sourceOutputFeature") - private List sourceOutputFeature; + private Feature sourceOutputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "FlowConnectionUsage_sourceOutputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getSourceOutputFeature() { - if (sourceOutputFeature == null) { - sourceOutputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "sourceOutputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "sourceOutputFeature_id", table = "FlowConnectionUsage") + public Feature getSourceOutputFeature() { return sourceOutputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setSourceOutputFeature(List sourceOutputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setSourceOutputFeature(Feature sourceOutputFeature) { this.sourceOutputFeature = sourceOutputFeature; } @@ -2770,7 +3051,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2779,7 +3060,7 @@ public void setTarget(List target) { @JoinTable(name = "FlowConnectionUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2788,7 +3069,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2796,25 +3077,20 @@ public void setTargetFeature(Collection targetFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetInputFeature") - private List targetInputFeature; + private Feature targetInputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "FlowConnectionUsage_targetInputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getTargetInputFeature() { - if (targetInputFeature == null) { - targetInputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "targetInputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "targetInputFeature_id", table = "FlowConnectionUsage") + public Feature getTargetInputFeature() { return targetInputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetInputFeature(List targetInputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setTargetInputFeature(Feature targetInputFeature) { this.targetInputFeature = targetInputFeature; } @@ -2872,6 +3148,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "FlowConnectionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl.java index 8d6c3b9e..c4b84475 100644 --- a/app/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl.java @@ -218,6 +218,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -600,6 +626,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -682,6 +734,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ForLoopActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1280,6 +1348,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1717,6 +1811,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1925,6 +2045,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2003,6 +2149,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ForLoopActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2131,6 +2298,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2173,11 +2366,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ForLoopActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2192,11 +2387,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ForLoopActionUsage") public OwningMembership getOwningMembership() { @@ -2469,6 +2666,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForLoopActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java b/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java index 0626caa7..4422fbfa 100644 --- a/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ForkNode") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ForkNode") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ForkNode") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ForkNode") public OwningMembership getOwningMembership() { @@ -2406,6 +2603,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl.java index e7c68282..990f1107 100644 --- a/app/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "FramedConcernMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "FramedConcernMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "FramedConcernMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "FramedConcernMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "FramedConcernMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -351,11 +364,13 @@ public void setOwnedAnnotation(List ownedAnnotation) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConcern") private ConcernUsage ownedConcern; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ConcernUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConcern_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedConcern_id", table = "FramedConcernMembership") public ConcernUsage getOwnedConcern() { @@ -370,11 +385,13 @@ public void setOwnedConcern(ConcernUsage ownedConcern) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConstraint") private ConstraintUsage ownedConstraint; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ConstraintUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConstraint_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedConstraint_id", table = "FramedConcernMembership") public ConstraintUsage getOwnedConstraint() { @@ -415,11 +432,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "FramedConcernMembership") public Element getOwnedMemberElement() { @@ -454,11 +473,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "FramedConcernMembership") public Feature getOwnedMemberFeature() { @@ -583,31 +604,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "FramedConcernMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "FramedConcernMembership") public OwningMembership getOwningMembership() { @@ -882,6 +884,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "FramedConcernMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/FunctionImpl.java b/app/org/omg/sysml/metamodel/impl/FunctionImpl.java index 4a692267..3832fbd2 100644 --- a/app/org/omg/sysml/metamodel/impl/FunctionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FunctionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Function_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Function_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Function") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -621,6 +689,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Function_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -777,6 +871,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Function_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -905,6 +1025,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Function_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -926,11 +1072,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Function") public OwningMembership getOwningMembership() { @@ -1122,4 +1270,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Function_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/IfActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/IfActionUsageImpl.java index 0949c7d6..bbff649f 100644 --- a/app/org/omg/sysml/metamodel/impl/IfActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/IfActionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -621,6 +647,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -703,6 +755,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "IfActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1280,6 +1348,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1717,6 +1811,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1925,6 +2045,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2003,6 +2149,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "IfActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2131,6 +2298,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2173,11 +2366,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "IfActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2192,11 +2387,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "IfActionUsage") public OwningMembership getOwningMembership() { @@ -2469,6 +2666,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IfActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ImportImpl.java b/app/org/omg/sysml/metamodel/impl/ImportImpl.java index c3c1bf92..02b94718 100644 --- a/app/org/omg/sysml/metamodel/impl/ImportImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ImportImpl.java @@ -213,6 +213,38 @@ public void setImportedNamespace(Namespace importedNamespace) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Import") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Import") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isImportAll") private Boolean isImportAll; @@ -384,11 +416,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Import") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl.java index c28337bf..dc0754fe 100644 --- a/app/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl.java @@ -265,6 +265,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -715,6 +741,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -797,6 +849,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "IncludeUseCaseUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1392,6 +1460,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1850,6 +1944,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2058,6 +2178,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2136,6 +2282,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "IncludeUseCaseUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2264,6 +2431,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2306,11 +2499,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "IncludeUseCaseUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2325,11 +2520,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "IncludeUseCaseUsage") public OwningMembership getOwningMembership() { @@ -2644,6 +2841,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "IncludeUseCaseUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/InteractionImpl.java b/app/org/omg/sysml/metamodel/impl/InteractionImpl.java index af5eba8c..4ab67ee3 100644 --- a/app/org/omg/sysml/metamodel/impl/InteractionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InteractionImpl.java @@ -119,6 +119,32 @@ public void setAssociationEnd(Collection associationEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Interaction_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Interaction_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,38 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Interaction") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Interaction") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -603,6 +687,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Interaction_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -759,6 +869,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Interaction_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -911,6 +1047,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Interaction_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -932,11 +1094,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Interaction") public OwningMembership getOwningMembership() { @@ -1273,4 +1437,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Interaction_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java index 752af75b..7ae8307a 100644 --- a/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java @@ -145,6 +145,32 @@ public void setConnectionEnd(List connectionEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -467,6 +493,32 @@ public void setInterfaceEnd(List interfaceEnd) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -501,6 +553,38 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "InterfaceDefinition") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "InterfaceDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -968,6 +1052,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1202,6 +1312,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1280,6 +1416,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1588,6 +1750,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1739,11 +1927,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "InterfaceDefinition") public OwningMembership getOwningMembership() { @@ -2028,6 +2218,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java index 4abcefb6..648f2d89 100644 --- a/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "InterfaceUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -173,7 +173,7 @@ public void setConnectionDefinition(List connectionDefinit // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -182,7 +182,7 @@ public void setConnectionDefinition(List connectionDefinit @JoinTable(name = "InterfaceUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -191,7 +191,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -223,6 +223,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -631,6 +657,32 @@ public void setInterfaceDefinition(Collection interfaceDefi + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -729,6 +781,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "InterfaceUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "InterfaceUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1332,6 +1416,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1769,6 +1879,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1977,6 +2113,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2055,6 +2217,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "InterfaceUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2207,6 +2390,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2249,11 +2458,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "InterfaceUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2268,11 +2479,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "InterfaceUsage") public OwningMembership getOwningMembership() { @@ -2614,7 +2827,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2623,7 +2836,7 @@ public void setTarget(List target) { @JoinTable(name = "InterfaceUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2632,7 +2845,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2690,6 +2903,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/IntersectingImpl.java b/app/org/omg/sysml/metamodel/impl/IntersectingImpl.java new file mode 100644 index 00000000..487a6aa1 --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/IntersectingImpl.java @@ -0,0 +1,587 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel.impl; + +import org.omg.sysml.metamodel.*; + +import org.omg.sysml.metamodel.Package; +import org.omg.sysml.metamodel.Class; + +import jackson.DataSerializer; +import jackson.DataDeserializer; + +import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import org.hibernate.annotations.Any; +import org.hibernate.annotations.ManyToAny; +import org.hibernate.annotations.FetchMode; + +// import info.archinnov.achilles.annotations.UDT; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.EnumType; +import javax.persistence.ElementCollection; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Lob; +import javax.persistence.FetchType; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Table; +import javax.persistence.SecondaryTable; +import javax.persistence.CollectionTable; + +import java.util.Collection; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +@Entity(name = "IntersectingImpl") +@SecondaryTable(name = "Intersecting") +@org.hibernate.annotations.Table(appliesTo = "Intersecting", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "Intersecting") +@DiscriminatorValue(value = "Intersecting") +@JsonTypeName(value = "Intersecting") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class IntersectingImpl extends SysMLTypeImpl implements Intersecting { + // @info.archinnov.achilles.annotations.Column("aliasIds") + private List aliasIds; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "Intersecting_aliasIds", + joinColumns = @JoinColumn(name = "Intersecting_id")) + public List getAliasIds() { + if (aliasIds == null) { + aliasIds = new ArrayList<>(); + } + return aliasIds; + } + + @JsonSetter + public void setAliasIds(List aliasIds) { + this.aliasIds = aliasIds; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentation") + private List documentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_documentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(List documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("effectiveName") + private String effectiveName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "effectiveName", table = "Intersecting") + public String getEffectiveName() { + return effectiveName; + } + + @JsonSetter + public void setEffectiveName(String effectiveName) { + this.effectiveName = effectiveName; + } + + + + // @info.archinnov.achilles.annotations.Column("elementId") + private java.util.UUID elementId; + + @JsonGetter + @javax.persistence.Column(name = "elementId", table = "Intersecting") + public java.util.UUID getElementId() { + return elementId; + } + + @JsonSetter + public void setElementId(java.util.UUID elementId) { + this.elementId = elementId; + } + + + + // @info.archinnov.achilles.annotations.Column("intersectingType") + private Type intersectingType; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "intersectingType_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "intersectingType_id", table = "Intersecting") + public Type getIntersectingType() { + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setIntersectingType(Type intersectingType) { + this.intersectingType = intersectingType; + } + + + + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Intersecting") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Intersecting") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "name", table = "Intersecting") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private List ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_ownedAnnotation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(List ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private List ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_ownedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(List ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_ownedRelatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_ownedRelationship", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owner_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owner_id", table = "Intersecting") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningMembership") + private OwningMembership owningMembership; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembership_id", table = "Intersecting") + public OwningMembership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = OwningMembershipImpl.class) + public void setOwningMembership(OwningMembership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Namespace owningNamespace; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespace_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespace_id", table = "Intersecting") + public Namespace getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class) + public void setOwningNamespace(Namespace owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElement_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElement_id", table = "Intersecting") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationship_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationship_id", table = "Intersecting") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("qualifiedName") + private String qualifiedName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "qualifiedName", table = "Intersecting") + public String getQualifiedName() { + return qualifiedName; + } + + @JsonSetter + public void setQualifiedName(String qualifiedName) { + this.qualifiedName = qualifiedName; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_relatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("shortName") + private String shortName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "shortName", table = "Intersecting") + public String getShortName() { + return shortName; + } + + @JsonSetter + public void setShortName(String shortName) { + this.shortName = shortName; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_source", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_target", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("textualRepresentation") + private List textualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Intersecting_textualRepresentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTextualRepresentation() { + if (textualRepresentation == null) { + textualRepresentation = new ArrayList<>(); + } + return textualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setTextualRepresentation(List textualRepresentation) { + this.textualRepresentation = textualRepresentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("typeIntersected") + private Type typeIntersected; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "typeIntersected_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "typeIntersected_id", table = "Intersecting") + public Type getTypeIntersected() { + return typeIntersected; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setTypeIntersected(Type typeIntersected) { + this.typeIntersected = typeIntersected; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/InvariantImpl.java b/app/org/omg/sysml/metamodel/impl/InvariantImpl.java index 23d8d0fa..0ce26a6a 100644 --- a/app/org/omg/sysml/metamodel/impl/InvariantImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InvariantImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Invariant") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -879,6 +947,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1087,6 +1181,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1165,6 +1285,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Invariant") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1293,6 +1434,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1314,11 +1481,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Invariant") public FeatureMembership getOwningFeatureMembership() { @@ -1333,11 +1502,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Invariant") public OwningMembership getOwningMembership() { @@ -1571,4 +1742,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java index efbaf27e..11c870e9 100644 --- a/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java @@ -171,6 +171,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "InvocationExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -889,6 +957,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1097,6 +1191,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1175,6 +1295,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "InvocationExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1303,6 +1444,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1324,11 +1491,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "InvocationExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1343,11 +1512,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "InvocationExpression") public OwningMembership getOwningMembership() { @@ -1560,4 +1731,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ItemDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ItemDefinitionImpl.java index b933ff74..2cdfa3dd 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ItemDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -890,6 +958,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1124,6 +1218,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1202,6 +1322,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1486,6 +1632,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1637,11 +1809,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ItemDefinition") public OwningMembership getOwningMembership() { @@ -1760,6 +1934,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java index 1fe50f73..bd30d410 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ItemFeature") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ItemFeature") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ItemFeature") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ItemFeature") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java index e80919ec..3b17143c 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ItemFlowEnd") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ItemFlowEnd") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ItemFlowEnd") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ItemFlowEnd") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java index e07a8102..e112e23d 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ItemFlowFeature") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ItemFlowFeature") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ItemFlowFeature") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ItemFlowFeature") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java index 3fe57c0a..8e9560ea 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "ItemFlow_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -173,7 +173,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -182,7 +182,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "ItemFlow_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -191,12 +191,38 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -532,6 +558,58 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("interaction") + private List interaction; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InteractionMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_interaction", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInteraction() { + if (interaction == null) { + interaction = new ArrayList<>(); + } + return interaction; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InteractionImpl.class) + public void setInteraction(List interaction) { + this.interaction = interaction; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -630,6 +708,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ItemFlow") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ItemFlow") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -730,25 +840,20 @@ public void setIsUnique(Boolean isUnique) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("itemFeature") - private Collection itemFeature; + private ItemFeature itemFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlow_itemFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getItemFeature() { - if (itemFeature == null) { - itemFeature = new ArrayList<>(); - } + @Any(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "itemFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "itemFeature_id", table = "ItemFlow") + public ItemFeature getItemFeature() { return itemFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ItemFeatureImpl.class) - public void setItemFeature(Collection itemFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = ItemFeatureImpl.class) + public void setItemFeature(ItemFeature itemFeature) { this.itemFeature = itemFeature; } @@ -996,6 +1101,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1204,6 +1335,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1282,6 +1439,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ItemFlow") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -1434,6 +1612,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1455,11 +1659,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ItemFlow") public FeatureMembership getOwningFeatureMembership() { @@ -1474,11 +1680,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ItemFlow") public OwningMembership getOwningMembership() { @@ -1736,25 +1944,20 @@ public void setSourceFeature(Feature sourceFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("sourceOutputFeature") - private List sourceOutputFeature; + private Feature sourceOutputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlow_sourceOutputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getSourceOutputFeature() { - if (sourceOutputFeature == null) { - sourceOutputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "sourceOutputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "sourceOutputFeature_id", table = "ItemFlow") + public Feature getSourceOutputFeature() { return sourceOutputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setSourceOutputFeature(List sourceOutputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setSourceOutputFeature(Feature sourceOutputFeature) { this.sourceOutputFeature = sourceOutputFeature; } @@ -1786,7 +1989,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -1795,7 +1998,7 @@ public void setTarget(List target) { @JoinTable(name = "ItemFlow_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -1804,7 +2007,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -1812,25 +2015,20 @@ public void setTargetFeature(Collection targetFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetInputFeature") - private List targetInputFeature; + private Feature targetInputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlow_targetInputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getTargetInputFeature() { - if (targetInputFeature == null) { - targetInputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "targetInputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "targetInputFeature_id", table = "ItemFlow") + public Feature getTargetInputFeature() { return targetInputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetInputFeature(List targetInputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setTargetInputFeature(Feature targetInputFeature) { this.targetInputFeature = targetInputFeature; } @@ -1888,4 +2086,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java index acbb1de9..dff387c9 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ItemUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1212,6 +1280,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1649,6 +1743,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1857,6 +1977,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1935,6 +2081,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ItemUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2063,6 +2230,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2105,11 +2298,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ItemUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2124,11 +2319,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ItemUsage") public OwningMembership getOwningMembership() { @@ -2354,6 +2551,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java b/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java index bca8a36d..91ffa074 100644 --- a/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "JoinNode") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "JoinNode") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "JoinNode") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "JoinNode") public OwningMembership getOwningMembership() { @@ -2406,6 +2603,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/LifeClassImpl.java b/app/org/omg/sysml/metamodel/impl/LifeClassImpl.java index d8448edd..26444ecf 100644 --- a/app/org/omg/sysml/metamodel/impl/LifeClassImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LifeClassImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LifeClass_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LifeClass_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LifeClass") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LifeClass_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LifeClass_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LifeClass_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LifeClass") public OwningMembership getOwningMembership() { @@ -1005,4 +1153,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LifeClass_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java index 4e52762f..6322fa6b 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LiteralBoolean") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LiteralBoolean") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LiteralBoolean") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LiteralBoolean") public OwningMembership getOwningMembership() { @@ -1534,6 +1705,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Column("value") private Boolean value; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java index b1291c15..b49b2ad0 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LiteralExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LiteralExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LiteralExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LiteralExpression") public OwningMembership getOwningMembership() { @@ -1534,4 +1705,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/LiteralInfinityImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralInfinityImpl.java index 423bd76a..da6db276 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralInfinityImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralInfinityImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInfinity_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInfinity_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LiteralInfinity") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInfinity_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInfinity_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LiteralInfinity") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInfinity_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LiteralInfinity") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LiteralInfinity") public OwningMembership getOwningMembership() { @@ -1534,4 +1705,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInfinity_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java index 072d3bf5..e3d0ae7f 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LiteralInteger") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LiteralInteger") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LiteralInteger") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LiteralInteger") public OwningMembership getOwningMembership() { @@ -1534,6 +1705,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Column("value") private Integer value; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralRationalImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralRationalImpl.java index 4d7b191f..0089acc7 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralRationalImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralRationalImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralRational_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralRational_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LiteralRational") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralRational_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralRational_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LiteralRational") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralRational_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LiteralRational") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LiteralRational") public OwningMembership getOwningMembership() { @@ -1534,6 +1705,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralRational_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Column("value") private Double value; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java index c3865af8..5fc44c5f 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LiteralString") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LiteralString") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LiteralString") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LiteralString") public OwningMembership getOwningMembership() { @@ -1534,6 +1705,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Column("value") private String value; diff --git a/app/org/omg/sysml/metamodel/impl/LoopActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/LoopActionUsageImpl.java index 31270adf..14bc0936 100644 --- a/app/org/omg/sysml/metamodel/impl/LoopActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LoopActionUsageImpl.java @@ -218,6 +218,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -600,6 +626,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -682,6 +734,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "LoopActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1259,6 +1327,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1696,6 +1790,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1904,6 +2024,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1982,6 +2128,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "LoopActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2110,6 +2277,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2152,11 +2345,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "LoopActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2171,11 +2366,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "LoopActionUsage") public OwningMembership getOwningMembership() { @@ -2427,6 +2624,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "LoopActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/MembershipImpl.java b/app/org/omg/sysml/metamodel/impl/MembershipImpl.java index 61a163dd..e650106e 100644 --- a/app/org/omg/sysml/metamodel/impl/MembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MembershipImpl.java @@ -155,6 +155,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Membership") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Membership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("memberElement") private Element memberElement; @@ -390,11 +422,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Membership") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java b/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java index 6a1ad573..3bf9f4b4 100644 --- a/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "MergeNode") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "MergeNode") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "MergeNode") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "MergeNode") public OwningMembership getOwningMembership() { @@ -2406,6 +2603,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/MetaclassImpl.java b/app/org/omg/sysml/metamodel/impl/MetaclassImpl.java index ab34705f..c3464f9f 100644 --- a/app/org/omg/sysml/metamodel/impl/MetaclassImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MetaclassImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Metaclass_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Metaclass_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Metaclass") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Metaclass_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Metaclass_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Metaclass_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Metaclass") public OwningMembership getOwningMembership() { @@ -1005,4 +1153,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Metaclass_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl.java index 1a0c1a8e..8e4454aa 100644 --- a/app/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "MetadataDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -890,6 +958,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1124,6 +1218,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1202,6 +1322,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1486,6 +1632,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1637,11 +1809,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "MetadataDefinition") public OwningMembership getOwningMembership() { @@ -1760,6 +1934,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java index fcf8c2b6..29fbfc17 100644 --- a/app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MetadataFeatureImpl.java @@ -169,6 +169,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataFeature_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -504,6 +530,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataFeature_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -586,6 +638,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "MetadataFeature") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -869,6 +937,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataFeature_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1077,6 +1171,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataFeature_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1155,6 +1275,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "MetadataFeature") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1283,6 +1424,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataFeature_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1304,11 +1471,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "MetadataFeature") public FeatureMembership getOwningFeatureMembership() { @@ -1323,11 +1492,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "MetadataFeature") public OwningMembership getOwningMembership() { @@ -1493,4 +1664,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataFeature_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/MetadataUsageImpl.java b/app/org/omg/sysml/metamodel/impl/MetadataUsageImpl.java index 73f85d36..9e26c7e7 100644 --- a/app/org/omg/sysml/metamodel/impl/MetadataUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MetadataUsageImpl.java @@ -195,6 +195,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -577,6 +603,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -659,6 +711,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "MetadataUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1304,6 +1372,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1741,6 +1835,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1949,6 +2069,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2027,6 +2173,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "MetadataUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2155,6 +2322,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2197,11 +2390,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "MetadataUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2216,11 +2411,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "MetadataUsage") public OwningMembership getOwningMembership() { @@ -2446,6 +2643,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MetadataUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java b/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java index a19b98d8..a0ee593a 100644 --- a/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Multiplicity") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Multiplicity") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Multiplicity") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Multiplicity") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java b/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java index 144f049b..4de2a9a1 100644 --- a/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -480,6 +506,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -562,6 +614,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "MultiplicityRange") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -845,6 +913,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1053,6 +1147,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1131,6 +1251,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "MultiplicityRange") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1259,6 +1400,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1280,11 +1447,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "MultiplicityRange") public FeatureMembership getOwningFeatureMembership() { @@ -1299,11 +1468,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "MultiplicityRange") public OwningMembership getOwningMembership() { @@ -1469,6 +1640,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("upperBound") private Expression upperBound; diff --git a/app/org/omg/sysml/metamodel/impl/NamespaceImpl.java b/app/org/omg/sysml/metamodel/impl/NamespaceImpl.java index fc2b155a..13b30761 100644 --- a/app/org/omg/sysml/metamodel/impl/NamespaceImpl.java +++ b/app/org/omg/sysml/metamodel/impl/NamespaceImpl.java @@ -181,6 +181,22 @@ public void setImportedMembership(List importedMembership) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Namespace") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("member") private List member; @@ -426,11 +442,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Namespace") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java index 615c94e8..10d68278 100644 --- a/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -501,6 +527,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -583,6 +635,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "NullExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -863,6 +931,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1071,6 +1165,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1149,6 +1269,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "NullExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1277,6 +1418,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1298,11 +1465,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "NullExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1317,11 +1486,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "NullExpression") public OwningMembership getOwningMembership() { @@ -1534,4 +1705,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java index ff073e73..8f7f1b66 100644 --- a/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "ObjectiveMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "ObjectiveMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "ObjectiveMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "ObjectiveMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ObjectiveMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ObjectiveMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "ObjectiveMembership") public Feature getOwnedMemberFeature() { @@ -457,11 +474,13 @@ public void setOwnedMemberShortName(String ownedMemberShortName) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedObjectiveRequirement") private RequirementUsage ownedObjectiveRequirement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedObjectiveRequirement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedObjectiveRequirement_id", table = "ObjectiveMembership") public RequirementUsage getOwnedObjectiveRequirement() { @@ -546,31 +565,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "ObjectiveMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ObjectiveMembership") public OwningMembership getOwningMembership() { @@ -803,6 +803,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "ObjectiveMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl.java index e290cfd1..ac548d95 100644 --- a/app/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "OccurrenceDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -890,6 +958,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1124,6 +1218,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1202,6 +1322,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1486,6 +1632,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1637,11 +1809,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "OccurrenceDefinition") public OwningMembership getOwningMembership() { @@ -1760,6 +1934,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl.java index 8b830773..83f63937 100644 --- a/app/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "OccurrenceUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1186,6 +1254,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1623,6 +1717,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1831,6 +1951,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1909,6 +2055,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "OccurrenceUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2037,6 +2204,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2079,11 +2272,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "OccurrenceUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2098,11 +2293,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "OccurrenceUsage") public OwningMembership getOwningMembership() { @@ -2328,6 +2525,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OccurrenceUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java index 0ce00e07..dd595961 100644 --- a/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java @@ -171,6 +171,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "OperatorExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -933,6 +1001,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1141,6 +1235,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1219,6 +1339,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "OperatorExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1347,6 +1488,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1368,11 +1535,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "OperatorExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1387,11 +1556,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "OperatorExpression") public OwningMembership getOwningMembership() { @@ -1604,4 +1775,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/OwningMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/OwningMembershipImpl.java index 2c7ddcee..a7699f49 100644 --- a/app/org/omg/sysml/metamodel/impl/OwningMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/OwningMembershipImpl.java @@ -155,6 +155,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "OwningMembership") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "OwningMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("memberElement") private Element memberElement; @@ -321,11 +353,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "OwningMembership") public Element getOwnedMemberElement() { @@ -469,11 +503,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "OwningMembership") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/PackageImpl.java b/app/org/omg/sysml/metamodel/impl/PackageImpl.java index 404308ce..fe13d183 100644 --- a/app/org/omg/sysml/metamodel/impl/PackageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PackageImpl.java @@ -207,6 +207,22 @@ public void setImportedMembership(List importedMembership) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Package") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("member") private List member; @@ -452,11 +468,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Package") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java index 82e7dd0a..bfbd1bd2 100644 --- a/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "ParameterMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "ParameterMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "ParameterMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "ParameterMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ParameterMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ParameterMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "ParameterMembership") public Feature getOwnedMemberFeature() { @@ -437,11 +454,13 @@ public void setOwnedMemberName(String ownedMemberName) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberParameter") private Feature ownedMemberParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberParameter_id", table = "ParameterMembership") public Feature getOwnedMemberParameter() { @@ -546,31 +565,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "ParameterMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ParameterMembership") public OwningMembership getOwningMembership() { @@ -803,6 +803,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "ParameterMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/PartDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/PartDefinitionImpl.java index 01803a1b..9bb9f117 100644 --- a/app/org/omg/sysml/metamodel/impl/PartDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PartDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PartDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -890,6 +958,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1124,6 +1218,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1202,6 +1322,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1486,6 +1632,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1637,11 +1809,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PartDefinition") public OwningMembership getOwningMembership() { @@ -1760,6 +1934,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java b/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java index 59c1c10d..f81a3633 100644 --- a/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PartUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1212,6 +1280,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1649,6 +1743,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1857,6 +1977,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1935,6 +2081,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "PartUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2063,6 +2230,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2105,11 +2298,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "PartUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2124,11 +2319,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PartUsage") public OwningMembership getOwningMembership() { @@ -2380,6 +2577,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java index aa10db48..42130e55 100644 --- a/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -600,6 +626,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -682,6 +734,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PerformActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1259,6 +1327,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1696,6 +1790,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1904,6 +2024,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1982,6 +2128,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "PerformActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2110,6 +2277,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2152,11 +2345,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "PerformActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2171,11 +2366,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PerformActionUsage") public OwningMembership getOwningMembership() { @@ -2448,6 +2645,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/PortConjugationImpl.java b/app/org/omg/sysml/metamodel/impl/PortConjugationImpl.java index a30594ee..fd1cd9fd 100644 --- a/app/org/omg/sysml/metamodel/impl/PortConjugationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PortConjugationImpl.java @@ -195,6 +195,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "PortConjugation") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PortConjugation") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -372,11 +404,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PortConjugation") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/PortDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/PortDefinitionImpl.java index 26c87d16..2706ad2b 100644 --- a/app/org/omg/sysml/metamodel/impl/PortDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PortDefinitionImpl.java @@ -114,6 +114,32 @@ public void setConjugatedPortDefinition(ConjugatedPortDefinition conjugatedPortD + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -410,6 +436,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -444,6 +496,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PortDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -911,6 +979,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1145,6 +1239,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1223,6 +1343,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1507,6 +1653,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1658,11 +1830,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PortDefinition") public OwningMembership getOwningMembership() { @@ -1781,6 +1955,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java b/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java index 4e62052e..e63d1d49 100644 --- a/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PortUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1186,6 +1254,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1623,6 +1717,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1831,6 +1951,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1909,6 +2055,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "PortUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2037,6 +2204,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2079,11 +2272,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "PortUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2098,11 +2293,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PortUsage") public OwningMembership getOwningMembership() { @@ -2354,6 +2551,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/PortioningFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/PortioningFeatureImpl.java index f97e40e7..af363dc3 100644 --- a/app/org/omg/sysml/metamodel/impl/PortioningFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PortioningFeatureImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortioningFeature_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortioningFeature_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "PortioningFeature") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortioningFeature_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortioningFeature_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "PortioningFeature") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortioningFeature_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "PortioningFeature") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "PortioningFeature") public OwningMembership getOwningMembership() { @@ -1442,4 +1613,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "PortioningFeature_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/PredicateImpl.java b/app/org/omg/sysml/metamodel/impl/PredicateImpl.java index 44b04a96..a3035cec 100644 --- a/app/org/omg/sysml/metamodel/impl/PredicateImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PredicateImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Predicate_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Predicate_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Predicate") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -621,6 +689,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Predicate_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -777,6 +871,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Predicate_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -905,6 +1025,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Predicate_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -926,11 +1072,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Predicate") public OwningMembership getOwningMembership() { @@ -1122,4 +1270,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Predicate_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/RedefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/RedefinitionImpl.java index 84493a59..f46fe369 100644 --- a/app/org/omg/sysml/metamodel/impl/RedefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RedefinitionImpl.java @@ -174,6 +174,38 @@ public void setGeneral(Type general) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Redefinition") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Redefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -334,11 +366,13 @@ public void setOwningFeature(Feature owningFeature) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Redefinition") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl.java b/app/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl.java new file mode 100644 index 00000000..2a6ada6d --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl.java @@ -0,0 +1,705 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel.impl; + +import org.omg.sysml.metamodel.*; + +import org.omg.sysml.metamodel.Package; +import org.omg.sysml.metamodel.Class; + +import jackson.DataSerializer; +import jackson.DataDeserializer; + +import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import org.hibernate.annotations.Any; +import org.hibernate.annotations.ManyToAny; +import org.hibernate.annotations.FetchMode; + +// import info.archinnov.achilles.annotations.UDT; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.EnumType; +import javax.persistence.ElementCollection; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Lob; +import javax.persistence.FetchType; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Table; +import javax.persistence.SecondaryTable; +import javax.persistence.CollectionTable; + +import java.util.Collection; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +@Entity(name = "ReferenceSubsettingImpl") +@SecondaryTable(name = "ReferenceSubsetting") +@org.hibernate.annotations.Table(appliesTo = "ReferenceSubsetting", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "ReferenceSubsetting") +@DiscriminatorValue(value = "ReferenceSubsetting") +@JsonTypeName(value = "ReferenceSubsetting") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class ReferenceSubsettingImpl extends SysMLTypeImpl implements ReferenceSubsetting { + // @info.archinnov.achilles.annotations.Column("aliasIds") + private List aliasIds; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "ReferenceSubsetting_aliasIds", + joinColumns = @JoinColumn(name = "ReferenceSubsetting_id")) + public List getAliasIds() { + if (aliasIds == null) { + aliasIds = new ArrayList<>(); + } + return aliasIds; + } + + @JsonSetter + public void setAliasIds(List aliasIds) { + this.aliasIds = aliasIds; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentation") + private List documentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_documentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(List documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("effectiveName") + private String effectiveName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "effectiveName", table = "ReferenceSubsetting") + public String getEffectiveName() { + return effectiveName; + } + + @JsonSetter + public void setEffectiveName(String effectiveName) { + this.effectiveName = effectiveName; + } + + + + // @info.archinnov.achilles.annotations.Column("elementId") + private java.util.UUID elementId; + + @JsonGetter + @javax.persistence.Column(name = "elementId", table = "ReferenceSubsetting") + public java.util.UUID getElementId() { + return elementId; + } + + @JsonSetter + public void setElementId(java.util.UUID elementId) { + this.elementId = elementId; + } + + + + // @info.archinnov.achilles.annotations.Column("general") + private Type general; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "general_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "general_id", table = "ReferenceSubsetting") + public Type getGeneral() { + return general; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setGeneral(Type general) { + this.general = general; + } + + + + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "ReferenceSubsetting") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ReferenceSubsetting") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "name", table = "ReferenceSubsetting") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private List ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_ownedAnnotation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(List ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private List ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_ownedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(List ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_ownedRelatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_ownedRelationship", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owner_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owner_id", table = "ReferenceSubsetting") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeature") + private Feature owningFeature; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeature_id", table = "ReferenceSubsetting") + public Feature getOwningFeature() { + return owningFeature; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setOwningFeature(Feature owningFeature) { + this.owningFeature = owningFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningMembership") + private OwningMembership owningMembership; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembership_id", table = "ReferenceSubsetting") + public OwningMembership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = OwningMembershipImpl.class) + public void setOwningMembership(OwningMembership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Namespace owningNamespace; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespace_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespace_id", table = "ReferenceSubsetting") + public Namespace getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class) + public void setOwningNamespace(Namespace owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElement_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElement_id", table = "ReferenceSubsetting") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationship_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationship_id", table = "ReferenceSubsetting") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningType") + private Type owningType; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "owningType_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningType_id", table = "ReferenceSubsetting") + public Type getOwningType() { + return owningType; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setOwningType(Type owningType) { + this.owningType = owningType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("qualifiedName") + private String qualifiedName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "qualifiedName", table = "ReferenceSubsetting") + public String getQualifiedName() { + return qualifiedName; + } + + @JsonSetter + public void setQualifiedName(String qualifiedName) { + this.qualifiedName = qualifiedName; + } + + + + // @info.archinnov.achilles.annotations.Column("referencedFeature") + private Feature referencedFeature; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "referencedFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "referencedFeature_id", table = "ReferenceSubsetting") + public Feature getReferencedFeature() { + return referencedFeature; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setReferencedFeature(Feature referencedFeature) { + this.referencedFeature = referencedFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("referencingFeature") + private Feature referencingFeature; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "referencingFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "referencingFeature_id", table = "ReferenceSubsetting") + public Feature getReferencingFeature() { + return referencingFeature; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setReferencingFeature(Feature referencingFeature) { + this.referencingFeature = referencingFeature; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_relatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("shortName") + private String shortName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "shortName", table = "ReferenceSubsetting") + public String getShortName() { + return shortName; + } + + @JsonSetter + public void setShortName(String shortName) { + this.shortName = shortName; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_source", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("specific") + private Type specific; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "specific_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "specific_id", table = "ReferenceSubsetting") + public Type getSpecific() { + return specific; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setSpecific(Type specific) { + this.specific = specific; + } + + + + // @info.archinnov.achilles.annotations.Column("subsettedFeature") + private Feature subsettedFeature; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "subsettedFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "subsettedFeature_id", table = "ReferenceSubsetting") + public Feature getSubsettedFeature() { + return subsettedFeature; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setSubsettedFeature(Feature subsettedFeature) { + this.subsettedFeature = subsettedFeature; + } + + + + // @info.archinnov.achilles.annotations.Column("subsettingFeature") + private Feature subsettingFeature; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "subsettingFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "subsettingFeature_id", table = "ReferenceSubsetting") + public Feature getSubsettingFeature() { + return subsettingFeature; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setSubsettingFeature(Feature subsettingFeature) { + this.subsettingFeature = subsettingFeature; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_target", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("textualRepresentation") + private List textualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceSubsetting_textualRepresentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTextualRepresentation() { + if (textualRepresentation == null) { + textualRepresentation = new ArrayList<>(); + } + return textualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setTextualRepresentation(List textualRepresentation) { + this.textualRepresentation = textualRepresentation; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java index 2e191196..071829bb 100644 --- a/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -506,6 +532,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -588,6 +640,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ReferenceUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1149,6 +1217,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1560,6 +1654,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1768,6 +1888,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1846,6 +1992,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ReferenceUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1974,6 +2141,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2016,11 +2209,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ReferenceUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2035,11 +2230,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ReferenceUsage") public OwningMembership getOwningMembership() { @@ -2226,6 +2423,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/RelationshipImpl.java b/app/org/omg/sysml/metamodel/impl/RelationshipImpl.java index d5a15960..44e05e8c 100644 --- a/app/org/omg/sysml/metamodel/impl/RelationshipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RelationshipImpl.java @@ -155,6 +155,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Relationship") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Relationship") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -294,11 +326,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Relationship") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl.java index cab52e1a..f7cab8c5 100644 --- a/app/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "RenderingDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -890,6 +958,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1124,6 +1218,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1202,6 +1322,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1486,6 +1632,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1637,11 +1809,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "RenderingDefinition") public OwningMembership getOwningMembership() { @@ -1786,6 +1960,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java b/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java index cb8e749d..d9ba276e 100644 --- a/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "RenderingUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1212,6 +1280,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1649,6 +1743,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1857,6 +1977,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1935,6 +2081,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "RenderingUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2063,6 +2230,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2105,11 +2298,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "RenderingUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2124,11 +2319,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "RenderingUsage") public OwningMembership getOwningMembership() { @@ -2401,6 +2598,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java index 9c3ce3c9..456cb2ee 100644 --- a/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "RequirementConstraintMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "RequirementConstraintMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "RequirementConstraintMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "RequirementConstraintMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "RequirementConstraintMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -351,11 +364,13 @@ public void setOwnedAnnotation(List ownedAnnotation) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConstraint") private ConstraintUsage ownedConstraint; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ConstraintUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConstraint_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedConstraint_id", table = "RequirementConstraintMembership") public ConstraintUsage getOwnedConstraint() { @@ -396,11 +411,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "RequirementConstraintMembership") public Element getOwnedMemberElement() { @@ -435,11 +452,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "RequirementConstraintMembership") public Feature getOwnedMemberFeature() { @@ -564,31 +583,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "RequirementConstraintMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "RequirementConstraintMembership") public OwningMembership getOwningMembership() { @@ -842,6 +842,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "RequirementConstraintMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl.java index 312544a1..5400bcd2 100644 --- a/app/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl.java @@ -145,6 +145,32 @@ public void setAssumedConstraint(List assumedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -493,6 +519,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -527,6 +579,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "RequirementDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1012,6 +1080,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1246,6 +1340,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1324,6 +1444,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1608,6 +1754,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1759,11 +1931,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "RequirementDefinition") public OwningMembership getOwningMembership() { @@ -2071,6 +2245,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java index a1519ade..c18077ac 100644 --- a/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java @@ -244,6 +244,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -673,6 +699,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -755,6 +807,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "RequirementUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1350,6 +1418,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1787,6 +1881,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1995,6 +2115,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2073,6 +2219,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "RequirementUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2201,6 +2368,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2243,11 +2436,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "RequirementUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2262,11 +2457,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "RequirementUsage") public OwningMembership getOwningMembership() { @@ -2697,6 +2894,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java index b1818408..6e3fa6bc 100644 --- a/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "RequirementVerificationMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "RequirementVerificationMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "RequirementVerificationMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "RequirementVerificationMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "RequirementVerificationMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -351,11 +364,13 @@ public void setOwnedAnnotation(List ownedAnnotation) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConstraint") private ConstraintUsage ownedConstraint; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ConstraintUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedConstraint_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedConstraint_id", table = "RequirementVerificationMembership") public ConstraintUsage getOwnedConstraint() { @@ -396,11 +411,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "RequirementVerificationMembership") public Element getOwnedMemberElement() { @@ -435,11 +452,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "RequirementVerificationMembership") public Feature getOwnedMemberFeature() { @@ -542,11 +561,13 @@ public void setOwnedRelationship(List ownedRelationship) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedRequirement") private RequirementUsage ownedRequirement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedRequirement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedRequirement_id", table = "RequirementVerificationMembership") public RequirementUsage getOwnedRequirement() { @@ -583,31 +604,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "RequirementVerificationMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "RequirementVerificationMembership") public OwningMembership getOwningMembership() { @@ -861,6 +863,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "RequirementVerificationMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("verifiedRequirement") private RequirementUsage verifiedRequirement; diff --git a/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java index 7bb2b48a..e9ebaa5c 100644 --- a/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "ResultExpressionMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "ResultExpressionMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "ResultExpressionMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "ResultExpressionMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ResultExpressionMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ResultExpressionMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "ResultExpressionMembership") public Feature getOwnedMemberFeature() { @@ -505,11 +522,13 @@ public void setOwnedRelationship(List ownedRelationship) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedResultExpression") private Expression ownedResultExpression; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ExpressionMetaDef", metaColumn = @javax.persistence.Column(name = "ownedResultExpression_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedResultExpression_id", table = "ResultExpressionMembership") public Expression getOwnedResultExpression() { @@ -546,31 +565,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "ResultExpressionMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ResultExpressionMembership") public OwningMembership getOwningMembership() { @@ -803,6 +803,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "ResultExpressionMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java index 4833074c..b623afb5 100644 --- a/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "ReturnParameterMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "ReturnParameterMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "ReturnParameterMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "ReturnParameterMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ReturnParameterMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ReturnParameterMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "ReturnParameterMembership") public Feature getOwnedMemberFeature() { @@ -437,11 +454,13 @@ public void setOwnedMemberName(String ownedMemberName) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberParameter") private Feature ownedMemberParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberParameter_id", table = "ReturnParameterMembership") public Feature getOwnedMemberParameter() { @@ -546,31 +565,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "ReturnParameterMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ReturnParameterMembership") public OwningMembership getOwningMembership() { @@ -803,6 +803,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "ReturnParameterMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java index eff1d93c..889e3872 100644 --- a/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java @@ -265,6 +265,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -694,6 +720,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -776,6 +828,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SatisfyRequirementUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1387,6 +1455,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1824,6 +1918,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2032,6 +2152,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2110,6 +2256,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SatisfyRequirementUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2238,6 +2405,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2280,11 +2473,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SatisfyRequirementUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2299,11 +2494,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SatisfyRequirementUsage") public OwningMembership getOwningMembership() { @@ -2776,6 +2973,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/SelectExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/SelectExpressionImpl.java index b0e0ec1b..26e353a6 100644 --- a/app/org/omg/sysml/metamodel/impl/SelectExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SelectExpressionImpl.java @@ -171,6 +171,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SelectExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SelectExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SelectExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -933,6 +1001,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SelectExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1141,6 +1235,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SelectExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1219,6 +1339,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SelectExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1347,6 +1488,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SelectExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1368,11 +1535,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SelectExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1387,11 +1556,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SelectExpression") public OwningMembership getOwningMembership() { @@ -1604,4 +1775,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SelectExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java index 762d6c56..3750c276 100644 --- a/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -579,6 +605,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -661,6 +713,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SendActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SendActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SendActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SendActionUsage") public OwningMembership getOwningMembership() { @@ -2448,6 +2645,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java b/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java index a6673efb..92e7c567 100644 --- a/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SourceEnd") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SourceEnd") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SourceEnd") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SourceEnd") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/SpecializationImpl.java b/app/org/omg/sysml/metamodel/impl/SpecializationImpl.java index a6793f91..eb931b8c 100644 --- a/app/org/omg/sysml/metamodel/impl/SpecializationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SpecializationImpl.java @@ -174,6 +174,38 @@ public void setGeneral(Type general) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Specialization") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Specialization") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -313,11 +345,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Specialization") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl.java index 112c2503..97faf9b9 100644 --- a/app/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "StakeholderMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "StakeholderMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "StakeholderMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "StakeholderMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "StakeholderMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "StakeholderMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "StakeholderMembership") public Feature getOwnedMemberFeature() { @@ -437,11 +454,13 @@ public void setOwnedMemberName(String ownedMemberName) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberParameter") private Feature ownedMemberParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberParameter_id", table = "StakeholderMembership") public Feature getOwnedMemberParameter() { @@ -524,11 +543,13 @@ public void setOwnedRelationship(List ownedRelationship) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedStakeholderParameter") private PartUsage ownedStakeholderParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "PartUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedStakeholderParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedStakeholderParameter_id", table = "StakeholderMembership") public PartUsage getOwnedStakeholderParameter() { @@ -565,31 +586,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "StakeholderMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "StakeholderMembership") public OwningMembership getOwningMembership() { @@ -822,6 +824,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "StakeholderMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/StateDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/StateDefinitionImpl.java index 510265f2..0cf697e3 100644 --- a/app/org/omg/sysml/metamodel/impl/StateDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StateDefinitionImpl.java @@ -119,6 +119,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -478,6 +504,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -512,6 +564,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "StateDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -995,6 +1063,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1229,6 +1323,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1307,6 +1427,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1591,6 +1737,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1742,11 +1914,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "StateDefinition") public OwningMembership getOwningMembership() { @@ -1943,6 +2117,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java index 0d7afe47..4ce33962 100644 --- a/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java @@ -70,11 +70,13 @@ @JsonTypeName(value = "StateSubactionMembership") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME) public class StateSubactionMembershipImpl extends SysMLTypeImpl implements StateSubactionMembership { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("action") private ActionUsage action; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ActionUsageMetaDef", metaColumn = @javax.persistence.Column(name = "action_type"), fetch = FetchType.LAZY) @JoinColumn(name = "action_id", table = "StateSubactionMembership") public ActionUsage getAction() { @@ -174,40 +176,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "StateSubactionMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "StateSubactionMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "StateSubactionMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "StateSubactionMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "StateSubactionMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -396,11 +411,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "StateSubactionMembership") public Element getOwnedMemberElement() { @@ -435,11 +452,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "StateSubactionMembership") public Feature getOwnedMemberFeature() { @@ -564,31 +583,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "StateSubactionMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "StateSubactionMembership") public OwningMembership getOwningMembership() { @@ -821,6 +821,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "StateSubactionMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java b/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java index 7fd5cf82..26dc83e8 100644 --- a/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -642,6 +668,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -724,6 +776,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "StateUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1317,6 +1385,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1754,6 +1848,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1962,6 +2082,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2040,6 +2186,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "StateUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2168,6 +2335,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2210,11 +2403,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "StateUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2229,11 +2424,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "StateUsage") public OwningMembership getOwningMembership() { @@ -2511,6 +2708,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/StepImpl.java b/app/org/omg/sysml/metamodel/impl/StepImpl.java index c8480165..6a3500f7 100644 --- a/app/org/omg/sysml/metamodel/impl/StepImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StepImpl.java @@ -145,6 +145,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -480,6 +506,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -562,6 +614,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Step") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -824,6 +892,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1032,6 +1126,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1110,6 +1230,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Step") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1238,6 +1379,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1259,11 +1426,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Step") public FeatureMembership getOwningFeatureMembership() { @@ -1278,11 +1447,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Step") public OwningMembership getOwningMembership() { @@ -1474,4 +1645,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/StructureImpl.java b/app/org/omg/sysml/metamodel/impl/StructureImpl.java index ca1dc41f..c9f9db54 100644 --- a/app/org/omg/sysml/metamodel/impl/StructureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StructureImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Structure_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Structure_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Structure") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Structure_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Structure_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -861,6 +981,32 @@ public void setOwnedSubclassification(Collection ownedSubclas + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Structure_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -882,11 +1028,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Structure") public OwningMembership getOwningMembership() { @@ -1005,4 +1153,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Structure_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/SubclassificationImpl.java b/app/org/omg/sysml/metamodel/impl/SubclassificationImpl.java index 4cf77a09..29a0b7cf 100644 --- a/app/org/omg/sysml/metamodel/impl/SubclassificationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SubclassificationImpl.java @@ -174,6 +174,38 @@ public void setGeneral(Type general) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Subclassification") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Subclassification") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -334,11 +366,13 @@ public void setOwningClassifier(Classifier owningClassifier) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Subclassification") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java index 59436b6d..adfb9027 100644 --- a/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "SubjectMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "SubjectMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "SubjectMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "SubjectMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SubjectMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "SubjectMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "SubjectMembership") public Feature getOwnedMemberFeature() { @@ -437,11 +454,13 @@ public void setOwnedMemberName(String ownedMemberName) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberParameter") private Feature ownedMemberParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberParameter_id", table = "SubjectMembership") public Feature getOwnedMemberParameter() { @@ -524,11 +543,13 @@ public void setOwnedRelationship(List ownedRelationship) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedSubjectParameter") private Usage ownedSubjectParameter; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedSubjectParameter_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedSubjectParameter_id", table = "SubjectMembership") public Usage getOwnedSubjectParameter() { @@ -565,31 +586,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "SubjectMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SubjectMembership") public OwningMembership getOwningMembership() { @@ -822,6 +824,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "SubjectMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/SubsettingImpl.java b/app/org/omg/sysml/metamodel/impl/SubsettingImpl.java index 7f51061e..b4cc3cfb 100644 --- a/app/org/omg/sysml/metamodel/impl/SubsettingImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SubsettingImpl.java @@ -174,6 +174,38 @@ public void setGeneral(Type general) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Subsetting") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Subsetting") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -334,11 +366,13 @@ public void setOwningFeature(Feature owningFeature) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Subsetting") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl.java index 1b776311..e374bcc0 100644 --- a/app/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "SuccessionAsUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -147,7 +147,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -156,7 +156,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "SuccessionAsUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -165,7 +165,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -610,6 +636,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -708,6 +760,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "SuccessionAsUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SuccessionAsUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1269,6 +1353,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1680,6 +1790,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1888,6 +2024,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1966,6 +2128,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SuccessionAsUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2118,6 +2301,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2160,11 +2369,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SuccessionAsUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2179,11 +2390,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SuccessionAsUsage") public OwningMembership getOwningMembership() { @@ -2460,7 +2673,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2469,7 +2682,7 @@ public void setTarget(List target) { @JoinTable(name = "SuccessionAsUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2478,7 +2691,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2583,6 +2796,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionAsUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl.java index fed238e7..5e5f975e 100644 --- a/app/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl.java @@ -70,6 +70,32 @@ @JsonTypeName(value = "SuccessionFlowConnectionUsage") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME) public class SuccessionFlowConnectionUsageImpl extends SysMLTypeImpl implements SuccessionFlowConnectionUsage { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("actionDefinition") + private List actionDefinition; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "BehaviorMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_actionDefinition", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getActionDefinition() { + if (actionDefinition == null) { + actionDefinition = new ArrayList<>(); + } + return actionDefinition; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = BehaviorImpl.class) + public void setActionDefinition(List actionDefinition) { + this.actionDefinition = actionDefinition; + } + + + // @info.archinnov.achilles.annotations.Column("aliasIds") private List aliasIds; @@ -95,7 +121,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +130,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "SuccessionFlowConnectionUsage_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +139,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -199,7 +225,7 @@ public void setConnectionDefinition(List connectionDefinit // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -208,7 +234,7 @@ public void setConnectionDefinition(List connectionDefinit @JoinTable(name = "SuccessionFlowConnectionUsage_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -217,7 +243,7 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } @@ -249,6 +275,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -532,6 +584,32 @@ public void setFeaturingType(List featuringType) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("flowConnectionDefinition") + private List flowConnectionDefinition; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InteractionMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_flowConnectionDefinition", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getFlowConnectionDefinition() { + if (flowConnectionDefinition == null) { + flowConnectionDefinition = new ArrayList<>(); + } + return flowConnectionDefinition; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InteractionImpl.class) + public void setFlowConnectionDefinition(List flowConnectionDefinition) { + this.flowConnectionDefinition = flowConnectionDefinition; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("guardExpression") private Collection guardExpression; @@ -683,6 +761,58 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("interaction") + private List interaction; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InteractionMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_interaction", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInteraction() { + if (interaction == null) { + interaction = new ArrayList<>(); + } + return interaction; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InteractionImpl.class) + public void setInteraction(List interaction) { + this.interaction = interaction; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -781,6 +911,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "SuccessionFlowConnectionUsage") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SuccessionFlowConnectionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -957,25 +1119,20 @@ public void setItemDefinition(List itemDefinition) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("itemFeature") - private Collection itemFeature; + private ItemFeature itemFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionFlowConnectionUsage_itemFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getItemFeature() { - if (itemFeature == null) { - itemFeature = new ArrayList<>(); - } + @Any(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "itemFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "itemFeature_id", table = "SuccessionFlowConnectionUsage") + public ItemFeature getItemFeature() { return itemFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ItemFeatureImpl.class) - public void setItemFeature(Collection itemFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = ItemFeatureImpl.class) + public void setItemFeature(ItemFeature itemFeature) { this.itemFeature = itemFeature; } @@ -1488,6 +1645,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1925,6 +2108,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2133,6 +2342,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2211,6 +2446,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SuccessionFlowConnectionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -2363,6 +2619,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2405,11 +2687,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SuccessionFlowConnectionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2424,11 +2708,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SuccessionFlowConnectionUsage") public OwningMembership getOwningMembership() { @@ -2772,25 +3058,20 @@ public void setSourceFeature(Feature sourceFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("sourceOutputFeature") - private List sourceOutputFeature; + private Feature sourceOutputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionFlowConnectionUsage_sourceOutputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getSourceOutputFeature() { - if (sourceOutputFeature == null) { - sourceOutputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "sourceOutputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "sourceOutputFeature_id", table = "SuccessionFlowConnectionUsage") + public Feature getSourceOutputFeature() { return sourceOutputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setSourceOutputFeature(List sourceOutputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setSourceOutputFeature(Feature sourceOutputFeature) { this.sourceOutputFeature = sourceOutputFeature; } @@ -2822,7 +3103,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -2831,7 +3112,7 @@ public void setTarget(List target) { @JoinTable(name = "SuccessionFlowConnectionUsage_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -2840,7 +3121,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -2848,25 +3129,20 @@ public void setTargetFeature(Collection targetFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetInputFeature") - private List targetInputFeature; + private Feature targetInputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionFlowConnectionUsage_targetInputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getTargetInputFeature() { - if (targetInputFeature == null) { - targetInputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "targetInputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "targetInputFeature_id", table = "SuccessionFlowConnectionUsage") + public Feature getTargetInputFeature() { return targetInputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetInputFeature(List targetInputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setTargetInputFeature(Feature targetInputFeature) { this.targetInputFeature = targetInputFeature; } @@ -2971,6 +3247,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionFlowConnectionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java b/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java index 784f5ade..fe9f9f69 100644 --- a/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "Succession_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -147,7 +147,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -156,7 +156,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "Succession_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -165,12 +165,38 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -558,6 +584,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -656,6 +708,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Succession") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Succession") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -918,6 +1002,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1126,6 +1236,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1204,6 +1340,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Succession") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -1356,6 +1513,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1377,11 +1560,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Succession") public FeatureMembership getOwningFeatureMembership() { @@ -1396,11 +1581,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Succession") public OwningMembership getOwningMembership() { @@ -1656,7 +1843,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -1665,7 +1852,7 @@ public void setTarget(List target) { @JoinTable(name = "Succession_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -1674,7 +1861,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -1779,4 +1966,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java b/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java index 7b05e22e..12d61174 100644 --- a/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java @@ -95,7 +95,7 @@ public void setAliasIds(List aliasIds) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("association") - private Collection association; + private List association; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -104,7 +104,7 @@ public void setAliasIds(List aliasIds) { @JoinTable(name = "SuccessionItemFlow_association", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getAssociation() { + public List getAssociation() { if (association == null) { association = new ArrayList<>(); } @@ -113,7 +113,7 @@ public Collection getAssociation() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AssociationImpl.class) - public void setAssociation(Collection association) { + public void setAssociation(List association) { this.association = association; } @@ -173,7 +173,7 @@ public void setChainingFeature(List chainingFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("connectorEnd") - private Collection connectorEnd; + private List connectorEnd; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -182,7 +182,7 @@ public void setChainingFeature(List chainingFeature) { @JoinTable(name = "SuccessionItemFlow_connectorEnd", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getConnectorEnd() { + public List getConnectorEnd() { if (connectorEnd == null) { connectorEnd = new ArrayList<>(); } @@ -191,12 +191,38 @@ public Collection getConnectorEnd() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setConnectorEnd(Collection connectorEnd) { + public void setConnectorEnd(List connectorEnd) { this.connectorEnd = connectorEnd; } + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -584,6 +610,58 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("interaction") + private List interaction; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "InteractionMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_interaction", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getInteraction() { + if (interaction == null) { + interaction = new ArrayList<>(); + } + return interaction; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = InteractionImpl.class) + public void setInteraction(List interaction) { + this.interaction = interaction; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -682,6 +760,38 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "SuccessionItemFlow") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "SuccessionItemFlow") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -782,25 +892,20 @@ public void setIsUnique(Boolean isUnique) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("itemFeature") - private Collection itemFeature; + private ItemFeature itemFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionItemFlow_itemFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getItemFeature() { - if (itemFeature == null) { - itemFeature = new ArrayList<>(); - } + @Any(metaDef = "ItemFeatureMetaDef", metaColumn = @javax.persistence.Column(name = "itemFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "itemFeature_id", table = "SuccessionItemFlow") + public ItemFeature getItemFeature() { return itemFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ItemFeatureImpl.class) - public void setItemFeature(Collection itemFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = ItemFeatureImpl.class) + public void setItemFeature(ItemFeature itemFeature) { this.itemFeature = itemFeature; } @@ -1048,6 +1153,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1256,6 +1387,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1334,6 +1491,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "SuccessionItemFlow") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -1486,6 +1664,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1507,11 +1711,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "SuccessionItemFlow") public FeatureMembership getOwningFeatureMembership() { @@ -1526,11 +1732,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "SuccessionItemFlow") public OwningMembership getOwningMembership() { @@ -1788,25 +1996,20 @@ public void setSourceFeature(Feature sourceFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("sourceOutputFeature") - private List sourceOutputFeature; + private Feature sourceOutputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionItemFlow_sourceOutputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getSourceOutputFeature() { - if (sourceOutputFeature == null) { - sourceOutputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "sourceOutputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "sourceOutputFeature_id", table = "SuccessionItemFlow") + public Feature getSourceOutputFeature() { return sourceOutputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setSourceOutputFeature(List sourceOutputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setSourceOutputFeature(Feature sourceOutputFeature) { this.sourceOutputFeature = sourceOutputFeature; } @@ -1838,7 +2041,7 @@ public void setTarget(List target) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetFeature") - private Collection targetFeature; + private List targetFeature; @JsonGetter @JsonSerialize(contentUsing = DataSerializer.class) @@ -1847,7 +2050,7 @@ public void setTarget(List target) { @JoinTable(name = "SuccessionItemFlow_targetFeature", joinColumns = @JoinColumn(name = "class_id"), inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public Collection getTargetFeature() { + public List getTargetFeature() { if (targetFeature == null) { targetFeature = new ArrayList<>(); } @@ -1856,7 +2059,7 @@ public Collection getTargetFeature() { @JsonSetter @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetFeature(Collection targetFeature) { + public void setTargetFeature(List targetFeature) { this.targetFeature = targetFeature; } @@ -1864,25 +2067,20 @@ public void setTargetFeature(Collection targetFeature) { // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("targetInputFeature") - private List targetInputFeature; + private Feature targetInputFeature; @JsonGetter - @JsonSerialize(contentUsing = DataSerializer.class) + @JsonSerialize(using = DataSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionItemFlow_targetInputFeature", - joinColumns = @JoinColumn(name = "class_id"), - inverseJoinColumns = @JoinColumn(name = "attribute_id")) - public List getTargetInputFeature() { - if (targetInputFeature == null) { - targetInputFeature = new ArrayList<>(); - } + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "targetInputFeature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "targetInputFeature_id", table = "SuccessionItemFlow") + public Feature getTargetInputFeature() { return targetInputFeature; } @JsonSetter - @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = FeatureImpl.class) - public void setTargetInputFeature(List targetInputFeature) { + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setTargetInputFeature(Feature targetInputFeature) { this.targetInputFeature = targetInputFeature; } @@ -1987,4 +2185,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java b/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java index ca4d2f8f..f8e57fcb 100644 --- a/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java @@ -119,6 +119,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -454,6 +480,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -536,6 +588,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "TargetEnd") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -798,6 +866,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1006,6 +1100,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1084,6 +1204,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "TargetEnd") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1212,6 +1353,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1233,11 +1400,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "TargetEnd") public FeatureMembership getOwningFeatureMembership() { @@ -1252,11 +1421,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "TargetEnd") public OwningMembership getOwningMembership() { @@ -1422,4 +1593,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/TextualRepresentationImpl.java b/app/org/omg/sysml/metamodel/impl/TextualRepresentationImpl.java index 83464c5f..688c48d1 100644 --- a/app/org/omg/sysml/metamodel/impl/TextualRepresentationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TextualRepresentationImpl.java @@ -223,6 +223,22 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "TextualRepresentation") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("language") private String language; @@ -356,11 +372,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "TextualRepresentation") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java index 2dff6d34..a6122deb 100644 --- a/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "TransitionFeatureMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "TransitionFeatureMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "TransitionFeatureMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "TransitionFeatureMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "TransitionFeatureMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -377,11 +390,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "TransitionFeatureMembership") public Element getOwnedMemberElement() { @@ -416,11 +431,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "TransitionFeatureMembership") public Feature getOwnedMemberFeature() { @@ -545,31 +562,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "TransitionFeatureMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "TransitionFeatureMembership") public OwningMembership getOwningMembership() { @@ -802,11 +800,13 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("transitionFeature") private Step transitionFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "StepMetaDef", metaColumn = @javax.persistence.Column(name = "transitionFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "transitionFeature_id", table = "TransitionFeatureMembership") public Step getTransitionFeature() { @@ -821,6 +821,25 @@ public void setTransitionFeature(Step transitionFeature) { + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "TransitionFeatureMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java index 791e26f4..2bcc4f04 100644 --- a/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java @@ -197,6 +197,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -631,6 +657,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -713,6 +765,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "TransitionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1290,6 +1358,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1727,6 +1821,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1935,6 +2055,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2013,6 +2159,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "TransitionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2141,6 +2308,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2183,11 +2376,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "TransitionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2202,11 +2397,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "TransitionUsage") public OwningMembership getOwningMembership() { @@ -2547,6 +2744,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl.java index 19166b2d..fa61c203 100644 --- a/app/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl.java @@ -171,6 +171,32 @@ public void setChainingFeature(List chainingFeature) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TriggerInvocationExpression_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -527,6 +553,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TriggerInvocationExpression_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -609,6 +661,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "TriggerInvocationExpression") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isModelLevelEvaluable") private Boolean isModelLevelEvaluable; @@ -907,6 +975,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TriggerInvocationExpression_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1115,6 +1209,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TriggerInvocationExpression_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1193,6 +1313,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "TriggerInvocationExpression") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1321,6 +1462,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TriggerInvocationExpression_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -1342,11 +1509,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "TriggerInvocationExpression") public FeatureMembership getOwningFeatureMembership() { @@ -1361,11 +1530,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "TriggerInvocationExpression") public OwningMembership getOwningMembership() { @@ -1578,4 +1749,30 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "TriggerInvocationExpression_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java b/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java index 8f4e3fd8..06d6f087 100644 --- a/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java @@ -155,6 +155,25 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "TypeFeaturing") + public Feature getFeature() { + return feature; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) + public void setFeature(Feature feature) { + this.feature = feature; + } + + + // @info.archinnov.achilles.annotations.Column("featureOfType") private Feature featureOfType; @@ -193,6 +212,38 @@ public void setFeaturingType(Type featuringType) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "TypeFeaturing") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "TypeFeaturing") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("name") private String name; @@ -353,11 +404,13 @@ public void setOwningFeatureOfType(Feature owningFeatureOfType) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "TypeFeaturing") public OwningMembership getOwningMembership() { @@ -569,4 +622,23 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "TypeFeaturing") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/TypeImpl.java b/app/org/omg/sysml/metamodel/impl/TypeImpl.java index ce0fa1a1..0c225afc 100644 --- a/app/org/omg/sysml/metamodel/impl/TypeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TypeImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Type_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -363,6 +389,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Type_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -397,6 +449,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Type") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isSufficient") private Boolean isSufficient; @@ -577,6 +645,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Type_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -733,6 +827,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Type_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -835,6 +955,32 @@ public void setOwnedSpecialization(List ownedSpecialization) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Type_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -856,11 +1002,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Type") public OwningMembership getOwningMembership() { @@ -979,4 +1127,30 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Type_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/UnioningImpl.java b/app/org/omg/sysml/metamodel/impl/UnioningImpl.java new file mode 100644 index 00000000..f312cba5 --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/UnioningImpl.java @@ -0,0 +1,587 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2021-2022 Twingineer LLC + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * @license LGPL-3.0-or-later + */ + +package org.omg.sysml.metamodel.impl; + +import org.omg.sysml.metamodel.*; + +import org.omg.sysml.metamodel.Package; +import org.omg.sysml.metamodel.Class; + +import jackson.DataSerializer; +import jackson.DataDeserializer; + +import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +import org.hibernate.annotations.Any; +import org.hibernate.annotations.ManyToAny; +import org.hibernate.annotations.FetchMode; + +// import info.archinnov.achilles.annotations.UDT; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.EnumType; +import javax.persistence.ElementCollection; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.Lob; +import javax.persistence.FetchType; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Table; +import javax.persistence.SecondaryTable; +import javax.persistence.CollectionTable; + +import java.util.Collection; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +@Entity(name = "UnioningImpl") +@SecondaryTable(name = "Unioning") +@org.hibernate.annotations.Table(appliesTo = "Unioning", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "Unioning") +@DiscriminatorValue(value = "Unioning") +@JsonTypeName(value = "Unioning") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class UnioningImpl extends SysMLTypeImpl implements Unioning { + // @info.archinnov.achilles.annotations.Column("aliasIds") + private List aliasIds; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "Unioning_aliasIds", + joinColumns = @JoinColumn(name = "Unioning_id")) + public List getAliasIds() { + if (aliasIds == null) { + aliasIds = new ArrayList<>(); + } + return aliasIds; + } + + @JsonSetter + public void setAliasIds(List aliasIds) { + this.aliasIds = aliasIds; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentation") + private List documentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_documentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(List documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("effectiveName") + private String effectiveName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "effectiveName", table = "Unioning") + public String getEffectiveName() { + return effectiveName; + } + + @JsonSetter + public void setEffectiveName(String effectiveName) { + this.effectiveName = effectiveName; + } + + + + // @info.archinnov.achilles.annotations.Column("elementId") + private java.util.UUID elementId; + + @JsonGetter + @javax.persistence.Column(name = "elementId", table = "Unioning") + public java.util.UUID getElementId() { + return elementId; + } + + @JsonSetter + public void setElementId(java.util.UUID elementId) { + this.elementId = elementId; + } + + + + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "Unioning") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Unioning") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "name", table = "Unioning") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private List ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_ownedAnnotation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(List ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private List ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_ownedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(List ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_ownedRelatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_ownedRelationship", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owner_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owner_id", table = "Unioning") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningMembership") + private OwningMembership owningMembership; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembership_id", table = "Unioning") + public OwningMembership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = OwningMembershipImpl.class) + public void setOwningMembership(OwningMembership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Namespace owningNamespace; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "NamespaceMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespace_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespace_id", table = "Unioning") + public Namespace getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = NamespaceImpl.class) + public void setOwningNamespace(Namespace owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElement_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElement_id", table = "Unioning") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationship_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationship_id", table = "Unioning") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("qualifiedName") + private String qualifiedName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "qualifiedName", table = "Unioning") + public String getQualifiedName() { + return qualifiedName; + } + + @JsonSetter + public void setQualifiedName(String qualifiedName) { + this.qualifiedName = qualifiedName; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_relatedElement", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("shortName") + private String shortName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "shortName", table = "Unioning") + public String getShortName() { + return shortName; + } + + @JsonSetter + public void setShortName(String shortName) { + this.shortName = shortName; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_source", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_target", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("textualRepresentation") + private List textualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Unioning_textualRepresentation", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getTextualRepresentation() { + if (textualRepresentation == null) { + textualRepresentation = new ArrayList<>(); + } + return textualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setTextualRepresentation(List textualRepresentation) { + this.textualRepresentation = textualRepresentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("typeUnioned") + private Type typeUnioned; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "typeUnioned_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "typeUnioned_id", table = "Unioning") + public Type getTypeUnioned() { + return typeUnioned; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setTypeUnioned(Type typeUnioned) { + this.typeUnioned = typeUnioned; + } + + + + // @info.archinnov.achilles.annotations.Column("unioningType") + private Type unioningType; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "unioningType_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "unioningType_id", table = "Unioning") + public Type getUnioningType() { + return unioningType; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setUnioningType(Type unioningType) { + this.unioningType = unioningType; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/UsageImpl.java b/app/org/omg/sysml/metamodel/impl/UsageImpl.java index 725fdb53..3d03df3c 100644 --- a/app/org/omg/sysml/metamodel/impl/UsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/UsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -506,6 +532,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -588,6 +640,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "Usage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("isNonunique") private Boolean isNonunique; @@ -1149,6 +1217,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1560,6 +1654,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1768,6 +1888,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1846,6 +1992,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "Usage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -1974,6 +2141,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2016,11 +2209,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "Usage") public FeatureMembership getOwningFeatureMembership() { @@ -2035,11 +2230,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "Usage") public OwningMembership getOwningMembership() { @@ -2226,6 +2423,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl.java index ea161efe..75dde0e6 100644 --- a/app/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl.java @@ -171,6 +171,32 @@ public void setCalculation(List calculation) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -519,6 +545,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -553,6 +605,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "UseCaseDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1059,6 +1127,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1293,6 +1387,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1371,6 +1491,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1655,6 +1801,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1806,11 +1978,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "UseCaseDefinition") public OwningMembership getOwningMembership() { @@ -2023,6 +2197,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/UseCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/UseCaseUsageImpl.java index eac51687..03602641 100644 --- a/app/org/omg/sysml/metamodel/impl/UseCaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/UseCaseUsageImpl.java @@ -265,6 +265,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -694,6 +720,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -776,6 +828,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "UseCaseUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1371,6 +1439,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1829,6 +1923,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2037,6 +2157,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2115,6 +2261,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "UseCaseUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2243,6 +2410,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2285,11 +2478,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "UseCaseUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2304,11 +2499,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "UseCaseUsage") public OwningMembership getOwningMembership() { @@ -2602,6 +2799,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "UseCaseUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/VariantMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/VariantMembershipImpl.java index cd45f6d4..2e961e27 100644 --- a/app/org/omg/sysml/metamodel/impl/VariantMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/VariantMembershipImpl.java @@ -155,6 +155,38 @@ public void setElementId(java.util.UUID elementId) { + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; + + @JsonGetter + @javax.persistence.Column(name = "isImplied", table = "VariantMembership") + public Boolean getIsImplied() { + return isImplied; + } + + @JsonSetter + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "VariantMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("memberElement") private Element memberElement; @@ -321,11 +353,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "VariantMembership") public Element getOwnedMemberElement() { @@ -448,11 +482,13 @@ public void setOwnedRelationship(List ownedRelationship) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedVariantUsage") private Usage ownedVariantUsage; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "UsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedVariantUsage_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedVariantUsage_id", table = "VariantMembership") public Usage getOwnedVariantUsage() { @@ -488,11 +524,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "VariantMembership") public OwningMembership getOwningMembership() { diff --git a/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java index b6e6d5ae..da645155 100644 --- a/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java @@ -171,6 +171,32 @@ public void setCalculation(List calculation) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -493,6 +519,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -527,6 +579,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "VerificationCaseDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1033,6 +1101,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1267,6 +1361,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1345,6 +1465,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1629,6 +1775,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1780,11 +1952,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "VerificationCaseDefinition") public OwningMembership getOwningMembership() { @@ -1997,6 +2171,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java index 0d6870e9..fcc35e89 100644 --- a/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java @@ -265,6 +265,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -668,6 +694,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -750,6 +802,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "VerificationCaseUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1345,6 +1413,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1803,6 +1897,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -2011,6 +2131,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2089,6 +2235,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "VerificationCaseUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2217,6 +2384,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2259,11 +2452,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "VerificationCaseUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2278,11 +2473,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "VerificationCaseUsage") public OwningMembership getOwningMembership() { @@ -2576,6 +2773,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ViewDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ViewDefinitionImpl.java index d68ef123..e3ca03cd 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewDefinitionImpl.java @@ -93,6 +93,32 @@ public void setAliasIds(List aliasIds) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -389,6 +415,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -423,6 +475,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ViewDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -890,6 +958,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1124,6 +1218,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1202,6 +1322,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1486,6 +1632,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1637,11 +1809,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ViewDefinition") public OwningMembership getOwningMembership() { @@ -1786,6 +1960,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl.java index a3d97688..739722b2 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl.java @@ -155,40 +155,53 @@ public void setElementId(java.util.UUID elementId) { - // @info.archinnov.achilles.annotations.Column("featureOfType") - private Feature featureOfType; + // @info.archinnov.achilles.annotations.Column("feature") + private Feature feature; @JsonGetter @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featureOfType_id", table = "ViewRenderingMembership") - public Feature getFeatureOfType() { - return featureOfType; + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "feature_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "feature_id", table = "ViewRenderingMembership") + public Feature getFeature() { + return feature; } @JsonSetter @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setFeatureOfType(Feature featureOfType) { - this.featureOfType = featureOfType; + public void setFeature(Feature feature) { + this.feature = feature; } - // @info.archinnov.achilles.annotations.Column("featuringType") - private Type featuringType; + // @info.archinnov.achilles.annotations.Column("isImplied") + private Boolean isImplied; @JsonGetter - @JsonSerialize(using = DataSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "featuringType_id", table = "ViewRenderingMembership") - public Type getFeaturingType() { - return featuringType; + @javax.persistence.Column(name = "isImplied", table = "ViewRenderingMembership") + public Boolean getIsImplied() { + return isImplied; } @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) - public void setFeaturingType(Type featuringType) { - this.featuringType = featuringType; + public void setIsImplied(Boolean isImplied) { + this.isImplied = isImplied; + } + + + + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ViewRenderingMembership") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; } @@ -359,11 +372,13 @@ public void setOwnedElement(List ownedElement) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberElement") private Element ownedMemberElement; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElement_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberElement_id", table = "ViewRenderingMembership") public Element getOwnedMemberElement() { @@ -398,11 +413,13 @@ public void setOwnedMemberElementId(String ownedMemberElementId) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") private Feature ownedMemberFeature; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeature_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedMemberFeature_id", table = "ViewRenderingMembership") public Feature getOwnedMemberFeature() { @@ -505,11 +522,13 @@ public void setOwnedRelationship(List ownedRelationship) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedRendering") private RenderingUsage ownedRendering; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "RenderingUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedRendering_type"), fetch = FetchType.LAZY) @JoinColumn(name = "ownedRendering_id", table = "ViewRenderingMembership") public RenderingUsage getOwnedRendering() { @@ -546,31 +565,12 @@ public void setOwner(Element owner) { // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") - private Feature owningFeatureOfType; - - @JsonGetter - @JsonSerialize(using = DataSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfType_type"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningFeatureOfType_id", table = "ViewRenderingMembership") - public Feature getOwningFeatureOfType() { - return owningFeatureOfType; - } - - @JsonSetter - @JsonDeserialize(using = DataDeserializer.class, as = FeatureImpl.class) - public void setOwningFeatureOfType(Feature owningFeatureOfType) { - this.owningFeatureOfType = owningFeatureOfType; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ViewRenderingMembership") public OwningMembership getOwningMembership() { @@ -824,6 +824,25 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Column("type") + private Type type; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "type_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "type_id", table = "ViewRenderingMembership") + public Type getType() { + return type; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = TypeImpl.class) + public void setType(Type type) { + this.type = type; + } + + + // @info.archinnov.achilles.annotations.Column("visibility") // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) private VisibilityKind visibility; diff --git a/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java index e1a94cdf..68d30a08 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java @@ -145,6 +145,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -553,6 +579,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -635,6 +687,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ViewUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1238,6 +1306,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1675,6 +1769,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1883,6 +2003,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1961,6 +2107,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ViewUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2089,6 +2256,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2131,11 +2324,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ViewUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2150,11 +2345,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ViewUsage") public OwningMembership getOwningMembership() { @@ -2432,6 +2629,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl.java index 5ef1ddcf..486e87d8 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl.java @@ -145,6 +145,32 @@ public void setAssumedConstraint(List assumedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -493,6 +519,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -527,6 +579,22 @@ public void setIsConjugated(Boolean isConjugated) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ViewpointDefinition") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1012,6 +1080,32 @@ public void setOwnedConstraint(List ownedConstraint) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1246,6 +1340,32 @@ public void setOwnedInterface(List ownedInterface) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedItem") private List ownedItem; @@ -1324,6 +1444,32 @@ public void setOwnedMembership(List ownedMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedMetadata") + private List ownedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_ownedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedMetadata() { + if (ownedMetadata == null) { + ownedMetadata = new ArrayList<>(); + } + return ownedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setOwnedMetadata(List ownedMetadata) { + this.ownedMetadata = ownedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedOccurrence") private List ownedOccurrence; @@ -1608,6 +1754,32 @@ public void setOwnedTransition(Collection ownedTransition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedUsage") private List ownedUsage; @@ -1759,11 +1931,13 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ViewpointDefinition") public OwningMembership getOwningMembership() { @@ -2071,6 +2245,32 @@ public void setTextualRepresentation(List textualRepresen + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointDefinition_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java index 65a4de14..c95d1cb0 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java @@ -244,6 +244,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -673,6 +699,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -755,6 +807,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "ViewpointUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1350,6 +1418,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1787,6 +1881,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1995,6 +2115,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -2073,6 +2219,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "ViewpointUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2201,6 +2368,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2243,11 +2436,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "ViewpointUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2262,11 +2457,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "ViewpointUsage") public OwningMembership getOwningMembership() { @@ -2697,6 +2894,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("usage") private List usage; diff --git a/app/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl.java index 3fafb0bd..6e5a39df 100644 --- a/app/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl.java @@ -218,6 +218,32 @@ public void setDefinition(List definition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("differencingType") + private List differencingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_differencingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getDifferencingType() { + if (differencingType == null) { + differencingType = new ArrayList<>(); + } + return differencingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setDifferencingType(List differencingType) { + this.differencingType = differencingType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("directedFeature") private List directedFeature; @@ -600,6 +626,32 @@ public void setInput(List input) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("intersectingType") + private List intersectingType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_intersectingType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getIntersectingType() { + if (intersectingType == null) { + intersectingType = new ArrayList<>(); + } + return intersectingType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setIntersectingType(List intersectingType) { + this.intersectingType = intersectingType; + } + + + // @info.archinnov.achilles.annotations.Column("isAbstract") private Boolean isAbstract; @@ -682,6 +734,22 @@ public void setIsEnd(Boolean isEnd) { + // @info.archinnov.achilles.annotations.Column("isImpliedIncluded") + private Boolean isImpliedIncluded; + + @JsonGetter + @javax.persistence.Column(name = "isImpliedIncluded", table = "WhileLoopActionUsage") + public Boolean getIsImpliedIncluded() { + return isImpliedIncluded; + } + + @JsonSetter + public void setIsImpliedIncluded(Boolean isImpliedIncluded) { + this.isImpliedIncluded = isImpliedIncluded; + } + + + // @info.archinnov.achilles.annotations.Column("isIndividual") private Boolean isIndividual; @@ -1259,6 +1327,32 @@ public void setNestedItem(List nestedItem) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("nestedMetadata") + private List nestedMetadata; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "MetadataUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_nestedMetadata", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getNestedMetadata() { + if (nestedMetadata == null) { + nestedMetadata = new ArrayList<>(); + } + return nestedMetadata; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = MetadataUsageImpl.class) + public void setNestedMetadata(List nestedMetadata) { + this.nestedMetadata = nestedMetadata; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("nestedOccurrence") private List nestedOccurrence; @@ -1696,6 +1790,32 @@ public void setOwnedConjugator(Conjugation ownedConjugator) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedDifferencing") + private List ownedDifferencing; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "DifferencingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_ownedDifferencing", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedDifferencing() { + if (ownedDifferencing == null) { + ownedDifferencing = new ArrayList<>(); + } + return ownedDifferencing; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = DifferencingImpl.class) + public void setOwnedDifferencing(List ownedDifferencing) { + this.ownedDifferencing = ownedDifferencing; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedDisjoining") private Collection ownedDisjoining; @@ -1904,6 +2024,32 @@ public void setOwnedImport(List ownedImport) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedIntersecting") + private List ownedIntersecting; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "IntersectingMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_ownedIntersecting", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedIntersecting() { + if (ownedIntersecting == null) { + ownedIntersecting = new ArrayList<>(); + } + return ownedIntersecting; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = IntersectingImpl.class) + public void setOwnedIntersecting(List ownedIntersecting) { + this.ownedIntersecting = ownedIntersecting; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedMember") private List ownedMember; @@ -1982,6 +2128,27 @@ public void setOwnedRedefinition(Collection ownedRedefinition) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedReferenceSubsetting") + private ReferenceSubsetting ownedReferenceSubsetting; + + @JsonGetter + @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ReferenceSubsettingMetaDef", metaColumn = @javax.persistence.Column(name = "ownedReferenceSubsetting_type"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedReferenceSubsetting_id", table = "WhileLoopActionUsage") + public ReferenceSubsetting getOwnedReferenceSubsetting() { + return ownedReferenceSubsetting; + } + + @JsonSetter + @JsonDeserialize(using = DataDeserializer.class, as = ReferenceSubsettingImpl.class) + public void setOwnedReferenceSubsetting(ReferenceSubsetting ownedReferenceSubsetting) { + this.ownedReferenceSubsetting = ownedReferenceSubsetting; + } + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") private List ownedRelationship; @@ -2110,6 +2277,32 @@ public void setOwnedTyping(List ownedTyping) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedUnioning") + private List ownedUnioning; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "UnioningMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_ownedUnioning", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getOwnedUnioning() { + if (ownedUnioning == null) { + ownedUnioning = new ArrayList<>(); + } + return ownedUnioning; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = UnioningImpl.class) + public void setOwnedUnioning(List ownedUnioning) { + this.ownedUnioning = ownedUnioning; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owner") private Element owner; @@ -2152,11 +2345,13 @@ public void setOwningDefinition(Definition owningDefinition) { + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningFeatureMembership") private FeatureMembership owningFeatureMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "FeatureMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningFeatureMembership_id", table = "WhileLoopActionUsage") public FeatureMembership getOwningFeatureMembership() { @@ -2171,11 +2366,13 @@ public void setOwningFeatureMembership(FeatureMembership owningFeatureMembership + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("owningMembership") private OwningMembership owningMembership; @JsonGetter @JsonSerialize(using = DataSerializer.class) + // @javax.persistence.Transient @Any(metaDef = "OwningMembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembership_type"), fetch = FetchType.LAZY) @JoinColumn(name = "owningMembership_id", table = "WhileLoopActionUsage") public OwningMembership getOwningMembership() { @@ -2427,6 +2624,32 @@ public void setType(List type) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("unioningType") + private List unioningType; + + @JsonGetter + @JsonSerialize(contentUsing = DataSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attribute_type"), fetch = FetchType.LAZY) + @JoinTable(name = "WhileLoopActionUsage_unioningType", + joinColumns = @JoinColumn(name = "class_id"), + inverseJoinColumns = @JoinColumn(name = "attribute_id")) + public List getUnioningType() { + if (unioningType == null) { + unioningType = new ArrayList<>(); + } + return unioningType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = DataDeserializer.class, contentAs = TypeImpl.class) + public void setUnioningType(List unioningType) { + this.unioningType = unioningType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("untilArgument") private Expression untilArgument; diff --git a/app/org/omg/sysml/metamodel/impl/package-info.java b/app/org/omg/sysml/metamodel/impl/package-info.java index 058f7714..b13bf5e2 100644 --- a/app/org/omg/sysml/metamodel/impl/package-info.java +++ b/app/org/omg/sysml/metamodel/impl/package-info.java @@ -67,6 +67,7 @@ @MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class), @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class), @MetaValue(value = "Dependency", targetEntity = DependencyImpl.class), + @MetaValue(value = "Differencing", targetEntity = DifferencingImpl.class), @MetaValue(value = "Disjoining", targetEntity = DisjoiningImpl.class), @MetaValue(value = "Documentation", targetEntity = DocumentationImpl.class), @MetaValue(value = "Element", targetEntity = ElementImpl.class), @@ -86,6 +87,8 @@ @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class), @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class), @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class), + @MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class), @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class), @@ -97,6 +100,7 @@ @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class), + @MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class), @MetaValue(value = "Invariant", targetEntity = InvariantImpl.class), @MetaValue(value = "InvocationExpression", targetEntity = InvocationExpressionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @@ -139,8 +143,8 @@ @MetaValue(value = "PortUsage", targetEntity = PortUsageImpl.class), @MetaValue(value = "PortioningFeature", targetEntity = PortioningFeatureImpl.class), @MetaValue(value = "Predicate", targetEntity = PredicateImpl.class), - @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class), @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), @MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class), @MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class), @MetaValue(value = "RenderingDefinition", targetEntity = RenderingDefinitionImpl.class), @@ -176,6 +180,7 @@ @MetaValue(value = "TriggerInvocationExpression", targetEntity = TriggerInvocationExpressionImpl.class), @MetaValue(value = "Type", targetEntity = TypeImpl.class), @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), + @MetaValue(value = "Unioning", targetEntity = UnioningImpl.class), @MetaValue(value = "Usage", targetEntity = UsageImpl.class), @MetaValue(value = "UseCaseDefinition", targetEntity = UseCaseDefinitionImpl.class), @MetaValue(value = "UseCaseUsage", targetEntity = UseCaseUsageImpl.class), @@ -199,6 +204,7 @@ @MetaValue(value = "AnalysisCaseDefinition", targetEntity = AnalysisCaseDefinitionImpl.class), @MetaValue(value = "CalculationDefinition", targetEntity = CalculationDefinitionImpl.class), @MetaValue(value = "CaseDefinition", targetEntity = CaseDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "StateDefinition", targetEntity = StateDefinitionImpl.class), @MetaValue(value = "UseCaseDefinition", targetEntity = UseCaseDefinitionImpl.class), @MetaValue(value = "VerificationCaseDefinition", targetEntity = VerificationCaseDefinitionImpl.class), @@ -214,6 +220,7 @@ @MetaValue(value = "ControlNode", targetEntity = ControlNodeImpl.class), @MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class), @MetaValue(value = "ExhibitStateUsage", targetEntity = ExhibitStateUsageImpl.class), + @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class), @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class), @MetaValue(value = "IfActionUsage", targetEntity = IfActionUsageImpl.class), @@ -224,6 +231,7 @@ @MetaValue(value = "PerformActionUsage", targetEntity = PerformActionUsageImpl.class), @MetaValue(value = "SendActionUsage", targetEntity = SendActionUsageImpl.class), @MetaValue(value = "StateUsage", targetEntity = StateUsageImpl.class), + @MetaValue(value = "SuccessionFlowConnectionUsage", targetEntity = SuccessionFlowConnectionUsageImpl.class), @MetaValue(value = "TransitionUsage", targetEntity = TransitionUsageImpl.class), @MetaValue(value = "UseCaseUsage", targetEntity = UseCaseUsageImpl.class), @MetaValue(value = "VerificationCaseUsage", targetEntity = VerificationCaseUsageImpl.class), @@ -256,7 +264,6 @@ @MetaValue(value = "Documentation", targetEntity = DocumentationImpl.class), @MetaValue(value = "MetadataFeature", targetEntity = MetadataFeatureImpl.class), @MetaValue(value = "MetadataUsage", targetEntity = MetadataUsageImpl.class), - @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class), @MetaValue(value = "TextualRepresentation", targetEntity = TextualRepresentationImpl.class), }), @AnyMetaDef(name = "AnnotationMetaDef", metaType = "string", idType = "java.util.UUID", @@ -278,6 +285,7 @@ @MetaValue(value = "Association", targetEntity = AssociationImpl.class), @MetaValue(value = "AssociationStructure", targetEntity = AssociationStructureImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), }), @@ -286,6 +294,7 @@ @MetaValue(value = "AllocationDefinition", targetEntity = AllocationDefinitionImpl.class), @MetaValue(value = "AssociationStructure", targetEntity = AssociationStructureImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), }), @AnyMetaDef(name = "AttributeDefinitionMetaDef", metaType = "string", idType = "java.util.UUID", @@ -307,6 +316,7 @@ @MetaValue(value = "CaseDefinition", targetEntity = CaseDefinitionImpl.class), @MetaValue(value = "ConcernDefinition", targetEntity = ConcernDefinitionImpl.class), @MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "Function", targetEntity = FunctionImpl.class), @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "Predicate", targetEntity = PredicateImpl.class), @@ -382,6 +392,7 @@ @MetaValue(value = "ConjugatedPortDefinition", targetEntity = ConjugatedPortDefinitionImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), @MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "Function", targetEntity = FunctionImpl.class), @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @@ -422,6 +433,7 @@ @MetaValue(value = "DataType", targetEntity = DataTypeImpl.class), @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class), @MetaValue(value = "EnumerationDefinition", targetEntity = EnumerationDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "Function", targetEntity = FunctionImpl.class), @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @@ -450,7 +462,6 @@ metaValues = { @MetaValue(value = "Comment", targetEntity = CommentImpl.class), @MetaValue(value = "Documentation", targetEntity = DocumentationImpl.class), - @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class), }), @AnyMetaDef(name = "ConcernDefinitionMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @@ -477,6 +488,7 @@ metaValues = { @MetaValue(value = "AllocationDefinition", targetEntity = AllocationDefinitionImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), }), @AnyMetaDef(name = "ConnectionUsageMetaDef", metaType = "string", idType = "java.util.UUID", @@ -562,6 +574,7 @@ @MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class), @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class), @MetaValue(value = "EnumerationDefinition", targetEntity = EnumerationDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @MetaValue(value = "MetadataDefinition", targetEntity = MetadataDefinitionImpl.class), @@ -580,6 +593,10 @@ metaValues = { @MetaValue(value = "Dependency", targetEntity = DependencyImpl.class), }), + @AnyMetaDef(name = "DifferencingMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "Differencing", targetEntity = DifferencingImpl.class), + }), @AnyMetaDef(name = "DisjoiningMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "Disjoining", targetEntity = DisjoiningImpl.class), @@ -634,6 +651,7 @@ @MetaValue(value = "DecisionNode", targetEntity = DecisionNodeImpl.class), @MetaValue(value = "Definition", targetEntity = DefinitionImpl.class), @MetaValue(value = "Dependency", targetEntity = DependencyImpl.class), + @MetaValue(value = "Differencing", targetEntity = DifferencingImpl.class), @MetaValue(value = "Disjoining", targetEntity = DisjoiningImpl.class), @MetaValue(value = "Documentation", targetEntity = DocumentationImpl.class), @MetaValue(value = "Element", targetEntity = ElementImpl.class), @@ -653,6 +671,8 @@ @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class), @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class), @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class), + @MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class), @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class), @@ -664,6 +684,7 @@ @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class), + @MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class), @MetaValue(value = "Invariant", targetEntity = InvariantImpl.class), @MetaValue(value = "InvocationExpression", targetEntity = InvocationExpressionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @@ -706,8 +727,8 @@ @MetaValue(value = "PortUsage", targetEntity = PortUsageImpl.class), @MetaValue(value = "PortioningFeature", targetEntity = PortioningFeatureImpl.class), @MetaValue(value = "Predicate", targetEntity = PredicateImpl.class), - @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class), @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), @MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class), @MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class), @MetaValue(value = "RenderingDefinition", targetEntity = RenderingDefinitionImpl.class), @@ -743,6 +764,7 @@ @MetaValue(value = "TriggerInvocationExpression", targetEntity = TriggerInvocationExpressionImpl.class), @MetaValue(value = "Type", targetEntity = TypeImpl.class), @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), + @MetaValue(value = "Unioning", targetEntity = UnioningImpl.class), @MetaValue(value = "Usage", targetEntity = UsageImpl.class), @MetaValue(value = "UseCaseDefinition", targetEntity = UseCaseDefinitionImpl.class), @MetaValue(value = "UseCaseUsage", targetEntity = UseCaseUsageImpl.class), @@ -947,6 +969,30 @@ metaValues = { @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class), }), + @AnyMetaDef(name = "FeaturingMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "ActorMembership", targetEntity = ActorMembershipImpl.class), + @MetaValue(value = "EndFeatureMembership", targetEntity = EndFeatureMembershipImpl.class), + @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.class), + @MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class), + @MetaValue(value = "FramedConcernMembership", targetEntity = FramedConcernMembershipImpl.class), + @MetaValue(value = "ObjectiveMembership", targetEntity = ObjectiveMembershipImpl.class), + @MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class), + @MetaValue(value = "RequirementConstraintMembership", targetEntity = RequirementConstraintMembershipImpl.class), + @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), + @MetaValue(value = "ResultExpressionMembership", targetEntity = ResultExpressionMembershipImpl.class), + @MetaValue(value = "ReturnParameterMembership", targetEntity = ReturnParameterMembershipImpl.class), + @MetaValue(value = "StakeholderMembership", targetEntity = StakeholderMembershipImpl.class), + @MetaValue(value = "StateSubactionMembership", targetEntity = StateSubactionMembershipImpl.class), + @MetaValue(value = "SubjectMembership", targetEntity = SubjectMembershipImpl.class), + @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), + @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), + @MetaValue(value = "ViewRenderingMembership", targetEntity = ViewRenderingMembershipImpl.class), + }), + @AnyMetaDef(name = "FlowConnectionDefinitionMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), + }), @AnyMetaDef(name = "FlowConnectionUsageMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @@ -993,6 +1039,7 @@ }), @AnyMetaDef(name = "InteractionMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), }), @AnyMetaDef(name = "InterfaceDefinitionMetaDef", metaType = "string", idType = "java.util.UUID", @@ -1003,6 +1050,10 @@ metaValues = { @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class), }), + @AnyMetaDef(name = "IntersectingMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class), + }), @AnyMetaDef(name = "InvariantMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "AssertConstraintUsage", targetEntity = AssertConstraintUsageImpl.class), @@ -1022,6 +1073,7 @@ metaValues = { @MetaValue(value = "AllocationDefinition", targetEntity = AllocationDefinitionImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @MetaValue(value = "MetadataDefinition", targetEntity = MetadataDefinitionImpl.class), @@ -1205,6 +1257,7 @@ @MetaValue(value = "Feature", targetEntity = FeatureImpl.class), @MetaValue(value = "FeatureChainExpression", targetEntity = FeatureChainExpressionImpl.class), @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class), @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class), @@ -1302,6 +1355,7 @@ @MetaValue(value = "ConjugatedPortDefinition", targetEntity = ConjugatedPortDefinitionImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), @MetaValue(value = "ConstraintDefinition", targetEntity = ConstraintDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @MetaValue(value = "MetadataDefinition", targetEntity = MetadataDefinitionImpl.class), @@ -1406,6 +1460,7 @@ metaValues = { @MetaValue(value = "AllocationDefinition", targetEntity = AllocationDefinitionImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "PartDefinition", targetEntity = PartDefinitionImpl.class), @MetaValue(value = "RenderingDefinition", targetEntity = RenderingDefinitionImpl.class), @@ -1453,14 +1508,14 @@ @MetaValue(value = "RequirementDefinition", targetEntity = RequirementDefinitionImpl.class), @MetaValue(value = "ViewpointDefinition", targetEntity = ViewpointDefinitionImpl.class), }), - @AnyMetaDef(name = "PrefixCommentMetaDef", metaType = "string", idType = "java.util.UUID", - metaValues = { - @MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class), - }), @AnyMetaDef(name = "RedefinitionMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), }), + @AnyMetaDef(name = "ReferenceSubsettingMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), + }), @AnyMetaDef(name = "ReferenceUsageMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class), @@ -1482,6 +1537,7 @@ @MetaValue(value = "Connector", targetEntity = ConnectorImpl.class), @MetaValue(value = "ConnectorAsUsage", targetEntity = ConnectorAsUsageImpl.class), @MetaValue(value = "Dependency", targetEntity = DependencyImpl.class), + @MetaValue(value = "Differencing", targetEntity = DifferencingImpl.class), @MetaValue(value = "Disjoining", targetEntity = DisjoiningImpl.class), @MetaValue(value = "ElementFilterMembership", targetEntity = ElementFilterMembershipImpl.class), @MetaValue(value = "EndFeatureMembership", targetEntity = EndFeatureMembershipImpl.class), @@ -1491,12 +1547,15 @@ @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.class), @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class), @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.class), + @MetaValue(value = "Featuring", targetEntity = FeaturingImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "FramedConcernMembership", targetEntity = FramedConcernMembershipImpl.class), @MetaValue(value = "Import", targetEntity = ImportImpl.class), @MetaValue(value = "Interaction", targetEntity = InteractionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "InterfaceUsage", targetEntity = InterfaceUsageImpl.class), + @MetaValue(value = "Intersecting", targetEntity = IntersectingImpl.class), @MetaValue(value = "ItemFlow", targetEntity = ItemFlowImpl.class), @MetaValue(value = "Membership", targetEntity = MembershipImpl.class), @MetaValue(value = "ObjectiveMembership", targetEntity = ObjectiveMembershipImpl.class), @@ -1504,6 +1563,7 @@ @MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class), @MetaValue(value = "PortConjugation", targetEntity = PortConjugationImpl.class), @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), @MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class), @MetaValue(value = "RequirementConstraintMembership", targetEntity = RequirementConstraintMembershipImpl.class), @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), @@ -1521,6 +1581,7 @@ @MetaValue(value = "SuccessionItemFlow", targetEntity = SuccessionItemFlowImpl.class), @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), + @MetaValue(value = "Unioning", targetEntity = UnioningImpl.class), @MetaValue(value = "VariantMembership", targetEntity = VariantMembershipImpl.class), @MetaValue(value = "ViewRenderingMembership", targetEntity = ViewRenderingMembershipImpl.class), }), @@ -1584,6 +1645,7 @@ @MetaValue(value = "ConjugatedPortTyping", targetEntity = ConjugatedPortTypingImpl.class), @MetaValue(value = "FeatureTyping", targetEntity = FeatureTypingImpl.class), @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), @MetaValue(value = "Specialization", targetEntity = SpecializationImpl.class), @MetaValue(value = "Subclassification", targetEntity = SubclassificationImpl.class), @MetaValue(value = "Subsetting", targetEntity = SubsettingImpl.class), @@ -1665,6 +1727,7 @@ @MetaValue(value = "AssociationStructure", targetEntity = AssociationStructureImpl.class), @MetaValue(value = "ConjugatedPortDefinition", targetEntity = ConjugatedPortDefinitionImpl.class), @MetaValue(value = "ConnectionDefinition", targetEntity = ConnectionDefinitionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "InterfaceDefinition", targetEntity = InterfaceDefinitionImpl.class), @MetaValue(value = "ItemDefinition", targetEntity = ItemDefinitionImpl.class), @MetaValue(value = "Metaclass", targetEntity = MetaclassImpl.class), @@ -1686,6 +1749,7 @@ @AnyMetaDef(name = "SubsettingMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), + @MetaValue(value = "ReferenceSubsetting", targetEntity = ReferenceSubsettingImpl.class), @MetaValue(value = "Subsetting", targetEntity = SubsettingImpl.class), }), @AnyMetaDef(name = "SuccessionMetaDef", metaType = "string", idType = "java.util.UUID", @@ -1775,6 +1839,7 @@ @MetaValue(value = "Feature", targetEntity = FeatureImpl.class), @MetaValue(value = "FeatureChainExpression", targetEntity = FeatureChainExpressionImpl.class), @MetaValue(value = "FeatureReferenceExpression", targetEntity = FeatureReferenceExpressionImpl.class), + @MetaValue(value = "FlowConnectionDefinition", targetEntity = FlowConnectionDefinitionImpl.class), @MetaValue(value = "FlowConnectionUsage", targetEntity = FlowConnectionUsageImpl.class), @MetaValue(value = "ForLoopActionUsage", targetEntity = ForLoopActionUsageImpl.class), @MetaValue(value = "ForkNode", targetEntity = ForkNodeImpl.class), @@ -1853,22 +1918,11 @@ }), @AnyMetaDef(name = "TypeFeaturingMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { - @MetaValue(value = "ActorMembership", targetEntity = ActorMembershipImpl.class), - @MetaValue(value = "EndFeatureMembership", targetEntity = EndFeatureMembershipImpl.class), - @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.class), - @MetaValue(value = "FramedConcernMembership", targetEntity = FramedConcernMembershipImpl.class), - @MetaValue(value = "ObjectiveMembership", targetEntity = ObjectiveMembershipImpl.class), - @MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class), - @MetaValue(value = "RequirementConstraintMembership", targetEntity = RequirementConstraintMembershipImpl.class), - @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), - @MetaValue(value = "ResultExpressionMembership", targetEntity = ResultExpressionMembershipImpl.class), - @MetaValue(value = "ReturnParameterMembership", targetEntity = ReturnParameterMembershipImpl.class), - @MetaValue(value = "StakeholderMembership", targetEntity = StakeholderMembershipImpl.class), - @MetaValue(value = "StateSubactionMembership", targetEntity = StateSubactionMembershipImpl.class), - @MetaValue(value = "SubjectMembership", targetEntity = SubjectMembershipImpl.class), - @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), - @MetaValue(value = "ViewRenderingMembership", targetEntity = ViewRenderingMembershipImpl.class), + }), + @AnyMetaDef(name = "UnioningMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "Unioning", targetEntity = UnioningImpl.class), }), @AnyMetaDef(name = "UsageMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { diff --git a/conf/META-INF/persistence.xml b/conf/META-INF/persistence.xml index 238eaa25..4b2b8969 100644 --- a/conf/META-INF/persistence.xml +++ b/conf/META-INF/persistence.xml @@ -69,6 +69,7 @@ org.omg.sysml.metamodel.impl.DecisionNodeImpl org.omg.sysml.metamodel.impl.DefinitionImpl org.omg.sysml.metamodel.impl.DependencyImpl + org.omg.sysml.metamodel.impl.DifferencingImpl org.omg.sysml.metamodel.impl.DisjoiningImpl org.omg.sysml.metamodel.impl.DocumentationImpl org.omg.sysml.metamodel.impl.ElementFilterMembershipImpl @@ -88,6 +89,8 @@ org.omg.sysml.metamodel.impl.FeatureReferenceExpressionImpl org.omg.sysml.metamodel.impl.FeatureTypingImpl org.omg.sysml.metamodel.impl.FeatureValueImpl + org.omg.sysml.metamodel.impl.FeaturingImpl + org.omg.sysml.metamodel.impl.FlowConnectionDefinitionImpl org.omg.sysml.metamodel.impl.FlowConnectionUsageImpl org.omg.sysml.metamodel.impl.ForkNodeImpl org.omg.sysml.metamodel.impl.ForLoopActionUsageImpl @@ -99,6 +102,7 @@ org.omg.sysml.metamodel.impl.InteractionImpl org.omg.sysml.metamodel.impl.InterfaceDefinitionImpl org.omg.sysml.metamodel.impl.InterfaceUsageImpl + org.omg.sysml.metamodel.impl.IntersectingImpl org.omg.sysml.metamodel.impl.InvariantImpl org.omg.sysml.metamodel.impl.InvocationExpressionImpl org.omg.sysml.metamodel.impl.ItemDefinitionImpl @@ -141,8 +145,8 @@ org.omg.sysml.metamodel.impl.PortioningFeatureImpl org.omg.sysml.metamodel.impl.PortUsageImpl org.omg.sysml.metamodel.impl.PredicateImpl - org.omg.sysml.metamodel.impl.PrefixCommentImpl org.omg.sysml.metamodel.impl.RedefinitionImpl + org.omg.sysml.metamodel.impl.ReferenceSubsettingImpl org.omg.sysml.metamodel.impl.ReferenceUsageImpl org.omg.sysml.metamodel.impl.RelationshipImpl org.omg.sysml.metamodel.impl.RenderingDefinitionImpl @@ -179,6 +183,7 @@ org.omg.sysml.metamodel.impl.TriggerInvocationExpressionImpl org.omg.sysml.metamodel.impl.TypeFeaturingImpl org.omg.sysml.metamodel.impl.TypeImpl + org.omg.sysml.metamodel.impl.UnioningImpl org.omg.sysml.metamodel.impl.UsageImpl org.omg.sysml.metamodel.impl.UseCaseDefinitionImpl org.omg.sysml.metamodel.impl.UseCaseUsageImpl diff --git a/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java index f40a0ef3..217d8536 100644 --- a/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(AcceptActionUsageImpl.class) public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.lifecycle.imp public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ActionDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ActionDefinitionImpl_.java index 88f7f7bb..91dc757b 100644 --- a/generated/org/omg/sysml/metamodel/impl/ActionDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ActionDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -40,6 +43,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -62,10 +67,12 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -73,6 +80,7 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -94,6 +102,7 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -114,11 +123,15 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -132,10 +145,12 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -143,6 +158,7 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -164,6 +180,7 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -184,11 +201,15 @@ public abstract class ActionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java index 5ebcd675..b85cf020 100644 --- a/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(ActionUsageImpl.class) public abstract class ActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class ActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class ActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ActorMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ActorMembershipImpl_.java index 88ba73ff..154c6111 100644 --- a/generated/org/omg/sysml/metamodel/impl/ActorMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ActorMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ActorMembershipImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ActorMembershipImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ActorMembershipImpl_ extends org.omg.sysml.lifecycle.impl. public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ActorMembershipImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl_.java index e2223ebb..1ea89d23 100644 --- a/generated/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AllocationDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -40,6 +43,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -63,16 +67,20 @@ public abstract class AllocationDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedView; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -96,6 +104,7 @@ public abstract class AllocationDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute relatedType; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; @@ -120,11 +129,15 @@ public abstract class AllocationDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute isAbstract; public static volatile CollectionAttribute associationEnd; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute connectionEnd; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -139,16 +152,20 @@ public abstract class AllocationDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_VIEW = "ownedView"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -172,6 +189,7 @@ public abstract class AllocationDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String RELATED_TYPE = "relatedType"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; @@ -196,11 +214,15 @@ public abstract class AllocationDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String IS_ABSTRACT = "isAbstract"; public static final String ASSOCIATION_END = "associationEnd"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String CONNECTION_END = "connectionEnd"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AllocationUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AllocationUsageImpl_.java index b21b421b..977e0712 100644 --- a/generated/org/omg/sysml/metamodel/impl/AllocationUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AllocationUsageImpl_.java @@ -21,6 +21,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -34,8 +35,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -54,6 +57,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -75,8 +79,10 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; @@ -91,7 +97,7 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; public static volatile ListAttribute nestedReference; public static volatile SingularAttribute isReadOnly; @@ -109,8 +115,10 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -130,6 +138,7 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -137,7 +146,7 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute featuringType; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile ListAttribute connectionDefinition; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute nestedFlow; @@ -146,8 +155,9 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; public static volatile ListAttribute inheritedMembership; @@ -163,8 +173,11 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedImport; public static volatile ListAttribute itemDefinition; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String USAGE = "usage"; @@ -176,8 +189,10 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; @@ -210,8 +225,10 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -231,6 +248,7 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -247,6 +265,7 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -264,8 +283,11 @@ public abstract class AllocationUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_IMPORT = "ownedImport"; public static final String ITEM_DEFINITION = "itemDefinition"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl_.java index 8c89e4f5..65ced133 100644 --- a/generated/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AnalysisCaseDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,10 +69,12 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -75,6 +82,7 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -98,6 +106,7 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -120,11 +129,15 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String CALCULATION = "calculation"; @@ -139,10 +152,12 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -150,6 +165,7 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -173,6 +189,7 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -195,11 +212,15 @@ public abstract class AnalysisCaseDefinitionImpl_ extends org.omg.sysml.lifecycl public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java index 938191f0..1ae3aa01 100644 --- a/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(AnalysisCaseUsageImpl.class) public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,93 +74,101 @@ public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute actorParameter; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile ListAttribute analysisAction; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile ListAttribute analysisAction; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -170,84 +176,98 @@ public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.lifecycle.imp public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String ACTOR_PARAMETER = "actorParameter"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String ANALYSIS_ACTION = "analysisAction"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String ANALYSIS_ACTION = "analysisAction"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AnnotatingElementImpl_.java b/generated/org/omg/sysml/metamodel/impl/AnnotatingElementImpl_.java index 7dfcc4c6..fcccbdae 100644 --- a/generated/org/omg/sysml/metamodel/impl/AnnotatingElementImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AnnotatingElementImpl_.java @@ -25,6 +25,7 @@ public abstract class AnnotatingElementImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute annotatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile SingularAttribute effectiveName; @@ -39,6 +40,7 @@ public abstract class AnnotatingElementImpl_ extends org.omg.sysml.lifecycle.imp public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String ANNOTATED_ELEMENT = "annotatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String EFFECTIVE_NAME = "effectiveName"; diff --git a/generated/org/omg/sysml/metamodel/impl/AnnotationImpl_.java b/generated/org/omg/sysml/metamodel/impl/AnnotationImpl_.java index 9dfd55c7..f2b6c0a3 100644 --- a/generated/org/omg/sysml/metamodel/impl/AnnotationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AnnotationImpl_.java @@ -17,6 +17,7 @@ public abstract class AnnotationImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class AnnotationImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class AnnotationImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class AnnotationImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java index b6950d33..36c4a5dd 100644 --- a/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,189 +65,205 @@ @StaticMetamodel(AssertConstraintUsageImpl.class) public abstract class AssertConstraintUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; - public static volatile SingularAttribute isNegated; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile SingularAttribute isNegated; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; - public static final String IS_NEGATED = "isNegated"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String IS_NEGATED = "isNegated"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl_.java index 24fe3ba5..20ce1e08 100644 --- a/generated/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AssignmentActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(AssignmentActionUsageImpl.class) public abstract class AssignmentActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class AssignmentActionUsageImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class AssignmentActionUsageImpl_ extends org.omg.sysml.lifecycle public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AssociationImpl_.java b/generated/org/omg/sysml/metamodel/impl/AssociationImpl_.java index e8edd075..d60d0bf6 100644 --- a/generated/org/omg/sysml/metamodel/impl/AssociationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AssociationImpl_.java @@ -7,29 +7,51 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(AssociationImpl.class) public abstract class AssociationImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile SingularAttribute isConjugated; + public static volatile ListAttribute source; + public static volatile ListAttribute output; + public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedFeature; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute endFeature; + public static volatile ListAttribute directedFeature; + public static volatile ListAttribute input; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedMember; + public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile ListAttribute output; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute relatedType; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -38,40 +60,48 @@ public abstract class AssociationImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute ownedFeatureMembership; public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; - public static volatile SingularAttribute isSufficient; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute elementId; - public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute importedMembership; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute ownedFeature; public static volatile ListAttribute ownedRelationship; - public static volatile SingularAttribute qualifiedName; - public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; - public static volatile ListAttribute endFeature; public static volatile CollectionAttribute targetType; - public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile CollectionAttribute associationEnd; public static volatile ListAttribute target; - public static volatile ListAttribute input; - public static volatile ListAttribute relatedElement; - public static volatile SingularAttribute name; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; - public static volatile SingularAttribute shortName; - public static volatile ListAttribute ownedMember; - public static volatile ListAttribute ownedMembership; + public static volatile ListAttribute ownedIntersecting; public static final String IS_CONJUGATED = "isConjugated"; + public static final String SOURCE = "source"; + public static final String OUTPUT = "output"; + public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_FEATURE = "ownedFeature"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String END_FEATURE = "endFeature"; + public static final String DIRECTED_FEATURE = "directedFeature"; + public static final String INPUT = "input"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String OWNED_MEMBER = "ownedMember"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String OUTPUT = "output"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String RELATED_TYPE = "relatedType"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -80,33 +110,22 @@ public abstract class AssociationImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; - public static final String IS_SUFFICIENT = "isSufficient"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String ELEMENT_ID = "elementId"; - public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String OWNED_FEATURE = "ownedFeature"; public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String QUALIFIED_NAME = "qualifiedName"; - public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; - public static final String END_FEATURE = "endFeature"; public static final String TARGET_TYPE = "targetType"; - public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String ASSOCIATION_END = "associationEnd"; public static final String TARGET = "target"; - public static final String INPUT = "input"; - public static final String RELATED_ELEMENT = "relatedElement"; - public static final String NAME = "name"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; - public static final String SHORT_NAME = "shortName"; - public static final String OWNED_MEMBER = "ownedMember"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AssociationStructureImpl_.java b/generated/org/omg/sysml/metamodel/impl/AssociationStructureImpl_.java index 1a1a8f6b..cdbdd3aa 100644 --- a/generated/org/omg/sysml/metamodel/impl/AssociationStructureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AssociationStructureImpl_.java @@ -7,29 +7,51 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(AssociationStructureImpl.class) public abstract class AssociationStructureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile SingularAttribute isConjugated; + public static volatile ListAttribute source; + public static volatile ListAttribute output; + public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedFeature; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute endFeature; + public static volatile ListAttribute directedFeature; + public static volatile ListAttribute input; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedMember; + public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile ListAttribute output; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute relatedType; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -38,40 +60,48 @@ public abstract class AssociationStructureImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedFeatureMembership; public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; - public static volatile SingularAttribute isSufficient; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute elementId; - public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute importedMembership; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute ownedFeature; public static volatile ListAttribute ownedRelationship; - public static volatile SingularAttribute qualifiedName; - public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; - public static volatile ListAttribute endFeature; public static volatile CollectionAttribute targetType; - public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile CollectionAttribute associationEnd; public static volatile ListAttribute target; - public static volatile ListAttribute input; - public static volatile ListAttribute relatedElement; - public static volatile SingularAttribute name; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; - public static volatile SingularAttribute shortName; - public static volatile ListAttribute ownedMember; - public static volatile ListAttribute ownedMembership; + public static volatile ListAttribute ownedIntersecting; public static final String IS_CONJUGATED = "isConjugated"; + public static final String SOURCE = "source"; + public static final String OUTPUT = "output"; + public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_FEATURE = "ownedFeature"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String END_FEATURE = "endFeature"; + public static final String DIRECTED_FEATURE = "directedFeature"; + public static final String INPUT = "input"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String OWNED_MEMBER = "ownedMember"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String OUTPUT = "output"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String RELATED_TYPE = "relatedType"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -80,33 +110,22 @@ public abstract class AssociationStructureImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; - public static final String IS_SUFFICIENT = "isSufficient"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String ELEMENT_ID = "elementId"; - public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String OWNED_FEATURE = "ownedFeature"; public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String QUALIFIED_NAME = "qualifiedName"; - public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; - public static final String END_FEATURE = "endFeature"; public static final String TARGET_TYPE = "targetType"; - public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String ASSOCIATION_END = "associationEnd"; public static final String TARGET = "target"; - public static final String INPUT = "input"; - public static final String RELATED_ELEMENT = "relatedElement"; - public static final String NAME = "name"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; - public static final String SHORT_NAME = "shortName"; - public static final String OWNED_MEMBER = "ownedMember"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl_.java index 3232eab2..87ea5f39 100644 --- a/generated/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AttributeDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -91,6 +99,7 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute ownedState; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -110,10 +119,14 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -127,9 +140,11 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -137,6 +152,7 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -157,6 +173,7 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String OWNED_STATE = "ownedState"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -176,10 +193,14 @@ public abstract class AttributeDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java index fd8dac4a..303aad67 100644 --- a/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; import org.omg.sysml.metamodel.DataType; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -48,6 +51,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -77,6 +81,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -89,6 +94,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -110,6 +116,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute nestedAllocation; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -136,12 +143,17 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute attributeDefinition; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -163,6 +175,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -175,6 +188,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -196,6 +210,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_ALLOCATION = "nestedAllocation"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -222,12 +237,17 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String ATTRIBUTE_DEFINITION = "attributeDefinition"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/BehaviorImpl_.java b/generated/org/omg/sysml/metamodel/impl/BehaviorImpl_.java index 27b652d9..cf187194 100644 --- a/generated/org/omg/sysml/metamodel/impl/BehaviorImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BehaviorImpl_.java @@ -7,18 +7,22 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Step; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(BehaviorImpl.class) @@ -27,6 +31,7 @@ public abstract class BehaviorImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -37,6 +42,7 @@ public abstract class BehaviorImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -49,21 +55,27 @@ public abstract class BehaviorImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute step; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -74,6 +86,7 @@ public abstract class BehaviorImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -86,15 +99,20 @@ public abstract class BehaviorImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String STEP = "step"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl_.java index 8b33b245..c05bc5c9 100644 --- a/generated/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BindingConnectorAsUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -48,6 +51,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -59,193 +63,211 @@ @StaticMetamodel(BindingConnectorAsUsageImpl.class) public abstract class BindingConnectorAsUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; - public static volatile ListAttribute source; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; - public static volatile ListAttribute membership; - public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile CollectionAttribute targetFeature; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; public static volatile ListAttribute member; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; - public static volatile ListAttribute target; - public static volatile CollectionAttribute variantMembership; - public static volatile SingularAttribute isDirected; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile ListAttribute source; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute connectorEnd; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile ListAttribute membership; + public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute targetFeature; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; - public static final String SOURCE = "source"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; - public static final String CONNECTOR_END = "connectorEnd"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; public static final String ASSOCIATION = "association"; - public static final String MEMBERSHIP = "membership"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String TARGET_FEATURE = "targetFeature"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; public static final String MEMBER = "member"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; - public static final String TARGET = "target"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; - public static final String IS_DIRECTED = "isDirected"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String SOURCE = "source"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String CONNECTOR_END = "connectorEnd"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String MEMBERSHIP = "membership"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String TARGET_FEATURE = "targetFeature"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java b/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java index 82b262a7..e5e7b8a1 100644 --- a/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Association; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(BindingConnectorImpl.class) @@ -40,15 +43,18 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -57,17 +63,18 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedDisjoining; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile ListAttribute ownedTyping; @@ -88,8 +95,12 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -101,15 +112,18 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.lifecycle.impl public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -127,6 +141,7 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.lifecycle.impl public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -149,8 +164,12 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.lifecycle.impl public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java index 6a826c3d..035fe4c1 100644 --- a/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(BooleanExpressionImpl.class) @@ -39,6 +42,7 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -83,7 +89,11 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -94,6 +104,7 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -103,6 +114,7 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -116,6 +128,7 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -138,7 +151,11 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl_.java index 57ac0e68..259f6757 100644 --- a/generated/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CalculationDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,10 +69,12 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -75,6 +82,7 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -96,6 +104,7 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -118,11 +127,15 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String CALCULATION = "calculation"; @@ -137,10 +150,12 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -148,6 +163,7 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -169,6 +185,7 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -191,11 +208,15 @@ public abstract class CalculationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java index 2aa4bc5d..451f8ceb 100644 --- a/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(CalculationUsageImpl.class) public abstract class CalculationUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,91 +74,99 @@ public abstract class CalculationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -168,82 +174,96 @@ public abstract class CalculationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/CaseDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/CaseDefinitionImpl_.java index e2bdbfbe..f975f23e 100644 --- a/generated/org/omg/sysml/metamodel/impl/CaseDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CaseDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,10 +69,12 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -75,6 +82,7 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -97,6 +105,7 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -119,11 +128,15 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String CALCULATION = "calculation"; @@ -138,10 +151,12 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -149,6 +164,7 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -171,6 +187,7 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -193,11 +210,15 @@ public abstract class CaseDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java index 812d627a..9bd20232 100644 --- a/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(CaseUsageImpl.class) public abstract class CaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,92 +74,100 @@ public abstract class CaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute actorParameter; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -169,83 +175,97 @@ public abstract class CaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String ACTOR_PARAMETER = "actorParameter"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ClassImpl_.java b/generated/org/omg/sysml/metamodel/impl/ClassImpl_.java index b2ac9455..1ac845ec 100644 --- a/generated/org/omg/sysml/metamodel/impl/ClassImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ClassImpl_.java @@ -7,17 +7,21 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ClassImpl.class) @@ -26,6 +30,7 @@ public abstract class ClassImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -35,6 +40,7 @@ public abstract class ClassImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -47,20 +53,26 @@ public abstract class ClassImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -70,6 +82,7 @@ public abstract class ClassImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -82,14 +95,19 @@ public abstract class ClassImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ClassifierImpl_.java b/generated/org/omg/sysml/metamodel/impl/ClassifierImpl_.java index 530ec969..8d06ef23 100644 --- a/generated/org/omg/sysml/metamodel/impl/ClassifierImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ClassifierImpl_.java @@ -7,17 +7,21 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ClassifierImpl.class) @@ -26,6 +30,7 @@ public abstract class ClassifierImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -35,6 +40,7 @@ public abstract class ClassifierImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -47,20 +53,26 @@ public abstract class ClassifierImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -70,6 +82,7 @@ public abstract class ClassifierImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -82,14 +95,19 @@ public abstract class ClassifierImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/CollectExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/CollectExpressionImpl_.java index ef5687b2..fa59712e 100644 --- a/generated/org/omg/sysml/metamodel/impl/CollectExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CollectExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -27,6 +29,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(CollectExpressionImpl.class) @@ -42,6 +45,7 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute operator; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -51,6 +55,7 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -64,6 +69,7 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -86,7 +92,11 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute operand; public static volatile CollectionAttribute ownedFeatureInverting; @@ -100,6 +110,7 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OPERATOR = "operator"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -109,6 +120,7 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -122,6 +134,7 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -144,7 +157,11 @@ public abstract class CollectExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OPERAND = "operand"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/CommentImpl_.java b/generated/org/omg/sysml/metamodel/impl/CommentImpl_.java index 1fc45d70..5da6e274 100644 --- a/generated/org/omg/sysml/metamodel/impl/CommentImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CommentImpl_.java @@ -27,6 +27,7 @@ public abstract class CommentImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile ListAttribute annotatedElement; public static volatile SingularAttribute body; public static volatile SingularAttribute locale; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile SingularAttribute effectiveName; @@ -43,6 +44,7 @@ public abstract class CommentImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String ANNOTATED_ELEMENT = "annotatedElement"; public static final String BODY = "body"; public static final String LOCALE = "locale"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String EFFECTIVE_NAME = "effectiveName"; diff --git a/generated/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl_.java index 0c97649a..72ca90c8 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConcernDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,11 +69,13 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile ListAttribute framedConcern; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -76,6 +83,7 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -101,6 +109,7 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -123,11 +132,15 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -142,11 +155,13 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String FRAMED_CONCERN = "framedConcern"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -154,6 +169,7 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -179,6 +195,7 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -201,11 +218,15 @@ public abstract class ConcernDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConcernUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConcernUsageImpl_.java index 47885b8c..dd70fab5 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConcernUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConcernUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -74,6 +78,7 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute nestedConstraint; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute nestedAttribute; @@ -109,8 +114,10 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -128,6 +135,7 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -142,6 +150,7 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile CollectionAttribute ownedDisjoining; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; @@ -157,7 +166,10 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute ownedRelationship; public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; @@ -172,6 +184,7 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; @@ -207,8 +220,10 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -226,6 +241,7 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -240,6 +256,7 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String OWNED_TYPING = "ownedTyping"; @@ -255,7 +272,10 @@ public abstract class ConcernUsageImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl_.java index 7f00d41a..0ec933ce 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConjugatedPortDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -92,6 +100,7 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -111,10 +120,14 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -159,6 +175,7 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -178,10 +195,14 @@ public abstract class ConjugatedPortDefinitionImpl_ extends org.omg.sysml.lifecy public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl_.java index f41b4aa6..3d387ff5 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConjugatedPortTypingImpl_.java @@ -17,6 +17,7 @@ public abstract class ConjugatedPortTypingImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class ConjugatedPortTypingImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class ConjugatedPortTypingImpl_ extends org.omg.sysml.lifecycle. public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class ConjugatedPortTypingImpl_ extends org.omg.sysml.lifecycle. public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ConjugationImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConjugationImpl_.java index 8477a782..2e0b2caf 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConjugationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConjugationImpl_.java @@ -17,6 +17,7 @@ public abstract class ConjugationImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class ConjugationImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class ConjugationImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class ConjugationImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl_.java index 41535e0d..2bb17650 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -40,6 +43,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -63,16 +67,20 @@ public abstract class ConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedView; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -96,6 +104,7 @@ public abstract class ConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute relatedType; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; @@ -119,11 +128,15 @@ public abstract class ConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute isAbstract; public static volatile CollectionAttribute associationEnd; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute connectionEnd; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -138,16 +151,20 @@ public abstract class ConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_VIEW = "ownedView"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -171,6 +188,7 @@ public abstract class ConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String RELATED_TYPE = "relatedType"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; @@ -194,11 +212,15 @@ public abstract class ConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String IS_ABSTRACT = "isAbstract"; public static final String ASSOCIATION_END = "associationEnd"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String CONNECTION_END = "connectionEnd"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java index 23d3dbf2..a27d3bf1 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java @@ -20,6 +20,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -33,8 +34,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -53,6 +56,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -74,8 +78,10 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; @@ -90,7 +96,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; public static volatile ListAttribute nestedReference; public static volatile SingularAttribute isReadOnly; @@ -108,8 +114,10 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -128,6 +136,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -135,7 +144,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute featuringType; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile ListAttribute connectionDefinition; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute nestedFlow; @@ -144,8 +153,9 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; public static volatile ListAttribute inheritedMembership; @@ -161,8 +171,11 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedImport; public static volatile ListAttribute itemDefinition; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String USAGE = "usage"; @@ -174,8 +187,10 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; @@ -208,8 +223,10 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -228,6 +245,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -244,6 +262,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -261,8 +280,11 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_IMPORT = "ownedImport"; public static final String ITEM_DEFINITION = "itemDefinition"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl_.java index 4b5d2634..c4861a6a 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConnectorAsUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -48,6 +51,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -59,193 +63,211 @@ @StaticMetamodel(ConnectorAsUsageImpl.class) public abstract class ConnectorAsUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; - public static volatile ListAttribute source; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; - public static volatile ListAttribute membership; - public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile CollectionAttribute targetFeature; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; public static volatile ListAttribute member; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; - public static volatile ListAttribute target; - public static volatile CollectionAttribute variantMembership; - public static volatile SingularAttribute isDirected; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile ListAttribute source; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute connectorEnd; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile ListAttribute membership; + public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute targetFeature; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; - public static final String SOURCE = "source"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; - public static final String CONNECTOR_END = "connectorEnd"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; public static final String ASSOCIATION = "association"; - public static final String MEMBERSHIP = "membership"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String TARGET_FEATURE = "targetFeature"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; public static final String MEMBER = "member"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; - public static final String TARGET = "target"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; - public static final String IS_DIRECTED = "isDirected"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String SOURCE = "source"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String CONNECTOR_END = "connectorEnd"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String MEMBERSHIP = "membership"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String TARGET_FEATURE = "targetFeature"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java index 75bf9c97..1ed28be1 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Association; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ConnectorImpl.class) @@ -40,15 +43,18 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -57,17 +63,18 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedDisjoining; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile ListAttribute ownedTyping; @@ -88,8 +95,12 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -101,15 +112,18 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -127,6 +141,7 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -149,8 +164,12 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl_.java index 7248b1af..ff022be3 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConstraintDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -63,9 +68,11 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -73,6 +80,7 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -94,6 +102,7 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -116,11 +125,15 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -134,9 +147,11 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -144,6 +159,7 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -165,6 +181,7 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -187,11 +204,15 @@ public abstract class ConstraintDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java index 486b2f35..71d1dab1 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(ConstraintUsageImpl.class) public abstract class ConstraintUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class ConstraintUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class ConstraintUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java index bc6fa310..4bfb875e 100644 --- a/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(ControlNodeImpl.class) public abstract class ControlNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class ControlNodeImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class ControlNodeImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/DataTypeImpl_.java b/generated/org/omg/sysml/metamodel/impl/DataTypeImpl_.java index c9a961e6..80aeb845 100644 --- a/generated/org/omg/sysml/metamodel/impl/DataTypeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DataTypeImpl_.java @@ -7,17 +7,21 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(DataTypeImpl.class) @@ -26,6 +30,7 @@ public abstract class DataTypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -35,6 +40,7 @@ public abstract class DataTypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -47,20 +53,26 @@ public abstract class DataTypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -70,6 +82,7 @@ public abstract class DataTypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -82,14 +95,19 @@ public abstract class DataTypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/DecisionNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/DecisionNodeImpl_.java index e47df2c2..63b152d2 100644 --- a/generated/org/omg/sysml/metamodel/impl/DecisionNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DecisionNodeImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(DecisionNodeImpl.class) public abstract class DecisionNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class DecisionNodeImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class DecisionNodeImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/DefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/DefinitionImpl_.java index 12d60b90..ecfc52c9 100644 --- a/generated/org/omg/sysml/metamodel/impl/DefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -91,6 +99,7 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute ownedState; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -110,10 +119,14 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -127,9 +140,11 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -137,6 +152,7 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -157,6 +173,7 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String OWNED_STATE = "ownedState"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -176,10 +193,14 @@ public abstract class DefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/DependencyImpl_.java b/generated/org/omg/sysml/metamodel/impl/DependencyImpl_.java index e74b5bd8..3e708325 100644 --- a/generated/org/omg/sysml/metamodel/impl/DependencyImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DependencyImpl_.java @@ -17,6 +17,7 @@ public abstract class DependencyImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class DependencyImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile ListAttribute supplier; @@ -35,6 +37,7 @@ public abstract class DependencyImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -43,6 +46,7 @@ public abstract class DependencyImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String SUPPLIER = "supplier"; diff --git a/generated/org/omg/sysml/metamodel/impl/DifferencingImpl_.java b/generated/org/omg/sysml/metamodel/impl/DifferencingImpl_.java new file mode 100644 index 00000000..267bc11c --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/DifferencingImpl_.java @@ -0,0 +1,55 @@ +package org.omg.sysml.metamodel.impl; + +import java.util.UUID; +import javax.annotation.processing.Generated; +import javax.persistence.metamodel.ListAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; +import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.TextualRepresentation; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(DifferencingImpl.class) +public abstract class DifferencingImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute ownedRelationship; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile ListAttribute target; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile SingularAttribute effectiveName; + + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String TARGET = "target"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/DisjoiningImpl_.java b/generated/org/omg/sysml/metamodel/impl/DisjoiningImpl_.java index 59587b19..04b84c5b 100644 --- a/generated/org/omg/sysml/metamodel/impl/DisjoiningImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DisjoiningImpl_.java @@ -17,6 +17,7 @@ public abstract class DisjoiningImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class DisjoiningImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class DisjoiningImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class DisjoiningImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/DocumentationImpl_.java b/generated/org/omg/sysml/metamodel/impl/DocumentationImpl_.java index 8e8d6f5f..150d133f 100644 --- a/generated/org/omg/sysml/metamodel/impl/DocumentationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DocumentationImpl_.java @@ -27,6 +27,7 @@ public abstract class DocumentationImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute annotatedElement; public static volatile SingularAttribute body; public static volatile SingularAttribute locale; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile SingularAttribute effectiveName; @@ -43,6 +44,7 @@ public abstract class DocumentationImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String ANNOTATED_ELEMENT = "annotatedElement"; public static final String BODY = "body"; public static final String LOCALE = "locale"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String EFFECTIVE_NAME = "effectiveName"; diff --git a/generated/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl_.java index 5bdc1849..39952aaa 100644 --- a/generated/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ElementFilterMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ElementFilterMembershipImpl_ extends org.omg.sysml.lifecyc public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ElementFilterMembershipImpl_ extends org.omg.sysml.lifecyc public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ElementFilterMembershipImpl_ extends org.omg.sysml.lifecyc public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ElementFilterMembershipImpl_ extends org.omg.sysml.lifecyc public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ElementImpl_.java b/generated/org/omg/sysml/metamodel/impl/ElementImpl_.java index a5afd6bd..96c36274 100644 --- a/generated/org/omg/sysml/metamodel/impl/ElementImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ElementImpl_.java @@ -26,6 +26,7 @@ public abstract class ElementImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute isImpliedIncluded; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -38,6 +39,7 @@ public abstract class ElementImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; } diff --git a/generated/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl_.java index c7513e27..e2a19f83 100644 --- a/generated/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class EndFeatureMembershipImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class EndFeatureMembershipImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class EndFeatureMembershipImpl_ extends org.omg.sysml.lifecycle. public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class EndFeatureMembershipImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl_.java index 63a65e6f..0286ba29 100644 --- a/generated/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/EnumerationDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -91,6 +99,7 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute ownedState; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -110,11 +119,15 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute enumeratedValue; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -158,6 +174,7 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String OWNED_STATE = "ownedState"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -177,11 +194,15 @@ public abstract class EnumerationDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String ENUMERATED_VALUE = "enumeratedValue"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/EnumerationUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/EnumerationUsageImpl_.java index c44769bd..0ba08d94 100644 --- a/generated/org/omg/sysml/metamodel/impl/EnumerationUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/EnumerationUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; import org.omg.sysml.metamodel.DataType; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -48,6 +51,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -77,6 +81,7 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -89,6 +94,7 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -110,6 +116,7 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute nestedAllocation; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -136,12 +143,17 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute attributeDefinition; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -163,6 +175,7 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -175,6 +188,7 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -196,6 +210,7 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String NESTED_ALLOCATION = "nestedAllocation"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -222,12 +237,17 @@ public abstract class EnumerationUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String ATTRIBUTE_DEFINITION = "attributeDefinition"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl_.java index ed80922b..fe953111 100644 --- a/generated/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/EventOccurrenceUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -49,6 +52,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -78,6 +82,7 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -90,6 +95,7 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -112,6 +118,7 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -140,11 +147,16 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -166,6 +178,7 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -178,6 +191,7 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -200,6 +214,7 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -228,11 +243,16 @@ public abstract class EventOccurrenceUsageImpl_ extends org.omg.sysml.lifecycle. public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java index 60c39b08..dcae0225 100644 --- a/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(ExhibitStateUsageImpl.class) public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -77,91 +75,99 @@ public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; - public static volatile SingularAttribute isParallel; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile SingularAttribute isParallel; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -170,82 +176,96 @@ public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.lifecycle.imp public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; - public static final String IS_PARALLEL = "isParallel"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String IS_PARALLEL = "isParallel"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ExposeImpl_.java b/generated/org/omg/sysml/metamodel/impl/ExposeImpl_.java index 3f5f4913..640a9d85 100644 --- a/generated/org/omg/sysml/metamodel/impl/ExposeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ExposeImpl_.java @@ -18,6 +18,7 @@ public abstract class ExposeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute importedMemberName; @@ -28,6 +29,7 @@ public abstract class ExposeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile SingularAttribute isRecursive; public static volatile ListAttribute relatedElement; @@ -38,6 +40,7 @@ public abstract class ExposeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IMPORTED_MEMBER_NAME = "importedMemberName"; @@ -48,6 +51,7 @@ public abstract class ExposeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String IS_RECURSIVE = "isRecursive"; public static final String RELATED_ELEMENT = "relatedElement"; diff --git a/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java index 1cf6db11..295e7444 100644 --- a/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ExpressionImpl.class) @@ -39,6 +42,7 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -83,7 +89,11 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -94,6 +104,7 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -103,6 +114,7 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -116,6 +128,7 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -138,7 +151,11 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl_.java index 403e0f52..2616a606 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureChainExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -27,6 +29,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(FeatureChainExpressionImpl.class) @@ -42,6 +45,7 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static volatile SingularAttribute operator; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -51,6 +55,7 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -64,6 +69,7 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -86,7 +92,11 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute operand; public static volatile CollectionAttribute ownedFeatureInverting; @@ -100,6 +110,7 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static final String OPERATOR = "operator"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -109,6 +120,7 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -122,6 +134,7 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -144,7 +157,11 @@ public abstract class FeatureChainExpressionImpl_ extends org.omg.sysml.lifecycl public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OPERAND = "operand"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureChainingImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureChainingImpl_.java index d9882922..3e091e53 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureChainingImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureChainingImpl_.java @@ -17,6 +17,7 @@ public abstract class FeatureChainingImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class FeatureChainingImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class FeatureChainingImpl_ extends org.omg.sysml.lifecycle.impl. public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class FeatureChainingImpl_ extends org.omg.sysml.lifecycle.impl. public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java index 99e29ad2..20876bac 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(FeatureImpl.class) @@ -38,6 +41,7 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class FeatureImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureInvertingImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureInvertingImpl_.java index f4fb8d1f..c72c3873 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureInvertingImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureInvertingImpl_.java @@ -17,6 +17,7 @@ public abstract class FeatureInvertingImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class FeatureInvertingImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class FeatureInvertingImpl_ extends org.omg.sysml.lifecycle.impl public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class FeatureInvertingImpl_ extends org.omg.sysml.lifecycle.impl public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureMembershipImpl_.java index 25955d46..98357dba 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class FeatureMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class FeatureMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class FeatureMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class FeatureMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java index 19b9a2bd..9ebb9d9b 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(FeatureReferenceExpressionImpl.class) @@ -39,6 +42,7 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -83,7 +89,11 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -94,6 +104,7 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -103,6 +114,7 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -116,6 +128,7 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -138,7 +151,11 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.life public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureTypingImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureTypingImpl_.java index a43bfdd6..84f3c7ec 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureTypingImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureTypingImpl_.java @@ -17,6 +17,7 @@ public abstract class FeatureTypingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class FeatureTypingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class FeatureTypingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class FeatureTypingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java index 3f0f642f..43b1fe5c 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java @@ -16,8 +16,19 @@ @StaticMetamodel(FeatureValueImpl.class) public abstract class FeatureValueImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + public static volatile SingularAttribute ownedMemberElementId; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute memberShortName; + public static volatile SingularAttribute ownedMemberName; + public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute ownedMemberShortName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -26,23 +37,25 @@ public abstract class FeatureValueImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile SingularAttribute isInitial; - public static volatile SingularAttribute ownedMemberElementId; - public static volatile SingularAttribute memberName; - public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile SingularAttribute memberElementId; public static volatile ListAttribute target; public static volatile SingularAttribute isDefault; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile SingularAttribute memberShortName; - public static volatile SingularAttribute ownedMemberName; public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute ownedMemberShortName; + public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; + public static final String MEMBER_NAME = "memberName"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String MEMBER_SHORT_NAME = "memberShortName"; + public static final String OWNED_MEMBER_NAME = "ownedMemberName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -51,20 +64,11 @@ public abstract class FeatureValueImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String IS_INITIAL = "isInitial"; - public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; - public static final String MEMBER_NAME = "memberName"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String MEMBER_ELEMENT_ID = "memberElementId"; public static final String TARGET = "target"; public static final String IS_DEFAULT = "isDefault"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; - public static final String MEMBER_SHORT_NAME = "memberShortName"; - public static final String OWNED_MEMBER_NAME = "ownedMemberName"; public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; } diff --git a/generated/org/omg/sysml/metamodel/impl/FeaturingImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeaturingImpl_.java new file mode 100644 index 00000000..9ccd1699 --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/FeaturingImpl_.java @@ -0,0 +1,55 @@ +package org.omg.sysml.metamodel.impl; + +import java.util.UUID; +import javax.annotation.processing.Generated; +import javax.persistence.metamodel.ListAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; +import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.TextualRepresentation; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(FeaturingImpl.class) +public abstract class FeaturingImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute ownedRelationship; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile ListAttribute target; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile SingularAttribute effectiveName; + + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String TARGET = "target"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl_.java new file mode 100644 index 00000000..d074ee97 --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/FlowConnectionDefinitionImpl_.java @@ -0,0 +1,234 @@ +package org.omg.sysml.metamodel.impl; + +import java.util.UUID; +import javax.annotation.processing.Generated; +import javax.persistence.metamodel.CollectionAttribute; +import javax.persistence.metamodel.ListAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; +import org.omg.sysml.metamodel.ActionUsage; +import org.omg.sysml.metamodel.AllocationUsage; +import org.omg.sysml.metamodel.AnalysisCaseUsage; +import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.AttributeUsage; +import org.omg.sysml.metamodel.CalculationUsage; +import org.omg.sysml.metamodel.CaseUsage; +import org.omg.sysml.metamodel.ConcernUsage; +import org.omg.sysml.metamodel.ConnectorAsUsage; +import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; +import org.omg.sysml.metamodel.Disjoining; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.EnumerationUsage; +import org.omg.sysml.metamodel.Feature; +import org.omg.sysml.metamodel.FeatureMembership; +import org.omg.sysml.metamodel.FlowConnectionUsage; +import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; +import org.omg.sysml.metamodel.ItemUsage; +import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; +import org.omg.sysml.metamodel.OccurrenceUsage; +import org.omg.sysml.metamodel.PartUsage; +import org.omg.sysml.metamodel.PortUsage; +import org.omg.sysml.metamodel.ReferenceUsage; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.RenderingUsage; +import org.omg.sysml.metamodel.RequirementUsage; +import org.omg.sysml.metamodel.Specialization; +import org.omg.sysml.metamodel.StateUsage; +import org.omg.sysml.metamodel.Step; +import org.omg.sysml.metamodel.Subclassification; +import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; +import org.omg.sysml.metamodel.Usage; +import org.omg.sysml.metamodel.UseCaseUsage; +import org.omg.sysml.metamodel.VariantMembership; +import org.omg.sysml.metamodel.VerificationCaseUsage; +import org.omg.sysml.metamodel.ViewUsage; +import org.omg.sysml.metamodel.ViewpointUsage; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(FlowConnectionDefinitionImpl.class) +public abstract class FlowConnectionDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute ownedPort; + public static volatile SingularAttribute isConjugated; + public static volatile ListAttribute ownedEnumeration; + public static volatile ListAttribute ownedVerificationCase; + public static volatile ListAttribute usage; + public static volatile ListAttribute ownedViewpoint; + public static volatile ListAttribute ownedAnalysisCase; + public static volatile ListAttribute source; + public static volatile ListAttribute ownedRendering; + public static volatile ListAttribute ownedConstraint; + public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute action; + public static volatile ListAttribute ownedItem; + public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedView; + public static volatile ListAttribute ownedFeature; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute endFeature; + public static volatile ListAttribute directedFeature; + public static volatile ListAttribute ownedAllocation; + public static volatile ListAttribute ownedInterface; + public static volatile ListAttribute input; + public static volatile CollectionAttribute ownedFlow; + public static volatile ListAttribute ownedAction; + public static volatile ListAttribute ownedCase; + public static volatile ListAttribute relatedElement; + public static volatile ListAttribute ownedCalculation; + public static volatile ListAttribute ownedOccurrence; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedReference; + public static volatile ListAttribute ownedUsage; + public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedMember; + public static volatile ListAttribute ownedMembership; + public static volatile ListAttribute ownedUseCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile ListAttribute ownedState; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile ListAttribute relatedType; + public static volatile SingularAttribute isVariation; + public static volatile ListAttribute feature; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute member; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile CollectionAttribute ownedSubclassification; + public static volatile ListAttribute inheritedFeature; + public static volatile CollectionAttribute ownedTransition; + public static volatile SingularAttribute effectiveName; + public static volatile ListAttribute importedMembership; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute ownedRelationship; + public static volatile ListAttribute ownedConnection; + public static volatile ListAttribute featureMembership; + public static volatile CollectionAttribute targetType; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute ownedRequirement; + public static volatile SingularAttribute isAbstract; + public static volatile CollectionAttribute associationEnd; + public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; + public static volatile ListAttribute connectionEnd; + public static volatile ListAttribute ownedSpecialization; + public static volatile CollectionAttribute ownedConcern; + public static volatile CollectionAttribute step; + public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; + public static volatile ListAttribute ownedPart; + + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String OWNED_PORT = "ownedPort"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String OWNED_ENUMERATION = "ownedEnumeration"; + public static final String OWNED_VERIFICATION_CASE = "ownedVerificationCase"; + public static final String USAGE = "usage"; + public static final String OWNED_VIEWPOINT = "ownedViewpoint"; + public static final String OWNED_ANALYSIS_CASE = "ownedAnalysisCase"; + public static final String SOURCE = "source"; + public static final String OWNED_RENDERING = "ownedRendering"; + public static final String OWNED_CONSTRAINT = "ownedConstraint"; + public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; + public static final String VARIANT = "variant"; + public static final String ACTION = "action"; + public static final String OWNED_ITEM = "ownedItem"; + public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_VIEW = "ownedView"; + public static final String OWNED_FEATURE = "ownedFeature"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String END_FEATURE = "endFeature"; + public static final String DIRECTED_FEATURE = "directedFeature"; + public static final String OWNED_ALLOCATION = "ownedAllocation"; + public static final String OWNED_INTERFACE = "ownedInterface"; + public static final String INPUT = "input"; + public static final String OWNED_FLOW = "ownedFlow"; + public static final String OWNED_ACTION = "ownedAction"; + public static final String OWNED_CASE = "ownedCase"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String OWNED_CALCULATION = "ownedCalculation"; + public static final String OWNED_OCCURRENCE = "ownedOccurrence"; + public static final String NAME = "name"; + public static final String OWNED_REFERENCE = "ownedReference"; + public static final String OWNED_USAGE = "ownedUsage"; + public static final String SHORT_NAME = "shortName"; + public static final String OWNED_MEMBER = "ownedMember"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String OWNED_USE_CASE = "ownedUseCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String OWNED_STATE = "ownedState"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String RELATED_TYPE = "relatedType"; + public static final String IS_VARIATION = "isVariation"; + public static final String FEATURE = "feature"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String MEMBER = "member"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; + public static final String INHERITED_FEATURE = "inheritedFeature"; + public static final String OWNED_TRANSITION = "ownedTransition"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String IMPORTED_MEMBERSHIP = "importedMembership"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String OWNED_CONNECTION = "ownedConnection"; + public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String TARGET_TYPE = "targetType"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String OWNED_REQUIREMENT = "ownedRequirement"; + public static final String IS_ABSTRACT = "isAbstract"; + public static final String ASSOCIATION_END = "associationEnd"; + public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; + public static final String CONNECTION_END = "connectionEnd"; + public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_CONCERN = "ownedConcern"; + public static final String STEP = "step"; + public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; + public static final String OWNED_PART = "ownedPart"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl_.java index 84ffeec0..be01d769 100644 --- a/generated/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FlowConnectionUsageImpl_.java @@ -21,6 +21,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -33,12 +34,14 @@ import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Interaction; import org.omg.sysml.metamodel.InterfaceUsage; -import org.omg.sysml.metamodel.ItemFeature; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemFlowEnd; import org.omg.sysml.metamodel.ItemFlowFeature; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -57,6 +60,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -75,28 +79,29 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; - public static volatile ListAttribute sourceOutputFeature; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile ListAttribute targetInputFeature; public static volatile ListAttribute relatedElement; public static volatile ListAttribute nestedView; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; public static volatile ListAttribute nestedReference; public static volatile SingularAttribute isReadOnly; @@ -116,8 +121,10 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -136,15 +143,15 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; - public static volatile CollectionAttribute itemFeature; public static volatile SingularAttribute isEnd; public static volatile ListAttribute nestedItem; public static volatile ListAttribute featuringType; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile ListAttribute connectionDefinition; public static volatile CollectionAttribute itemFlowEnd; public static volatile ListAttribute ownedMembership; @@ -155,8 +162,10 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute flowConnectionDefinition; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; public static volatile ListAttribute inheritedMembership; @@ -173,8 +182,12 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedImport; public static volatile ListAttribute itemDefinition; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute interaction; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String USAGE = "usage"; @@ -183,21 +196,22 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; - public static final String SOURCE_OUTPUT_FEATURE = "sourceOutputFeature"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String TARGET_INPUT_FEATURE = "targetInputFeature"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NESTED_VIEW = "nestedView"; public static final String SHORT_NAME = "shortName"; @@ -224,8 +238,10 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -244,9 +260,9 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; - public static final String ITEM_FEATURE = "itemFeature"; public static final String IS_END = "isEnd"; public static final String NESTED_ITEM = "nestedItem"; public static final String FEATURING_TYPE = "featuringType"; @@ -263,6 +279,8 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String FLOW_CONNECTION_DEFINITION = "flowConnectionDefinition"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -281,8 +299,12 @@ public abstract class FlowConnectionUsageImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_IMPORT = "ownedImport"; public static final String ITEM_DEFINITION = "itemDefinition"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String INTERACTION = "interaction"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl_.java index 5764b989..5cf285f0 100644 --- a/generated/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ForLoopActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(ForLoopActionUsageImpl.class) public abstract class ForLoopActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class ForLoopActionUsageImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class ForLoopActionUsageImpl_ extends org.omg.sysml.lifecycle.im public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java index f3c75c04..3b2fe393 100644 --- a/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(ForkNodeImpl.class) public abstract class ForkNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class ForkNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class ForkNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl_.java index 9b580b59..9d0387d8 100644 --- a/generated/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FramedConcernMembershipImpl_.java @@ -17,8 +17,19 @@ @StaticMetamodel(FramedConcernMembershipImpl.class) public abstract class FramedConcernMembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + public static volatile SingularAttribute ownedMemberElementId; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute memberShortName; + public static volatile SingularAttribute ownedMemberName; + public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute ownedMemberShortName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -27,22 +38,24 @@ public abstract class FramedConcernMembershipImpl_ extends org.omg.sysml.lifecyc public static volatile ListAttribute ownedRelationship; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; - public static volatile SingularAttribute ownedMemberElementId; - public static volatile SingularAttribute memberName; - public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile SingularAttribute memberElementId; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile SingularAttribute memberShortName; - public static volatile SingularAttribute ownedMemberName; public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute ownedMemberShortName; + public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; + public static final String MEMBER_NAME = "memberName"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String MEMBER_SHORT_NAME = "memberShortName"; + public static final String OWNED_MEMBER_NAME = "ownedMemberName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -51,19 +64,10 @@ public abstract class FramedConcernMembershipImpl_ extends org.omg.sysml.lifecyc public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; - public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; - public static final String MEMBER_NAME = "memberName"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String MEMBER_ELEMENT_ID = "memberElementId"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; - public static final String MEMBER_SHORT_NAME = "memberShortName"; - public static final String OWNED_MEMBER_NAME = "ownedMemberName"; public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; } diff --git a/generated/org/omg/sysml/metamodel/impl/FunctionImpl_.java b/generated/org/omg/sysml/metamodel/impl/FunctionImpl_.java index 0fb733f2..74a79f4b 100644 --- a/generated/org/omg/sysml/metamodel/impl/FunctionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FunctionImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -14,12 +15,15 @@ import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Step; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(FunctionImpl.class) @@ -28,6 +32,7 @@ public abstract class FunctionImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -38,6 +43,7 @@ public abstract class FunctionImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -52,21 +58,27 @@ public abstract class FunctionImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute step; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -77,6 +89,7 @@ public abstract class FunctionImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -91,15 +104,20 @@ public abstract class FunctionImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String STEP = "step"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/IfActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/IfActionUsageImpl_.java index d1daed0a..592a987b 100644 --- a/generated/org/omg/sysml/metamodel/impl/IfActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/IfActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(IfActionUsageImpl.class) public abstract class IfActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class IfActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class IfActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ImportImpl_.java b/generated/org/omg/sysml/metamodel/impl/ImportImpl_.java index 9dd6190a..79e22cfa 100644 --- a/generated/org/omg/sysml/metamodel/impl/ImportImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ImportImpl_.java @@ -18,6 +18,7 @@ public abstract class ImportImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute importedMemberName; @@ -28,6 +29,7 @@ public abstract class ImportImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile SingularAttribute isRecursive; public static volatile ListAttribute relatedElement; @@ -38,6 +40,7 @@ public abstract class ImportImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IMPORTED_MEMBER_NAME = "importedMemberName"; @@ -48,6 +51,7 @@ public abstract class ImportImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String IS_RECURSIVE = "isRecursive"; public static final String RELATED_ELEMENT = "relatedElement"; diff --git a/generated/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl_.java index 480a34ee..58290fff 100644 --- a/generated/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/IncludeUseCaseUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,193 +65,209 @@ @StaticMetamodel(IncludeUseCaseUsageImpl.class) public abstract class IncludeUseCaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; - public static volatile ListAttribute includedUseCase; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute actorParameter; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile ListAttribute includedUseCase; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; - public static final String INCLUDED_USE_CASE = "includedUseCase"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String ACTOR_PARAMETER = "actorParameter"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String INCLUDED_USE_CASE = "includedUseCase"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/InteractionImpl_.java b/generated/org/omg/sysml/metamodel/impl/InteractionImpl_.java index d22993b4..eac5f877 100644 --- a/generated/org/omg/sysml/metamodel/impl/InteractionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InteractionImpl_.java @@ -7,12 +7,14 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; @@ -20,17 +22,37 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(InteractionImpl.class) public abstract class InteractionImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile SingularAttribute isConjugated; + public static volatile ListAttribute source; + public static volatile ListAttribute output; + public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedFeature; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute endFeature; + public static volatile ListAttribute directedFeature; + public static volatile ListAttribute input; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedMember; + public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile ListAttribute output; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute relatedType; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -40,41 +62,49 @@ public abstract class InteractionImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute ownedFeatureMembership; public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; - public static volatile SingularAttribute isSufficient; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute elementId; - public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute importedMembership; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute ownedFeature; public static volatile ListAttribute ownedRelationship; - public static volatile SingularAttribute qualifiedName; - public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; - public static volatile ListAttribute endFeature; public static volatile CollectionAttribute targetType; - public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile CollectionAttribute associationEnd; public static volatile ListAttribute target; - public static volatile ListAttribute input; - public static volatile ListAttribute relatedElement; - public static volatile SingularAttribute name; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute step; - public static volatile SingularAttribute shortName; - public static volatile ListAttribute ownedMember; - public static volatile ListAttribute ownedMembership; + public static volatile ListAttribute ownedIntersecting; public static final String IS_CONJUGATED = "isConjugated"; + public static final String SOURCE = "source"; + public static final String OUTPUT = "output"; + public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_FEATURE = "ownedFeature"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String END_FEATURE = "endFeature"; + public static final String DIRECTED_FEATURE = "directedFeature"; + public static final String INPUT = "input"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String OWNED_MEMBER = "ownedMember"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String OUTPUT = "output"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String RELATED_TYPE = "relatedType"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -84,34 +114,23 @@ public abstract class InteractionImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; - public static final String IS_SUFFICIENT = "isSufficient"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String ELEMENT_ID = "elementId"; - public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String OWNED_FEATURE = "ownedFeature"; public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String QUALIFIED_NAME = "qualifiedName"; - public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; - public static final String END_FEATURE = "endFeature"; public static final String TARGET_TYPE = "targetType"; - public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String ASSOCIATION_END = "associationEnd"; public static final String TARGET = "target"; - public static final String INPUT = "input"; - public static final String RELATED_ELEMENT = "relatedElement"; - public static final String NAME = "name"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String STEP = "step"; - public static final String SHORT_NAME = "shortName"; - public static final String OWNED_MEMBER = "ownedMember"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl_.java index 763261d0..916c94d6 100644 --- a/generated/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -40,6 +43,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -63,16 +67,20 @@ public abstract class InterfaceDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedView; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -96,6 +104,7 @@ public abstract class InterfaceDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute relatedType; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; @@ -120,11 +129,15 @@ public abstract class InterfaceDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile CollectionAttribute associationEnd; public static volatile ListAttribute target; public static volatile ListAttribute interfaceEnd; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute connectionEnd; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -139,16 +152,20 @@ public abstract class InterfaceDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_VIEW = "ownedView"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -172,6 +189,7 @@ public abstract class InterfaceDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String RELATED_TYPE = "relatedType"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; @@ -196,11 +214,15 @@ public abstract class InterfaceDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String ASSOCIATION_END = "associationEnd"; public static final String TARGET = "target"; public static final String INTERFACE_END = "interfaceEnd"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String CONNECTION_END = "connectionEnd"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java index 4f509e95..fe96f1dd 100644 --- a/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java @@ -20,6 +20,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -34,8 +35,10 @@ import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceDefinition; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -54,6 +57,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -75,8 +79,10 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; @@ -91,7 +97,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; public static volatile ListAttribute nestedReference; public static volatile SingularAttribute isReadOnly; @@ -109,9 +115,11 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile CollectionAttribute interfaceDefinition; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -130,6 +138,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -137,7 +146,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute featuringType; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile ListAttribute connectionDefinition; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute nestedFlow; @@ -146,8 +155,9 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; public static volatile ListAttribute inheritedMembership; @@ -163,8 +173,11 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedImport; public static volatile ListAttribute itemDefinition; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String USAGE = "usage"; @@ -176,8 +189,10 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; @@ -210,9 +225,11 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String INTERFACE_DEFINITION = "interfaceDefinition"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -231,6 +248,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -247,6 +265,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -264,8 +283,11 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_IMPORT = "ownedImport"; public static final String ITEM_DEFINITION = "itemDefinition"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/IntersectingImpl_.java b/generated/org/omg/sysml/metamodel/impl/IntersectingImpl_.java new file mode 100644 index 00000000..f14d9ded --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/IntersectingImpl_.java @@ -0,0 +1,55 @@ +package org.omg.sysml.metamodel.impl; + +import java.util.UUID; +import javax.annotation.processing.Generated; +import javax.persistence.metamodel.ListAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; +import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.TextualRepresentation; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(IntersectingImpl.class) +public abstract class IntersectingImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute ownedRelationship; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile ListAttribute target; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile SingularAttribute effectiveName; + + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String TARGET = "target"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java b/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java index bafdc545..607a431d 100644 --- a/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(InvariantImpl.class) @@ -40,6 +43,7 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -49,6 +53,7 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -62,6 +67,7 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -84,7 +90,11 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -96,6 +106,7 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -105,6 +116,7 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -118,6 +130,7 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -140,7 +153,11 @@ public abstract class InvariantImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java index 4300551e..c901426e 100644 --- a/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -27,6 +29,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(InvocationExpressionImpl.class) @@ -41,6 +44,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -50,6 +54,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -63,6 +68,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -85,7 +91,11 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String ARGUMENT = "argument"; @@ -97,6 +107,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -106,6 +117,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -119,6 +131,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -141,7 +154,11 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.lifecycle. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ItemDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemDefinitionImpl_.java index e8aec6fe..ca57d3c8 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -92,6 +100,7 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -111,10 +120,14 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -159,6 +175,7 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -178,10 +195,14 @@ public abstract class ItemDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java index 24232f58..fe255ecc 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFeatureImpl.class) @@ -38,6 +41,7 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java index 88e4a0a3..2aedf132 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFlowEndImpl.class) @@ -38,6 +41,7 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.lifecycle.impl.Data public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java index 854d931d..025f7ccc 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFlowFeatureImpl.class) @@ -38,6 +41,7 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java index 4a9bc6d7..9d6a593c 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java @@ -10,6 +10,7 @@ import org.omg.sysml.metamodel.Association; import org.omg.sysml.metamodel.Behavior; import org.omg.sysml.metamodel.Classifier; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -20,7 +21,8 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; -import org.omg.sysml.metamodel.ItemFeature; +import org.omg.sysml.metamodel.Interaction; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemFlowEnd; import org.omg.sysml.metamodel.ItemFlowFeature; import org.omg.sysml.metamodel.Membership; @@ -31,6 +33,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFlowImpl.class) @@ -44,40 +47,41 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile ListAttribute source; public static volatile ListAttribute type; public static volatile ListAttribute output; - public static volatile ListAttribute sourceOutputFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile CollectionAttribute itemFeature; public static volatile SingularAttribute isEnd; public static volatile ListAttribute featuringType; public static volatile ListAttribute input; - public static volatile ListAttribute targetInputFeature; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile CollectionAttribute itemFlowEnd; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile ListAttribute itemType; public static volatile CollectionAttribute ownedDisjoining; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile ListAttribute ownedTyping; @@ -101,8 +105,13 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; + public static volatile ListAttribute interaction; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -113,24 +122,24 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String SOURCE = "source"; public static final String TYPE = "type"; public static final String OUTPUT = "output"; - public static final String SOURCE_OUTPUT_FEATURE = "sourceOutputFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String ITEM_FEATURE = "itemFeature"; public static final String IS_END = "isEnd"; public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; - public static final String TARGET_INPUT_FEATURE = "targetInputFeature"; public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; @@ -145,6 +154,7 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -170,8 +180,13 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; + public static final String INTERACTION = "interaction"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java index 5b0901ba..c45819cb 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -79,6 +83,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -91,6 +96,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -113,6 +119,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -142,11 +149,16 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute itemDefinition; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -168,6 +180,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -180,6 +193,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -202,6 +216,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -231,11 +246,16 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String ITEM_DEFINITION = "itemDefinition"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java index 8be191e1..b7fb7c47 100644 --- a/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(JoinNodeImpl.class) public abstract class JoinNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class JoinNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class JoinNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImp public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LifeClassImpl_.java b/generated/org/omg/sysml/metamodel/impl/LifeClassImpl_.java index 4febd21c..a2174428 100644 --- a/generated/org/omg/sysml/metamodel/impl/LifeClassImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LifeClassImpl_.java @@ -7,17 +7,21 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LifeClassImpl.class) @@ -26,6 +30,7 @@ public abstract class LifeClassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -35,6 +40,7 @@ public abstract class LifeClassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -47,20 +53,26 @@ public abstract class LifeClassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -70,6 +82,7 @@ public abstract class LifeClassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -82,14 +95,19 @@ public abstract class LifeClassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralBooleanImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralBooleanImpl_.java index 922c9242..d3791636 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralBooleanImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralBooleanImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralBooleanImpl.class) @@ -39,6 +42,7 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -84,7 +90,11 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -95,6 +105,7 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -104,6 +115,7 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -117,6 +129,7 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -140,7 +153,11 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java index f3f8b032..214ee64f 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralExpressionImpl.class) @@ -39,6 +42,7 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -83,7 +89,11 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -94,6 +104,7 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -103,6 +114,7 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -116,6 +128,7 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -138,7 +151,11 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.lifecycle.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralInfinityImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralInfinityImpl_.java index b856c3ec..7fedae01 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralInfinityImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralInfinityImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralInfinityImpl.class) @@ -39,6 +42,7 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -83,7 +89,11 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -94,6 +104,7 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -103,6 +114,7 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -116,6 +128,7 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -138,7 +151,11 @@ public abstract class LiteralInfinityImpl_ extends org.omg.sysml.lifecycle.impl. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java index 580f4205..0d524b49 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralIntegerImpl.class) @@ -39,6 +42,7 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -84,7 +90,11 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -95,6 +105,7 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -104,6 +115,7 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -117,6 +129,7 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -140,7 +153,11 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralRationalImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralRationalImpl_.java index fc6af92c..82b44586 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralRationalImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralRationalImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralRationalImpl.class) @@ -39,6 +42,7 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -84,7 +90,11 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -95,6 +105,7 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -104,6 +115,7 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -117,6 +129,7 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -140,7 +153,11 @@ public abstract class LiteralRationalImpl_ extends org.omg.sysml.lifecycle.impl. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java index 73bfd1d2..f997b4eb 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralStringImpl.class) @@ -39,6 +42,7 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -84,7 +90,11 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -95,6 +105,7 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -104,6 +115,7 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -117,6 +129,7 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -140,7 +153,11 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/LoopActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/LoopActionUsageImpl_.java index 5680277c..2aec2043 100644 --- a/generated/org/omg/sysml/metamodel/impl/LoopActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LoopActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(LoopActionUsageImpl.class) public abstract class LoopActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class LoopActionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class LoopActionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/MembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/MembershipImpl_.java index f41aac51..7a625e53 100644 --- a/generated/org/omg/sysml/metamodel/impl/MembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class MembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -29,6 +30,7 @@ public abstract class MembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -38,6 +40,7 @@ public abstract class MembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -49,6 +52,7 @@ public abstract class MembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java index b3bea1df..4c696b1b 100644 --- a/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(MergeNodeImpl.class) public abstract class MergeNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class MergeNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class MergeNodeImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/MetaclassImpl_.java b/generated/org/omg/sysml/metamodel/impl/MetaclassImpl_.java index 23352544..dcaf009e 100644 --- a/generated/org/omg/sysml/metamodel/impl/MetaclassImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MetaclassImpl_.java @@ -7,17 +7,21 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(MetaclassImpl.class) @@ -26,6 +30,7 @@ public abstract class MetaclassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -35,6 +40,7 @@ public abstract class MetaclassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -47,20 +53,26 @@ public abstract class MetaclassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -70,6 +82,7 @@ public abstract class MetaclassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -82,14 +95,19 @@ public abstract class MetaclassImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl_.java index 833f8c0a..7cebcf9d 100644 --- a/generated/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MetadataDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -92,6 +100,7 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -111,10 +120,14 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -159,6 +175,7 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -178,10 +195,14 @@ public abstract class MetadataDefinitionImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/MetadataFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/MetadataFeatureImpl_.java index 9a3dabb6..7080a908 100644 --- a/generated/org/omg/sysml/metamodel/impl/MetadataFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MetadataFeatureImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(MetadataFeatureImpl.class) @@ -38,6 +41,7 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -81,7 +87,11 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedImport; public static volatile ListAttribute annotatedElement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -92,6 +102,7 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -101,6 +112,7 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -114,6 +126,7 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -135,7 +148,11 @@ public abstract class MetadataFeatureImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_IMPORT = "ownedImport"; public static final String ANNOTATED_ELEMENT = "annotatedElement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/MetadataUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/MetadataUsageImpl_.java index 758d87e8..185e8831 100644 --- a/generated/org/omg/sysml/metamodel/impl/MetadataUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MetadataUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(MetadataUsageImpl.class) public abstract class MetadataUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class MetadataUsageImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute annotation; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile ListAttribute annotatedElement; public static volatile SingularAttribute isAbstract; - public static volatile ListAttribute itemDefinition; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute itemDefinition; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class MetadataUsageImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String ANNOTATION = "annotation"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String ANNOTATED_ELEMENT = "annotatedElement"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String ITEM_DEFINITION = "itemDefinition"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String ITEM_DEFINITION = "itemDefinition"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java b/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java index 472171b6..c9337f83 100644 --- a/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(MultiplicityImpl.class) @@ -38,6 +41,7 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java b/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java index f3dfd8de..580bea7c 100644 --- a/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(MultiplicityRangeImpl.class) @@ -39,6 +42,7 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -81,7 +87,11 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -92,6 +102,7 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -101,6 +112,7 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -114,6 +126,7 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -134,7 +147,11 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.lifecycle.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/NamespaceImpl_.java b/generated/org/omg/sysml/metamodel/impl/NamespaceImpl_.java index dbd54242..15606121 100644 --- a/generated/org/omg/sysml/metamodel/impl/NamespaceImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/NamespaceImpl_.java @@ -28,6 +28,7 @@ public abstract class NamespaceImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute documentation; public static volatile ListAttribute membership; public static volatile ListAttribute ownedImport; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute member; public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; @@ -46,6 +47,7 @@ public abstract class NamespaceImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String DOCUMENTATION = "documentation"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_IMPORT = "ownedImport"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String MEMBER = "member"; public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; diff --git a/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java index 78b83550..63611ef6 100644 --- a/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(NullExpressionImpl.class) @@ -39,6 +42,7 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -83,7 +89,11 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -94,6 +104,7 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -103,6 +114,7 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -116,6 +128,7 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -138,7 +151,11 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl_.java index ece43c07..bf1120af 100644 --- a/generated/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ObjectiveMembershipImpl_ extends org.omg.sysml.lifecycle.i public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ObjectiveMembershipImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ObjectiveMembershipImpl_ extends org.omg.sysml.lifecycle.i public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ObjectiveMembershipImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl_.java index d2c77333..0ff68d2f 100644 --- a/generated/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/OccurrenceDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -92,6 +100,7 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -111,10 +120,14 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -159,6 +175,7 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -178,10 +195,14 @@ public abstract class OccurrenceDefinitionImpl_ extends org.omg.sysml.lifecycle. public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl_.java index 716e3908..2e3cfff0 100644 --- a/generated/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/OccurrenceUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -49,6 +52,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -78,6 +82,7 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -90,6 +95,7 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -112,6 +118,7 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -140,11 +147,16 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -166,6 +178,7 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -178,6 +191,7 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -200,6 +214,7 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -228,11 +243,16 @@ public abstract class OccurrenceUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java index 86dc9cff..437968b1 100644 --- a/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -27,6 +29,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(OperatorExpressionImpl.class) @@ -42,6 +45,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static volatile SingularAttribute operator; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -51,6 +55,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -64,6 +69,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -86,7 +92,11 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute operand; public static volatile CollectionAttribute ownedFeatureInverting; @@ -100,6 +110,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static final String OPERATOR = "operator"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -109,6 +120,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -122,6 +134,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -144,7 +157,11 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.lifecycle.im public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OPERAND = "operand"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/OwningMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/OwningMembershipImpl_.java index c01cdfbb..8ad7b53f 100644 --- a/generated/org/omg/sysml/metamodel/impl/OwningMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/OwningMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class OwningMembershipImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class OwningMembershipImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class OwningMembershipImpl_ extends org.omg.sysml.lifecycle.impl public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class OwningMembershipImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/PackageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PackageImpl_.java index eed26881..959eacaa 100644 --- a/generated/org/omg/sysml/metamodel/impl/PackageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PackageImpl_.java @@ -29,6 +29,7 @@ public abstract class PackageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static volatile ListAttribute documentation; public static volatile ListAttribute membership; public static volatile ListAttribute ownedImport; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute filterCondition; public static volatile ListAttribute member; public static volatile SingularAttribute name; @@ -48,6 +49,7 @@ public abstract class PackageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl public static final String DOCUMENTATION = "documentation"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_IMPORT = "ownedImport"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String FILTER_CONDITION = "filterCondition"; public static final String MEMBER = "member"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ParameterMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ParameterMembershipImpl_.java index fc916f62..d3ce7866 100644 --- a/generated/org/omg/sysml/metamodel/impl/ParameterMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ParameterMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ParameterMembershipImpl_ extends org.omg.sysml.lifecycle.i public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ParameterMembershipImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ParameterMembershipImpl_ extends org.omg.sysml.lifecycle.i public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ParameterMembershipImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/PartDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/PartDefinitionImpl_.java index fffcdc1f..a52e373f 100644 --- a/generated/org/omg/sysml/metamodel/impl/PartDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PartDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -92,6 +100,7 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -111,10 +120,14 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -159,6 +175,7 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -178,10 +195,14 @@ public abstract class PartDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java index 6c3a80a7..dc178144 100644 --- a/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -51,6 +54,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -62,14 +66,8 @@ @StaticMetamodel(PartUsageImpl.class) public abstract class PartUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -77,89 +75,97 @@ public abstract class PartUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute partDefinition; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile ListAttribute itemDefinition; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute itemDefinition; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,80 +173,94 @@ public abstract class PartUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String PART_DEFINITION = "partDefinition"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String ITEM_DEFINITION = "itemDefinition"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String ITEM_DEFINITION = "itemDefinition"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java index a9e79bf5..6ed3c132 100644 --- a/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(PerformActionUsageImpl.class) public abstract class PerformActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class PerformActionUsageImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class PerformActionUsageImpl_ extends org.omg.sysml.lifecycle.im public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/PortConjugationImpl_.java b/generated/org/omg/sysml/metamodel/impl/PortConjugationImpl_.java index af557fa5..f51511e3 100644 --- a/generated/org/omg/sysml/metamodel/impl/PortConjugationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PortConjugationImpl_.java @@ -17,6 +17,7 @@ public abstract class PortConjugationImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class PortConjugationImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class PortConjugationImpl_ extends org.omg.sysml.lifecycle.impl. public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class PortConjugationImpl_ extends org.omg.sysml.lifecycle.impl. public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/PortDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/PortDefinitionImpl_.java index 47860a10..bc1db17f 100644 --- a/generated/org/omg/sysml/metamodel/impl/PortDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PortDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -92,6 +100,7 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -111,10 +120,14 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -128,9 +141,11 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -138,6 +153,7 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -159,6 +175,7 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -178,10 +195,14 @@ public abstract class PortDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java index 0e90d1d5..2c6ce93a 100644 --- a/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortDefinition; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -79,6 +83,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -91,6 +96,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -113,6 +119,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -142,11 +149,16 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -168,6 +180,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -180,6 +193,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -202,6 +216,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -231,11 +246,16 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/PortioningFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/PortioningFeatureImpl_.java index f24b8fa1..a184d647 100644 --- a/generated/org/omg/sysml/metamodel/impl/PortioningFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PortioningFeatureImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.PortionKind; import org.omg.sysml.metamodel.Redefinition; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(PortioningFeatureImpl.class) @@ -39,6 +42,7 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -81,7 +87,11 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute portionKind; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -92,6 +102,7 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -101,6 +112,7 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -114,6 +126,7 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -134,7 +147,11 @@ public abstract class PortioningFeatureImpl_ extends org.omg.sysml.lifecycle.imp public static final String PORTION_KIND = "portionKind"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/PredicateImpl_.java b/generated/org/omg/sysml/metamodel/impl/PredicateImpl_.java index 8effaa43..019abce0 100644 --- a/generated/org/omg/sysml/metamodel/impl/PredicateImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PredicateImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -14,12 +15,15 @@ import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Step; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(PredicateImpl.class) @@ -28,6 +32,7 @@ public abstract class PredicateImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -38,6 +43,7 @@ public abstract class PredicateImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -52,21 +58,27 @@ public abstract class PredicateImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute step; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -77,6 +89,7 @@ public abstract class PredicateImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -91,15 +104,20 @@ public abstract class PredicateImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String STEP = "step"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/PrefixCommentImpl_.java b/generated/org/omg/sysml/metamodel/impl/PrefixCommentImpl_.java deleted file mode 100644 index 8cc754d8..00000000 --- a/generated/org/omg/sysml/metamodel/impl/PrefixCommentImpl_.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.omg.sysml.metamodel.impl; - -import java.util.UUID; -import javax.annotation.processing.Generated; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.StaticMetamodel; -import org.omg.sysml.metamodel.Annotation; -import org.omg.sysml.metamodel.Documentation; -import org.omg.sysml.metamodel.Element; -import org.omg.sysml.metamodel.Relationship; -import org.omg.sysml.metamodel.TextualRepresentation; - -@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") -@StaticMetamodel(PrefixCommentImpl.class) -public abstract class PrefixCommentImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - - public static volatile ListAttribute annotation; - public static volatile SingularAttribute elementId; - public static volatile ListAttribute textualRepresentation; - public static volatile ListAttribute ownedAnnotation; - public static volatile ListAttribute ownedElement; - public static volatile ListAttribute aliasIds; - public static volatile ListAttribute ownedRelationship; - public static volatile SingularAttribute qualifiedName; - public static volatile ListAttribute documentation; - public static volatile ListAttribute annotatedElement; - public static volatile SingularAttribute body; - public static volatile SingularAttribute locale; - public static volatile SingularAttribute name; - public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - - public static final String ANNOTATION = "annotation"; - public static final String ELEMENT_ID = "elementId"; - public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; - public static final String OWNED_ELEMENT = "ownedElement"; - public static final String ALIAS_IDS = "aliasIds"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String QUALIFIED_NAME = "qualifiedName"; - public static final String DOCUMENTATION = "documentation"; - public static final String ANNOTATED_ELEMENT = "annotatedElement"; - public static final String BODY = "body"; - public static final String LOCALE = "locale"; - public static final String NAME = "name"; - public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - -} - diff --git a/generated/org/omg/sysml/metamodel/impl/RedefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/RedefinitionImpl_.java index ad212a43..01f71e04 100644 --- a/generated/org/omg/sysml/metamodel/impl/RedefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RedefinitionImpl_.java @@ -17,6 +17,7 @@ public abstract class RedefinitionImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class RedefinitionImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class RedefinitionImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class RedefinitionImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl_.java b/generated/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl_.java new file mode 100644 index 00000000..9202c876 --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/ReferenceSubsettingImpl_.java @@ -0,0 +1,55 @@ +package org.omg.sysml.metamodel.impl; + +import java.util.UUID; +import javax.annotation.processing.Generated; +import javax.persistence.metamodel.ListAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; +import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.TextualRepresentation; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(ReferenceSubsettingImpl.class) +public abstract class ReferenceSubsettingImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute ownedRelationship; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile ListAttribute target; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile SingularAttribute effectiveName; + + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String TARGET = "target"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java index 6b2c122e..d1e97002 100644 --- a/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java @@ -17,6 +17,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -30,8 +31,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -47,6 +50,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -76,6 +80,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -88,6 +93,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -109,6 +115,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute nestedAllocation; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -135,11 +142,16 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -161,6 +173,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -173,6 +186,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -194,6 +208,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_ALLOCATION = "nestedAllocation"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -220,11 +235,16 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/RelationshipImpl_.java b/generated/org/omg/sysml/metamodel/impl/RelationshipImpl_.java index 8664a27e..dd524d70 100644 --- a/generated/org/omg/sysml/metamodel/impl/RelationshipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RelationshipImpl_.java @@ -17,6 +17,7 @@ public abstract class RelationshipImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class RelationshipImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class RelationshipImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class RelationshipImpl_ extends org.omg.sysml.lifecycle.impl.Dat public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl_.java index 42982e3d..12444a2f 100644 --- a/generated/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RenderingDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -39,6 +42,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,9 +66,11 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -71,6 +78,7 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute rendering; public static volatile ListAttribute directedFeature; @@ -93,6 +101,7 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -112,10 +121,14 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -129,9 +142,11 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -139,6 +154,7 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String RENDERING = "rendering"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -161,6 +177,7 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -180,10 +197,14 @@ public abstract class RenderingDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java index 26aa5db0..815fc4f2 100644 --- a/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -31,8 +32,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -51,6 +54,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -62,14 +66,8 @@ @StaticMetamodel(RenderingUsageImpl.class) public abstract class RenderingUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -77,89 +75,97 @@ public abstract class RenderingUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute partDefinition; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile ListAttribute itemDefinition; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute itemDefinition; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,80 +173,94 @@ public abstract class RenderingUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String PART_DEFINITION = "partDefinition"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String ITEM_DEFINITION = "itemDefinition"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String ITEM_DEFINITION = "itemDefinition"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl_.java index e280e093..2e7a0e72 100644 --- a/generated/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl_.java @@ -17,8 +17,19 @@ @StaticMetamodel(RequirementConstraintMembershipImpl.class) public abstract class RequirementConstraintMembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + public static volatile SingularAttribute ownedMemberElementId; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute memberShortName; + public static volatile SingularAttribute ownedMemberName; + public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute ownedMemberShortName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -27,22 +38,24 @@ public abstract class RequirementConstraintMembershipImpl_ extends org.omg.sysml public static volatile ListAttribute ownedRelationship; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; - public static volatile SingularAttribute ownedMemberElementId; - public static volatile SingularAttribute memberName; - public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile SingularAttribute memberElementId; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile SingularAttribute memberShortName; - public static volatile SingularAttribute ownedMemberName; public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute ownedMemberShortName; + public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; + public static final String MEMBER_NAME = "memberName"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String MEMBER_SHORT_NAME = "memberShortName"; + public static final String OWNED_MEMBER_NAME = "ownedMemberName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -51,19 +64,10 @@ public abstract class RequirementConstraintMembershipImpl_ extends org.omg.sysml public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; - public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; - public static final String MEMBER_NAME = "memberName"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String MEMBER_ELEMENT_ID = "memberElementId"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; - public static final String MEMBER_SHORT_NAME = "memberShortName"; - public static final String OWNED_MEMBER_NAME = "ownedMemberName"; public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; } diff --git a/generated/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl_.java index 5dcb19a5..a2453c39 100644 --- a/generated/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RequirementDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,11 +69,13 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile ListAttribute framedConcern; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -76,6 +83,7 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -101,6 +109,7 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -123,11 +132,15 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -142,11 +155,13 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String FRAMED_CONCERN = "framedConcern"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -154,6 +169,7 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -179,6 +195,7 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -201,11 +218,15 @@ public abstract class RequirementDefinitionImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java index d83c5aa5..e412df06 100644 --- a/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -74,6 +78,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute nestedConstraint; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute nestedAttribute; @@ -109,8 +114,10 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -128,6 +135,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -142,6 +150,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile CollectionAttribute ownedDisjoining; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; @@ -157,7 +166,10 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedRelationship; public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; @@ -172,6 +184,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; @@ -207,8 +220,10 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -226,6 +241,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -240,6 +256,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String OWNED_TYPING = "ownedTyping"; @@ -255,7 +272,10 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java index 57652106..99fbf31e 100644 --- a/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java @@ -17,8 +17,19 @@ @StaticMetamodel(RequirementVerificationMembershipImpl.class) public abstract class RequirementVerificationMembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + public static volatile SingularAttribute ownedMemberElementId; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute memberShortName; + public static volatile SingularAttribute ownedMemberName; + public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute ownedMemberShortName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -27,22 +38,24 @@ public abstract class RequirementVerificationMembershipImpl_ extends org.omg.sys public static volatile ListAttribute ownedRelationship; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; - public static volatile SingularAttribute ownedMemberElementId; - public static volatile SingularAttribute memberName; - public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile SingularAttribute memberElementId; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile SingularAttribute memberShortName; - public static volatile SingularAttribute ownedMemberName; public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute ownedMemberShortName; + public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; + public static final String MEMBER_NAME = "memberName"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String MEMBER_SHORT_NAME = "memberShortName"; + public static final String OWNED_MEMBER_NAME = "ownedMemberName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -51,19 +64,10 @@ public abstract class RequirementVerificationMembershipImpl_ extends org.omg.sys public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; - public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; - public static final String MEMBER_NAME = "memberName"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String MEMBER_ELEMENT_ID = "memberElementId"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; - public static final String MEMBER_SHORT_NAME = "memberShortName"; - public static final String OWNED_MEMBER_NAME = "ownedMemberName"; public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl_.java index 0f8ae696..9c5b0cd3 100644 --- a/generated/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ResultExpressionMembershipImpl_ extends org.omg.sysml.life public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ResultExpressionMembershipImpl_ extends org.omg.sysml.life public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ResultExpressionMembershipImpl_ extends org.omg.sysml.life public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ResultExpressionMembershipImpl_ extends org.omg.sysml.life public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl_.java index 54fe9016..30a5e8e2 100644 --- a/generated/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ReturnParameterMembershipImpl_ extends org.omg.sysml.lifec public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ReturnParameterMembershipImpl_ extends org.omg.sysml.lifec public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ReturnParameterMembershipImpl_ extends org.omg.sysml.lifec public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ReturnParameterMembershipImpl_ extends org.omg.sysml.lifec public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java index 26060502..98d8b2d3 100644 --- a/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -74,6 +78,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static volatile ListAttribute nestedConstraint; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute nestedAttribute; @@ -109,8 +114,10 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -129,6 +136,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -143,6 +151,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static volatile CollectionAttribute ownedDisjoining; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; @@ -158,7 +167,10 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static volatile ListAttribute ownedRelationship; public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; @@ -173,6 +185,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; @@ -208,8 +221,10 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -228,6 +243,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -242,6 +258,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String OWNED_TYPING = "ownedTyping"; @@ -257,7 +274,10 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.lifecyc public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/SelectExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/SelectExpressionImpl_.java index 9a68b43b..9c569aa6 100644 --- a/generated/org/omg/sysml/metamodel/impl/SelectExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SelectExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -27,6 +29,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SelectExpressionImpl.class) @@ -42,6 +45,7 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile SingularAttribute operator; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -51,6 +55,7 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -64,6 +69,7 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -86,7 +92,11 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute operand; public static volatile CollectionAttribute ownedFeatureInverting; @@ -100,6 +110,7 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OPERATOR = "operator"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -109,6 +120,7 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -122,6 +134,7 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -144,7 +157,11 @@ public abstract class SelectExpressionImpl_ extends org.omg.sysml.lifecycle.impl public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OPERAND = "operand"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java index 764b0d1a..262ebe14 100644 --- a/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(SendActionUsageImpl.class) public abstract class SendActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class SendActionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class SendActionUsageImpl_ extends org.omg.sysml.lifecycle.impl. public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java b/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java index ed94ba6a..90c3deb2 100644 --- a/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SourceEndImpl.class) @@ -38,6 +41,7 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/SpecializationImpl_.java b/generated/org/omg/sysml/metamodel/impl/SpecializationImpl_.java index 117ea413..e845a411 100644 --- a/generated/org/omg/sysml/metamodel/impl/SpecializationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SpecializationImpl_.java @@ -17,6 +17,7 @@ public abstract class SpecializationImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class SpecializationImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class SpecializationImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class SpecializationImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl_.java index 9277173a..3b151944 100644 --- a/generated/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StakeholderMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class StakeholderMembershipImpl_ extends org.omg.sysml.lifecycle public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class StakeholderMembershipImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class StakeholderMembershipImpl_ extends org.omg.sysml.lifecycle public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class StakeholderMembershipImpl_ extends org.omg.sysml.lifecycle public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/StateDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/StateDefinitionImpl_.java index d142c40e..99fde2f8 100644 --- a/generated/org/omg/sysml/metamodel/impl/StateDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StateDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -25,8 +26,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -40,6 +43,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -62,11 +67,13 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile ListAttribute state; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -74,6 +81,7 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -95,6 +103,7 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -116,11 +125,15 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -134,11 +147,13 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String STATE = "state"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -146,6 +161,7 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -167,6 +183,7 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -188,11 +205,15 @@ public abstract class StateDefinitionImpl_ extends org.omg.sysml.lifecycle.impl. public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl_.java index 771fc86e..3e9c3f09 100644 --- a/generated/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl_.java @@ -17,8 +17,19 @@ @StaticMetamodel(StateSubactionMembershipImpl.class) public abstract class StateSubactionMembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + public static volatile SingularAttribute ownedMemberElementId; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute memberShortName; + public static volatile SingularAttribute ownedMemberName; + public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute ownedMemberShortName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -27,22 +38,24 @@ public abstract class StateSubactionMembershipImpl_ extends org.omg.sysml.lifecy public static volatile ListAttribute ownedRelationship; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; - public static volatile SingularAttribute ownedMemberElementId; - public static volatile SingularAttribute memberName; - public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile SingularAttribute memberElementId; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile SingularAttribute memberShortName; - public static volatile SingularAttribute ownedMemberName; public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute ownedMemberShortName; + public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; + public static final String MEMBER_NAME = "memberName"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String MEMBER_SHORT_NAME = "memberShortName"; + public static final String OWNED_MEMBER_NAME = "ownedMemberName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -51,19 +64,10 @@ public abstract class StateSubactionMembershipImpl_ extends org.omg.sysml.lifecy public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; - public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; - public static final String MEMBER_NAME = "memberName"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String MEMBER_ELEMENT_ID = "memberElementId"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; - public static final String MEMBER_SHORT_NAME = "memberShortName"; - public static final String OWNED_MEMBER_NAME = "ownedMemberName"; public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; } diff --git a/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java index 9672323e..d1876247 100644 --- a/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(StateUsageImpl.class) public abstract class StateUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -77,91 +75,99 @@ public abstract class StateUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; - public static volatile SingularAttribute isParallel; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile SingularAttribute isParallel; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -170,82 +176,96 @@ public abstract class StateUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; - public static final String IS_PARALLEL = "isParallel"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String IS_PARALLEL = "isParallel"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/StepImpl_.java b/generated/org/omg/sysml/metamodel/impl/StepImpl_.java index 8960c6bc..dff63275 100644 --- a/generated/org/omg/sysml/metamodel/impl/StepImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StepImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -18,6 +19,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -26,6 +28,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(StepImpl.class) @@ -39,6 +42,7 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -48,6 +52,7 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,6 +66,7 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -82,7 +88,11 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -93,6 +103,7 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -102,6 +113,7 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -115,6 +127,7 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -136,7 +149,11 @@ public abstract class StepImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/StructureImpl_.java b/generated/org/omg/sysml/metamodel/impl/StructureImpl_.java index bf69e94f..4d46196c 100644 --- a/generated/org/omg/sysml/metamodel/impl/StructureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StructureImpl_.java @@ -7,17 +7,21 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(StructureImpl.class) @@ -26,6 +30,7 @@ public abstract class StructureImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -35,6 +40,7 @@ public abstract class StructureImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedSubclassification; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -47,20 +53,26 @@ public abstract class StructureImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -70,6 +82,7 @@ public abstract class StructureImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_SUBCLASSIFICATION = "ownedSubclassification"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -82,14 +95,19 @@ public abstract class StructureImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/SubclassificationImpl_.java b/generated/org/omg/sysml/metamodel/impl/SubclassificationImpl_.java index 7bc1ac36..34de7ae7 100644 --- a/generated/org/omg/sysml/metamodel/impl/SubclassificationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SubclassificationImpl_.java @@ -17,6 +17,7 @@ public abstract class SubclassificationImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class SubclassificationImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class SubclassificationImpl_ extends org.omg.sysml.lifecycle.imp public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class SubclassificationImpl_ extends org.omg.sysml.lifecycle.imp public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/SubjectMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/SubjectMembershipImpl_.java index 9d6dfde8..e77b6acc 100644 --- a/generated/org/omg/sysml/metamodel/impl/SubjectMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SubjectMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class SubjectMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class SubjectMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class SubjectMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class SubjectMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/SubsettingImpl_.java b/generated/org/omg/sysml/metamodel/impl/SubsettingImpl_.java index 0baaf353..6341adac 100644 --- a/generated/org/omg/sysml/metamodel/impl/SubsettingImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SubsettingImpl_.java @@ -17,6 +17,7 @@ public abstract class SubsettingImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class SubsettingImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class SubsettingImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class SubsettingImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl_.java index 822601db..d4aed57b 100644 --- a/generated/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SuccessionAsUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,199 +65,217 @@ @StaticMetamodel(SuccessionAsUsageImpl.class) public abstract class SuccessionAsUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; - public static volatile ListAttribute source; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; - public static volatile CollectionAttribute guardExpression; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile ListAttribute nestedView; - public static volatile CollectionAttribute effectStep; - public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; + public static volatile ListAttribute nestedAllocation; + public static volatile ListAttribute association; + public static volatile SingularAttribute isPortion; + public static volatile ListAttribute nestedReference; + public static volatile SingularAttribute isReadOnly; + public static volatile SingularAttribute isVariation; + public static volatile ListAttribute feature; + public static volatile ListAttribute member; + public static volatile SingularAttribute isReference; + public static volatile ListAttribute inheritedFeature; + public static volatile SingularAttribute effectiveName; + public static volatile ListAttribute importedMembership; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute featureMembership; + public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute relatedFeature; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; + public static volatile ListAttribute nestedInterface; + public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute nestedViewpoint; + public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile ListAttribute source; + public static volatile CollectionAttribute guardExpression; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile CollectionAttribute effectStep; + public static volatile SingularAttribute name; + public static volatile ListAttribute connectorEnd; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute nestedFlow; public static volatile ListAttribute nestedCase; public static volatile CollectionAttribute ownedDisjoining; - public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; - public static volatile SingularAttribute isPortion; public static volatile CollectionAttribute triggerStep; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile ListAttribute nestedReference; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; - public static volatile SingularAttribute isReadOnly; - public static volatile SingularAttribute isVariation; public static volatile ListAttribute ownedTyping; - public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute member; public static volatile ListAttribute ownedEndFeature; - public static volatile SingularAttribute isReference; public static volatile ListAttribute ownedFeatureMembership; public static volatile ListAttribute definition; public static volatile ListAttribute nestedUseCase; - public static volatile ListAttribute inheritedFeature; - public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute direction; - public static volatile ListAttribute importedMembership; - public static volatile ListAttribute ownedElement; - public static volatile ListAttribute aliasIds; public static volatile ListAttribute nestedAction; public static volatile ListAttribute ownedRelationship; - public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; - public static volatile SingularAttribute isAbstract; - public static volatile ListAttribute relatedFeature; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile SingularAttribute isDirected; - public static volatile ListAttribute nestedRendering; - public static volatile ListAttribute nestedConnection; - public static volatile ListAttribute nestedInterface; - public static volatile ListAttribute ownedSpecialization; - public static volatile ListAttribute nestedViewpoint; - public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; - public static final String SOURCE = "source"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; - public static final String GUARD_EXPRESSION = "guardExpression"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String DIRECTED_FEATURE = "directedFeature"; + public static final String INPUT = "input"; + public static final String NESTED_CALCULATION = "nestedCalculation"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NESTED_VIEW = "nestedView"; + public static final String SHORT_NAME = "shortName"; + public static final String OWNED_MEMBER = "ownedMember"; + public static final String NESTED_OCCURRENCE = "nestedOccurrence"; + public static final String NESTED_ALLOCATION = "nestedAllocation"; + public static final String ASSOCIATION = "association"; + public static final String IS_PORTION = "isPortion"; + public static final String NESTED_REFERENCE = "nestedReference"; + public static final String IS_READ_ONLY = "isReadOnly"; + public static final String IS_VARIATION = "isVariation"; + public static final String FEATURE = "feature"; + public static final String MEMBER = "member"; + public static final String IS_REFERENCE = "isReference"; + public static final String INHERITED_FEATURE = "inheritedFeature"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String IMPORTED_MEMBERSHIP = "importedMembership"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String IS_ABSTRACT = "isAbstract"; + public static final String RELATED_FEATURE = "relatedFeature"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String NESTED_RENDERING = "nestedRendering"; + public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; + public static final String NESTED_INTERFACE = "nestedInterface"; + public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String NESTED_VIEWPOINT = "nestedViewpoint"; + public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String SOURCE = "source"; + public static final String GUARD_EXPRESSION = "guardExpression"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; - public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; public static final String NESTED_ITEM = "nestedItem"; public static final String FEATURING_TYPE = "featuringType"; - public static final String INPUT = "input"; - public static final String NESTED_CALCULATION = "nestedCalculation"; public static final String IS_COMPOSITE = "isComposite"; - public static final String RELATED_ELEMENT = "relatedElement"; - public static final String NESTED_VIEW = "nestedView"; public static final String EFFECT_STEP = "effectStep"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; - public static final String SHORT_NAME = "shortName"; - public static final String OWNED_MEMBER = "ownedMember"; - public static final String NESTED_OCCURRENCE = "nestedOccurrence"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String NESTED_FLOW = "nestedFlow"; public static final String NESTED_CASE = "nestedCase"; public static final String OWNED_DISJOINING = "ownedDisjoining"; - public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String ASSOCIATION = "association"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String IS_PORTION = "isPortion"; public static final String TRIGGER_STEP = "triggerStep"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; - public static final String NESTED_REFERENCE = "nestedReference"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; - public static final String IS_READ_ONLY = "isReadOnly"; - public static final String IS_VARIATION = "isVariation"; public static final String OWNED_TYPING = "ownedTyping"; - public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String MEMBER = "member"; public static final String OWNED_END_FEATURE = "ownedEndFeature"; - public static final String IS_REFERENCE = "isReference"; public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; public static final String DEFINITION = "definition"; public static final String NESTED_USE_CASE = "nestedUseCase"; - public static final String INHERITED_FEATURE = "inheritedFeature"; - public static final String EFFECTIVE_NAME = "effectiveName"; public static final String DIRECTION = "direction"; - public static final String IMPORTED_MEMBERSHIP = "importedMembership"; - public static final String OWNED_ELEMENT = "ownedElement"; - public static final String ALIAS_IDS = "aliasIds"; public static final String NESTED_ACTION = "nestedAction"; public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String IS_ABSTRACT = "isAbstract"; - public static final String RELATED_FEATURE = "relatedFeature"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String IS_DIRECTED = "isDirected"; - public static final String NESTED_RENDERING = "nestedRendering"; - public static final String NESTED_CONNECTION = "nestedConnection"; - public static final String NESTED_INTERFACE = "nestedInterface"; - public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; - public static final String NESTED_VIEWPOINT = "nestedViewpoint"; - public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl_.java index c914efb8..8a9e3bdf 100644 --- a/generated/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SuccessionFlowConnectionUsageImpl_.java @@ -21,6 +21,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -34,12 +35,14 @@ import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Interaction; import org.omg.sysml.metamodel.InterfaceUsage; -import org.omg.sysml.metamodel.ItemFeature; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemFlowEnd; import org.omg.sysml.metamodel.ItemFlowFeature; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; import org.omg.sysml.metamodel.PartUsage; @@ -59,6 +62,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -77,28 +81,29 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; - public static volatile ListAttribute sourceOutputFeature; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute nestedAttribute; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile ListAttribute targetInputFeature; public static volatile ListAttribute relatedElement; public static volatile ListAttribute nestedView; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; public static volatile ListAttribute nestedAllocation; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile SingularAttribute isPortion; public static volatile ListAttribute nestedReference; public static volatile SingularAttribute isReadOnly; @@ -118,8 +123,10 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -139,16 +146,16 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; - public static volatile CollectionAttribute itemFeature; public static volatile SingularAttribute isEnd; public static volatile ListAttribute nestedItem; public static volatile ListAttribute featuringType; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute effectStep; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile ListAttribute connectionDefinition; public static volatile CollectionAttribute itemFlowEnd; public static volatile ListAttribute ownedMembership; @@ -159,9 +166,11 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute flowConnectionDefinition; public static volatile CollectionAttribute triggerStep; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; public static volatile ListAttribute inheritedMembership; @@ -178,8 +187,12 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static volatile ListAttribute ownedImport; public static volatile ListAttribute itemDefinition; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute interaction; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String USAGE = "usage"; @@ -188,21 +201,22 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; - public static final String SOURCE_OUTPUT_FEATURE = "sourceOutputFeature"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String TARGET_INPUT_FEATURE = "targetInputFeature"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NESTED_VIEW = "nestedView"; public static final String SHORT_NAME = "shortName"; @@ -229,8 +243,10 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -250,9 +266,9 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; - public static final String ITEM_FEATURE = "itemFeature"; public static final String IS_END = "isEnd"; public static final String NESTED_ITEM = "nestedItem"; public static final String FEATURING_TYPE = "featuringType"; @@ -270,7 +286,9 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String FLOW_CONNECTION_DEFINITION = "flowConnectionDefinition"; public static final String TRIGGER_STEP = "triggerStep"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -289,8 +307,12 @@ public abstract class SuccessionFlowConnectionUsageImpl_ extends org.omg.sysml.l public static final String OWNED_IMPORT = "ownedImport"; public static final String ITEM_DEFINITION = "itemDefinition"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String INTERACTION = "interaction"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java b/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java index 4b771956..e97cbd7e 100644 --- a/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Association; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -28,6 +30,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SuccessionImpl.class) @@ -43,15 +46,18 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute output; public static volatile CollectionAttribute guardExpression; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -61,18 +67,19 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile ListAttribute relatedElement; public static volatile CollectionAttribute effectStep; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedDisjoining; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; public static volatile SingularAttribute isPortion; public static volatile CollectionAttribute triggerStep; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile ListAttribute ownedTyping; @@ -93,8 +100,12 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -107,15 +118,18 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OUTPUT = "output"; public static final String GUARD_EXPRESSION = "guardExpression"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -135,6 +149,7 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; public static final String TRIGGER_STEP = "triggerStep"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -157,8 +172,12 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.lifecycle.impl.DataI public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java b/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java index 098df76b..88ac5948 100644 --- a/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java @@ -10,6 +10,7 @@ import org.omg.sysml.metamodel.Association; import org.omg.sysml.metamodel.Behavior; import org.omg.sysml.metamodel.Classifier; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -21,7 +22,8 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; -import org.omg.sysml.metamodel.ItemFeature; +import org.omg.sysml.metamodel.Interaction; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemFlowEnd; import org.omg.sysml.metamodel.ItemFlowFeature; import org.omg.sysml.metamodel.Membership; @@ -33,6 +35,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SuccessionItemFlowImpl.class) @@ -46,43 +49,44 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.lifecycle.im public static volatile ListAttribute source; public static volatile ListAttribute type; public static volatile ListAttribute output; - public static volatile ListAttribute sourceOutputFeature; public static volatile CollectionAttribute guardExpression; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile SingularAttribute isDerived; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile CollectionAttribute itemFeature; public static volatile SingularAttribute isEnd; public static volatile ListAttribute featuringType; public static volatile ListAttribute input; - public static volatile ListAttribute targetInputFeature; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile CollectionAttribute effectStep; public static volatile SingularAttribute name; - public static volatile CollectionAttribute connectorEnd; + public static volatile ListAttribute connectorEnd; public static volatile SingularAttribute shortName; public static volatile CollectionAttribute itemFlowEnd; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile ListAttribute itemType; public static volatile CollectionAttribute ownedDisjoining; - public static volatile CollectionAttribute association; + public static volatile ListAttribute association; public static volatile ListAttribute membership; public static volatile ListAttribute ownedRelatedElement; public static volatile SingularAttribute isPortion; public static volatile CollectionAttribute triggerStep; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; - public static volatile CollectionAttribute targetFeature; + public static volatile ListAttribute targetFeature; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile ListAttribute ownedTyping; @@ -106,8 +110,13 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.lifecycle.im public static volatile SingularAttribute isAbstract; public static volatile ListAttribute relatedFeature; public static volatile ListAttribute target; + public static volatile ListAttribute differencingType; public static volatile SingularAttribute isDirected; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; + public static volatile ListAttribute interaction; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -118,25 +127,25 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.lifecycle.im public static final String SOURCE = "source"; public static final String TYPE = "type"; public static final String OUTPUT = "output"; - public static final String SOURCE_OUTPUT_FEATURE = "sourceOutputFeature"; public static final String GUARD_EXPRESSION = "guardExpression"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String IS_DERIVED = "isDerived"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String ITEM_FEATURE = "itemFeature"; public static final String IS_END = "isEnd"; public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; - public static final String TARGET_INPUT_FEATURE = "targetInputFeature"; public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String EFFECT_STEP = "effectStep"; @@ -153,6 +162,7 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.lifecycle.im public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String IS_PORTION = "isPortion"; public static final String TRIGGER_STEP = "triggerStep"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String TARGET_FEATURE = "targetFeature"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -178,8 +188,13 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.lifecycle.im public static final String IS_ABSTRACT = "isAbstract"; public static final String RELATED_FEATURE = "relatedFeature"; public static final String TARGET = "target"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String IS_DIRECTED = "isDirected"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; + public static final String INTERACTION = "interaction"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java b/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java index 72475109..771c00fb 100644 --- a/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java @@ -7,6 +7,7 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -17,6 +18,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -25,6 +27,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(TargetEndImpl.class) @@ -38,6 +41,7 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -47,6 +51,7 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -60,6 +65,7 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -79,7 +85,11 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String CHAINING_FEATURE = "chainingFeature"; @@ -90,6 +100,7 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -99,6 +110,7 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -112,6 +124,7 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -131,7 +144,11 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/TextualRepresentationImpl_.java b/generated/org/omg/sysml/metamodel/impl/TextualRepresentationImpl_.java index 3e4f495f..687abf6e 100644 --- a/generated/org/omg/sysml/metamodel/impl/TextualRepresentationImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TextualRepresentationImpl_.java @@ -27,6 +27,7 @@ public abstract class TextualRepresentationImpl_ extends org.omg.sysml.lifecycle public static volatile SingularAttribute language; public static volatile ListAttribute annotatedElement; public static volatile SingularAttribute body; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile SingularAttribute effectiveName; @@ -43,6 +44,7 @@ public abstract class TextualRepresentationImpl_ extends org.omg.sysml.lifecycle public static final String LANGUAGE = "language"; public static final String ANNOTATED_ELEMENT = "annotatedElement"; public static final String BODY = "body"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String EFFECTIVE_NAME = "effectiveName"; diff --git a/generated/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl_.java index 469ff459..10bf5acd 100644 --- a/generated/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl_.java @@ -17,8 +17,19 @@ @StaticMetamodel(TransitionFeatureMembershipImpl.class) public abstract class TransitionFeatureMembershipImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + public static volatile SingularAttribute ownedMemberElementId; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute memberShortName; + public static volatile SingularAttribute ownedMemberName; + public static volatile SingularAttribute effectiveName; + public static volatile SingularAttribute ownedMemberShortName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -27,22 +38,24 @@ public abstract class TransitionFeatureMembershipImpl_ extends org.omg.sysml.lif public static volatile ListAttribute ownedRelationship; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; - public static volatile SingularAttribute ownedMemberElementId; - public static volatile SingularAttribute memberName; - public static volatile ListAttribute ownedRelatedElement; - public static volatile ListAttribute source; - public static volatile SingularAttribute memberElementId; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; - public static volatile SingularAttribute memberShortName; - public static volatile SingularAttribute ownedMemberName; public static volatile SingularAttribute shortName; - public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute ownedMemberShortName; + public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; + public static final String MEMBER_NAME = "memberName"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String MEMBER_SHORT_NAME = "memberShortName"; + public static final String OWNED_MEMBER_NAME = "ownedMemberName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -51,19 +64,10 @@ public abstract class TransitionFeatureMembershipImpl_ extends org.omg.sysml.lif public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; - public static final String OWNED_MEMBER_ELEMENT_ID = "ownedMemberElementId"; - public static final String MEMBER_NAME = "memberName"; - public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; - public static final String SOURCE = "source"; - public static final String MEMBER_ELEMENT_ID = "memberElementId"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; - public static final String MEMBER_SHORT_NAME = "memberShortName"; - public static final String OWNED_MEMBER_NAME = "ownedMemberName"; public static final String SHORT_NAME = "shortName"; - public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String OWNED_MEMBER_SHORT_NAME = "ownedMemberShortName"; } diff --git a/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java index 0186c342..f3ff35eb 100644 --- a/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java @@ -20,6 +20,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -34,8 +35,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -52,6 +55,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -63,193 +67,209 @@ @StaticMetamodel(TransitionUsageImpl.class) public abstract class TransitionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; - public static volatile CollectionAttribute guardExpression; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute triggerAction; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile CollectionAttribute effectAction; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute guardExpression; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; - public static final String GUARD_EXPRESSION = "guardExpression"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String TRIGGER_ACTION = "triggerAction"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String EFFECT_ACTION = "effectAction"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String GUARD_EXPRESSION = "guardExpression"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl_.java index 77c033ac..871d3506 100644 --- a/generated/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TriggerInvocationExpressionImpl_.java @@ -8,6 +8,7 @@ import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; import org.omg.sysml.metamodel.Behavior; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -19,6 +20,7 @@ import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.FeatureTyping; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Redefinition; import org.omg.sysml.metamodel.Relationship; @@ -28,6 +30,7 @@ import org.omg.sysml.metamodel.TriggerKind; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(TriggerInvocationExpressionImpl.class) @@ -42,6 +45,7 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static volatile ListAttribute type; public static volatile ListAttribute output; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -52,6 +56,7 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static volatile SingularAttribute kind; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile SingularAttribute isEnd; @@ -65,6 +70,7 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; @@ -87,7 +93,11 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static volatile ListAttribute featureMembership; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile CollectionAttribute ownedFeatureInverting; public static final String ARGUMENT = "argument"; @@ -99,6 +109,7 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static final String TYPE = "type"; public static final String OUTPUT = "output"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -109,6 +120,7 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static final String KIND = "kind"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String IS_END = "isEnd"; @@ -122,6 +134,7 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; @@ -144,7 +157,11 @@ public abstract class TriggerInvocationExpressionImpl_ extends org.omg.sysml.lif public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java b/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java index b6360b5f..2df80504 100644 --- a/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java @@ -17,6 +17,7 @@ public abstract class TypeFeaturingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -25,6 +26,7 @@ public abstract class TypeFeaturingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static volatile ListAttribute documentation; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -33,6 +35,7 @@ public abstract class TypeFeaturingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -41,6 +44,7 @@ public abstract class TypeFeaturingImpl_ extends org.omg.sysml.lifecycle.impl.Da public static final String DOCUMENTATION = "documentation"; public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/TypeImpl_.java b/generated/org/omg/sysml/metamodel/impl/TypeImpl_.java index 36ee382b..346532a2 100644 --- a/generated/org/omg/sysml/metamodel/impl/TypeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TypeImpl_.java @@ -7,16 +7,20 @@ import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.StaticMetamodel; import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; import org.omg.sysml.metamodel.Feature; import org.omg.sysml.metamodel.FeatureMembership; import org.omg.sysml.metamodel.Import; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.Membership; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.Specialization; import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(TypeImpl.class) @@ -25,6 +29,7 @@ public abstract class TypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute output; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -33,6 +38,7 @@ public abstract class TypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile ListAttribute ownedFeatureMembership; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute effectiveName; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; @@ -45,20 +51,26 @@ public abstract class TypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute featureMembership; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; public static volatile ListAttribute input; + public static volatile ListAttribute differencingType; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedSpecialization; public static volatile SingularAttribute shortName; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String IS_CONJUGATED = "isConjugated"; public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String OUTPUT = "output"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -67,6 +79,7 @@ public abstract class TypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String EFFECTIVE_NAME = "effectiveName"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; @@ -79,14 +92,19 @@ public abstract class TypeImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; public static final String INPUT = "input"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NAME = "name"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String SHORT_NAME = "shortName"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/UnioningImpl_.java b/generated/org/omg/sysml/metamodel/impl/UnioningImpl_.java new file mode 100644 index 00000000..5da88475 --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/UnioningImpl_.java @@ -0,0 +1,55 @@ +package org.omg.sysml.metamodel.impl; + +import java.util.UUID; +import javax.annotation.processing.Generated; +import javax.persistence.metamodel.ListAttribute; +import javax.persistence.metamodel.SingularAttribute; +import javax.persistence.metamodel.StaticMetamodel; +import org.omg.sysml.metamodel.Annotation; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.TextualRepresentation; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(UnioningImpl.class) +public abstract class UnioningImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { + + public static volatile SingularAttribute elementId; + public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; + public static volatile ListAttribute ownedAnnotation; + public static volatile ListAttribute ownedElement; + public static volatile ListAttribute aliasIds; + public static volatile ListAttribute ownedRelationship; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute documentation; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile ListAttribute target; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile SingularAttribute shortName; + public static volatile SingularAttribute effectiveName; + + public static final String ELEMENT_ID = "elementId"; + public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String ALIAS_IDS = "aliasIds"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String DOCUMENTATION = "documentation"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String TARGET = "target"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String SHORT_NAME = "shortName"; + public static final String EFFECTIVE_NAME = "effectiveName"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java index 0b0a856c..6e14ac33 100644 --- a/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java @@ -17,6 +17,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -30,8 +31,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -47,6 +50,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -76,6 +80,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; public static volatile ListAttribute nestedState; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute isOrdered; public static volatile CollectionAttribute ownedRedefinition; public static volatile SingularAttribute elementId; @@ -88,6 +93,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; @@ -109,6 +115,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile ListAttribute nestedAllocation; public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; public static volatile ListAttribute ownedFeatureChaining; @@ -135,11 +142,16 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; public static volatile ListAttribute nestedRendering; + public static volatile ListAttribute ownedUnioning; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; @@ -161,6 +173,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; public static final String NESTED_STATE = "nestedState"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String IS_ORDERED = "isOrdered"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String ELEMENT_ID = "elementId"; @@ -173,6 +186,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; @@ -194,6 +208,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String NESTED_ALLOCATION = "nestedAllocation"; public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; @@ -220,11 +235,16 @@ public abstract class UsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; public static final String NESTED_RENDERING = "nestedRendering"; + public static final String OWNED_UNIONING = "ownedUnioning"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; diff --git a/generated/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl_.java index cc1477b0..14a18f7a 100644 --- a/generated/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/UseCaseDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -65,10 +70,12 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -76,6 +83,7 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -98,6 +106,7 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -120,11 +129,15 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String CALCULATION = "calculation"; @@ -140,10 +153,12 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -151,6 +166,7 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -173,6 +189,7 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -195,11 +212,15 @@ public abstract class UseCaseDefinitionImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/UseCaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/UseCaseUsageImpl_.java index 4339f2eb..99bce18a 100644 --- a/generated/org/omg/sysml/metamodel/impl/UseCaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/UseCaseUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,193 +65,209 @@ @StaticMetamodel(UseCaseUsageImpl.class) public abstract class UseCaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; - public static volatile ListAttribute includedUseCase; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; public static volatile ListAttribute output; public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute actorParameter; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile ListAttribute includedUseCase; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; - public static final String INCLUDED_USE_CASE = "includedUseCase"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; public static final String OUTPUT = "output"; public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String ACTOR_PARAMETER = "actorParameter"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String INCLUDED_USE_CASE = "includedUseCase"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/VariantMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/VariantMembershipImpl_.java index 27593f1f..a2e00d5a 100644 --- a/generated/org/omg/sysml/metamodel/impl/VariantMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/VariantMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class VariantMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class VariantMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class VariantMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class VariantMembershipImpl_ extends org.omg.sysml.lifecycle.imp public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java index 18d26c61..58a7b0ae 100644 --- a/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,10 +69,12 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile CollectionAttribute variant; public static volatile ListAttribute action; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -75,6 +82,7 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -98,6 +106,7 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static volatile ListAttribute verifiedRequirement; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -120,11 +129,15 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String CALCULATION = "calculation"; @@ -139,10 +152,12 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VARIANT = "variant"; public static final String ACTION = "action"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -150,6 +165,7 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -173,6 +189,7 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static final String VERIFIED_REQUIREMENT = "verifiedRequirement"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -195,11 +212,15 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.life public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java index 52d4027a..fd10071a 100644 --- a/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(VerificationCaseUsageImpl.class) public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,93 +74,101 @@ public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.lifecycle public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute actorParameter; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute verifiedRequirement; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile SingularAttribute isModelLevelEvaluable; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -170,84 +176,98 @@ public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.lifecycle public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String ACTOR_PARAMETER = "actorParameter"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String VERIFIED_REQUIREMENT = "verifiedRequirement"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String IS_MODEL_LEVEL_EVALUABLE = "isModelLevelEvaluable"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ViewDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewDefinitionImpl_.java index 5104798a..874353bf 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -40,6 +43,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -62,10 +67,12 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile ListAttribute view; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -73,6 +80,7 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -96,6 +104,7 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute membership; public static volatile ListAttribute viewCondition; public static volatile ListAttribute satisfiedViewpoint; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -115,10 +124,14 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -132,10 +145,12 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String VIEW = "view"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -143,6 +158,7 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -166,6 +182,7 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String MEMBERSHIP = "membership"; public static final String VIEW_CONDITION = "viewCondition"; public static final String SATISFIED_VIEWPOINT = "satisfiedViewpoint"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -185,10 +202,14 @@ public abstract class ViewDefinitionImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl_.java index 3f06a060..e6472b39 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewRenderingMembershipImpl_.java @@ -18,6 +18,7 @@ public abstract class ViewRenderingMembershipImpl_ extends org.omg.sysml.lifecyc public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; + public static volatile SingularAttribute isImplied; public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; @@ -30,6 +31,7 @@ public abstract class ViewRenderingMembershipImpl_ extends org.omg.sysml.lifecyc public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; public static volatile SingularAttribute memberElementId; + public static volatile SingularAttribute isImpliedIncluded; public static volatile ListAttribute target; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; @@ -41,6 +43,7 @@ public abstract class ViewRenderingMembershipImpl_ extends org.omg.sysml.lifecyc public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; + public static final String IS_IMPLIED = "isImplied"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; @@ -53,6 +56,7 @@ public abstract class ViewRenderingMembershipImpl_ extends org.omg.sysml.lifecyc public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; public static final String SOURCE = "source"; public static final String MEMBER_ELEMENT_ID = "memberElementId"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String TARGET = "target"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; diff --git a/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java index 70b57c09..84dfb46d 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java @@ -18,6 +18,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.Namespace; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartDefinition; @@ -53,6 +56,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,14 +68,8 @@ @StaticMetamodel(ViewUsageImpl.class) public abstract class ViewUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -80,92 +78,100 @@ public abstract class ViewUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; public static volatile ListAttribute viewCondition; - public static volatile ListAttribute satisfiedViewpoint; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute partDefinition; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; - public static volatile ListAttribute viewedElement; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile ListAttribute itemDefinition; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile ListAttribute satisfiedViewpoint; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile ListAttribute viewedElement; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute itemDefinition; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -174,83 +180,97 @@ public abstract class ViewUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataIm public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; public static final String VIEW_CONDITION = "viewCondition"; - public static final String SATISFIED_VIEWPOINT = "satisfiedViewpoint"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String PART_DEFINITION = "partDefinition"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; - public static final String VIEWED_ELEMENT = "viewedElement"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String ITEM_DEFINITION = "itemDefinition"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String SATISFIED_VIEWPOINT = "satisfiedViewpoint"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String VIEWED_ELEMENT = "viewedElement"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String ITEM_DEFINITION = "itemDefinition"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl_.java index 5d35ee6a..dc02359e 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewpointDefinitionImpl_.java @@ -16,6 +16,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -26,8 +27,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -41,6 +44,8 @@ import org.omg.sysml.metamodel.Subclassification; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; +import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -64,11 +69,13 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedRendering; public static volatile ListAttribute ownedConstraint; public static volatile ListAttribute output; + public static volatile ListAttribute ownedMetadata; public static volatile ListAttribute framedConcern; public static volatile CollectionAttribute variant; public static volatile ListAttribute ownedItem; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute ownedAnnotation; @@ -76,6 +83,7 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedFeature; public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute endFeature; public static volatile ListAttribute directedFeature; public static volatile ListAttribute ownedAllocation; @@ -101,6 +109,7 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedState; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isVariation; public static volatile ListAttribute feature; public static volatile ListAttribute inheritedMembership; @@ -124,11 +133,15 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static volatile ListAttribute ownedImport; public static volatile ListAttribute ownedRequirement; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute unioningType; public static volatile ListAttribute ownedSpecialization; public static volatile CollectionAttribute ownedConcern; public static volatile CollectionAttribute step; public static volatile ListAttribute ownedAttribute; + public static volatile ListAttribute ownedIntersecting; public static volatile ListAttribute ownedPart; public static final String DIRECTED_USAGE = "directedUsage"; @@ -143,11 +156,13 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_RENDERING = "ownedRendering"; public static final String OWNED_CONSTRAINT = "ownedConstraint"; public static final String OUTPUT = "output"; + public static final String OWNED_METADATA = "ownedMetadata"; public static final String FRAMED_CONCERN = "framedConcern"; public static final String VARIANT = "variant"; public static final String OWNED_ITEM = "ownedItem"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; @@ -155,6 +170,7 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_FEATURE = "ownedFeature"; public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String END_FEATURE = "endFeature"; public static final String DIRECTED_FEATURE = "directedFeature"; public static final String OWNED_ALLOCATION = "ownedAllocation"; @@ -180,6 +196,7 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_STATE = "ownedState"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_VARIATION = "isVariation"; public static final String FEATURE = "feature"; public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; @@ -203,11 +220,15 @@ public abstract class ViewpointDefinitionImpl_ extends org.omg.sysml.lifecycle.i public static final String OWNED_IMPORT = "ownedImport"; public static final String OWNED_REQUIREMENT = "ownedRequirement"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String UNIONING_TYPE = "unioningType"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String OWNED_CONCERN = "ownedConcern"; public static final String STEP = "step"; public static final String OWNED_ATTRIBUTE = "ownedAttribute"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; public static final String OWNED_PART = "ownedPart"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java index 7fbe4bf0..c4084912 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -74,6 +78,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute nestedConstraint; public static volatile CollectionAttribute text; public static volatile SingularAttribute isSufficient; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; public static volatile ListAttribute textualRepresentation; public static volatile ListAttribute nestedAttribute; @@ -110,8 +115,10 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; public static volatile SingularAttribute isAbstract; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; @@ -129,6 +136,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile SingularAttribute isDerived; public static volatile ListAttribute ownedAnnotation; public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; public static volatile ListAttribute nestedVerificationCase; public static volatile ListAttribute endFeature; public static volatile SingularAttribute isEnd; @@ -143,6 +151,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile CollectionAttribute ownedDisjoining; public static volatile SingularAttribute isIndividual; public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; public static volatile SingularAttribute isNonunique; public static volatile ListAttribute ownedFeatureChaining; public static volatile ListAttribute ownedTyping; @@ -158,7 +167,10 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static volatile ListAttribute ownedRelationship; public static volatile CollectionAttribute nestedConcern; public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; @@ -173,6 +185,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String NESTED_CONSTRAINT = "nestedConstraint"; public static final String TEXT = "text"; public static final String IS_SUFFICIENT = "isSufficient"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; @@ -209,8 +222,10 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; public static final String IS_ABSTRACT = "isAbstract"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; @@ -228,6 +243,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; public static final String END_FEATURE = "endFeature"; public static final String IS_END = "isEnd"; @@ -242,6 +258,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String IS_INDIVIDUAL = "isIndividual"; public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; public static final String IS_NONUNIQUE = "isNonunique"; public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String OWNED_TYPING = "ownedTyping"; @@ -257,7 +274,10 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.lifecycle.impl.D public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String NESTED_CONCERN = "nestedConcern"; public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/generated/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl_.java index b60abf76..334a848b 100644 --- a/generated/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/WhileLoopActionUsageImpl_.java @@ -19,6 +19,7 @@ import org.omg.sysml.metamodel.ConcernUsage; import org.omg.sysml.metamodel.ConnectorAsUsage; import org.omg.sysml.metamodel.ConstraintUsage; +import org.omg.sysml.metamodel.Differencing; import org.omg.sysml.metamodel.Disjoining; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; @@ -32,8 +33,10 @@ import org.omg.sysml.metamodel.FlowConnectionUsage; import org.omg.sysml.metamodel.Import; import org.omg.sysml.metamodel.InterfaceUsage; +import org.omg.sysml.metamodel.Intersecting; import org.omg.sysml.metamodel.ItemUsage; import org.omg.sysml.metamodel.Membership; +import org.omg.sysml.metamodel.MetadataUsage; import org.omg.sysml.metamodel.OccurrenceUsage; import org.omg.sysml.metamodel.PartUsage; import org.omg.sysml.metamodel.PortUsage; @@ -50,6 +53,7 @@ import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; import org.omg.sysml.metamodel.TypeFeaturing; +import org.omg.sysml.metamodel.Unioning; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.UseCaseUsage; import org.omg.sysml.metamodel.VariantMembership; @@ -61,14 +65,8 @@ @StaticMetamodel(WhileLoopActionUsageImpl.class) public abstract class WhileLoopActionUsageImpl_ extends org.omg.sysml.lifecycle.impl.DataImpl_ { - public static volatile ListAttribute directedUsage; - public static volatile ListAttribute nestedPart; - public static volatile ListAttribute chainingFeature; public static volatile ListAttribute ownedTypeFeaturing; - public static volatile SingularAttribute isConjugated; public static volatile ListAttribute usage; - public static volatile SingularAttribute isUnique; - public static volatile ListAttribute nestedUsage; public static volatile CollectionAttribute ownedSubsetting; public static volatile ListAttribute type; public static volatile ListAttribute nestedRequirement; @@ -76,90 +74,98 @@ public abstract class WhileLoopActionUsageImpl_ extends org.omg.sysml.lifecycle. public static volatile ListAttribute nestedPort; public static volatile CollectionAttribute nestedTransition; public static volatile ListAttribute nestedConstraint; - public static volatile CollectionAttribute variant; public static volatile SingularAttribute isSufficient; - public static volatile ListAttribute nestedState; - public static volatile SingularAttribute isOrdered; + public static volatile ListAttribute ownedDifferencing; public static volatile CollectionAttribute ownedRedefinition; - public static volatile SingularAttribute elementId; public static volatile ListAttribute textualRepresentation; - public static volatile SingularAttribute isDerived; public static volatile ListAttribute nestedAttribute; - public static volatile ListAttribute ownedAnnotation; public static volatile ListAttribute nestedEnumeration; public static volatile ListAttribute ownedFeature; - public static volatile SingularAttribute qualifiedName; public static volatile ListAttribute documentation; public static volatile ListAttribute nestedAnalysisCase; - public static volatile ListAttribute nestedVerificationCase; - public static volatile ListAttribute endFeature; public static volatile ListAttribute actionDefinition; public static volatile ListAttribute directedFeature; - public static volatile SingularAttribute isEnd; - public static volatile ListAttribute nestedItem; - public static volatile ListAttribute featuringType; public static volatile ListAttribute input; public static volatile ListAttribute nestedCalculation; - public static volatile SingularAttribute isComposite; public static volatile ListAttribute nestedView; - public static volatile SingularAttribute name; public static volatile SingularAttribute shortName; public static volatile ListAttribute ownedMember; public static volatile ListAttribute nestedOccurrence; - public static volatile ListAttribute ownedMembership; - public static volatile CollectionAttribute nestedFlow; - public static volatile ListAttribute nestedCase; - public static volatile CollectionAttribute ownedDisjoining; public static volatile ListAttribute nestedAllocation; - public static volatile SingularAttribute isIndividual; - public static volatile ListAttribute membership; public static volatile SingularAttribute isPortion; - public static volatile SingularAttribute isNonunique; public static volatile ListAttribute nestedReference; - public static volatile ListAttribute ownedFeatureChaining; public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute isVariation; - public static volatile ListAttribute ownedTyping; public static volatile ListAttribute feature; - public static volatile ListAttribute inheritedMembership; - public static volatile ListAttribute parameter; public static volatile ListAttribute member; - public static volatile ListAttribute occurrenceDefinition; - public static volatile ListAttribute ownedEndFeature; public static volatile SingularAttribute isReference; - public static volatile ListAttribute ownedFeatureMembership; - public static volatile ListAttribute definition; - public static volatile ListAttribute nestedUseCase; public static volatile ListAttribute inheritedFeature; public static volatile ListAttribute behavior; public static volatile SingularAttribute effectiveName; - public static volatile SingularAttribute direction; public static volatile ListAttribute importedMembership; public static volatile ListAttribute ownedElement; public static volatile ListAttribute aliasIds; - public static volatile ListAttribute nestedAction; - public static volatile ListAttribute ownedRelationship; public static volatile ListAttribute featureMembership; public static volatile SingularAttribute portionKind; - public static volatile CollectionAttribute nestedConcern; - public static volatile ListAttribute ownedImport; public static volatile SingularAttribute isAbstract; - public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute nestedMetadata; public static volatile ListAttribute nestedRendering; public static volatile ListAttribute nestedConnection; + public static volatile ListAttribute unioningType; public static volatile ListAttribute nestedInterface; public static volatile ListAttribute ownedSpecialization; public static volatile ListAttribute nestedViewpoint; public static volatile CollectionAttribute ownedFeatureInverting; + public static volatile ListAttribute directedUsage; + public static volatile ListAttribute nestedPart; + public static volatile ListAttribute chainingFeature; + public static volatile SingularAttribute isConjugated; + public static volatile SingularAttribute isUnique; + public static volatile ListAttribute nestedUsage; + public static volatile CollectionAttribute variant; + public static volatile ListAttribute nestedState; + public static volatile SingularAttribute isOrdered; + public static volatile SingularAttribute elementId; + public static volatile SingularAttribute isDerived; + public static volatile ListAttribute ownedAnnotation; + public static volatile SingularAttribute qualifiedName; + public static volatile ListAttribute intersectingType; + public static volatile ListAttribute nestedVerificationCase; + public static volatile ListAttribute endFeature; + public static volatile SingularAttribute isEnd; + public static volatile ListAttribute nestedItem; + public static volatile ListAttribute featuringType; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute name; + public static volatile ListAttribute ownedMembership; + public static volatile CollectionAttribute nestedFlow; + public static volatile ListAttribute nestedCase; + public static volatile CollectionAttribute ownedDisjoining; + public static volatile SingularAttribute isIndividual; + public static volatile ListAttribute membership; + public static volatile SingularAttribute isImpliedIncluded; + public static volatile SingularAttribute isNonunique; + public static volatile ListAttribute ownedFeatureChaining; + public static volatile ListAttribute ownedTyping; + public static volatile ListAttribute inheritedMembership; + public static volatile ListAttribute parameter; + public static volatile ListAttribute occurrenceDefinition; + public static volatile ListAttribute ownedEndFeature; + public static volatile ListAttribute ownedFeatureMembership; + public static volatile ListAttribute definition; + public static volatile ListAttribute nestedUseCase; + public static volatile SingularAttribute direction; + public static volatile ListAttribute nestedAction; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute nestedConcern; + public static volatile ListAttribute ownedImport; + public static volatile ListAttribute differencingType; + public static volatile CollectionAttribute variantMembership; + public static volatile ListAttribute ownedUnioning; + public static volatile ListAttribute ownedIntersecting; - public static final String DIRECTED_USAGE = "directedUsage"; - public static final String NESTED_PART = "nestedPart"; - public static final String CHAINING_FEATURE = "chainingFeature"; public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; - public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; - public static final String IS_UNIQUE = "isUnique"; - public static final String NESTED_USAGE = "nestedUsage"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; public static final String TYPE = "type"; public static final String NESTED_REQUIREMENT = "nestedRequirement"; @@ -167,81 +173,95 @@ public abstract class WhileLoopActionUsageImpl_ extends org.omg.sysml.lifecycle. public static final String NESTED_PORT = "nestedPort"; public static final String NESTED_TRANSITION = "nestedTransition"; public static final String NESTED_CONSTRAINT = "nestedConstraint"; - public static final String VARIANT = "variant"; public static final String IS_SUFFICIENT = "isSufficient"; - public static final String NESTED_STATE = "nestedState"; - public static final String IS_ORDERED = "isOrdered"; + public static final String OWNED_DIFFERENCING = "ownedDifferencing"; public static final String OWNED_REDEFINITION = "ownedRedefinition"; - public static final String ELEMENT_ID = "elementId"; public static final String TEXTUAL_REPRESENTATION = "textualRepresentation"; - public static final String IS_DERIVED = "isDerived"; public static final String NESTED_ATTRIBUTE = "nestedAttribute"; - public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String NESTED_ENUMERATION = "nestedEnumeration"; public static final String OWNED_FEATURE = "ownedFeature"; - public static final String QUALIFIED_NAME = "qualifiedName"; public static final String DOCUMENTATION = "documentation"; public static final String NESTED_ANALYSIS_CASE = "nestedAnalysisCase"; - public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; - public static final String END_FEATURE = "endFeature"; public static final String ACTION_DEFINITION = "actionDefinition"; public static final String DIRECTED_FEATURE = "directedFeature"; - public static final String IS_END = "isEnd"; - public static final String NESTED_ITEM = "nestedItem"; - public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String NESTED_CALCULATION = "nestedCalculation"; - public static final String IS_COMPOSITE = "isComposite"; public static final String NESTED_VIEW = "nestedView"; - public static final String NAME = "name"; public static final String SHORT_NAME = "shortName"; public static final String OWNED_MEMBER = "ownedMember"; public static final String NESTED_OCCURRENCE = "nestedOccurrence"; - public static final String OWNED_MEMBERSHIP = "ownedMembership"; - public static final String NESTED_FLOW = "nestedFlow"; - public static final String NESTED_CASE = "nestedCase"; - public static final String OWNED_DISJOINING = "ownedDisjoining"; public static final String NESTED_ALLOCATION = "nestedAllocation"; - public static final String IS_INDIVIDUAL = "isIndividual"; - public static final String MEMBERSHIP = "membership"; public static final String IS_PORTION = "isPortion"; - public static final String IS_NONUNIQUE = "isNonunique"; public static final String NESTED_REFERENCE = "nestedReference"; - public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; public static final String IS_READ_ONLY = "isReadOnly"; public static final String IS_VARIATION = "isVariation"; - public static final String OWNED_TYPING = "ownedTyping"; public static final String FEATURE = "feature"; - public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; - public static final String PARAMETER = "parameter"; public static final String MEMBER = "member"; - public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; - public static final String OWNED_END_FEATURE = "ownedEndFeature"; public static final String IS_REFERENCE = "isReference"; - public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; - public static final String DEFINITION = "definition"; - public static final String NESTED_USE_CASE = "nestedUseCase"; public static final String INHERITED_FEATURE = "inheritedFeature"; public static final String BEHAVIOR = "behavior"; public static final String EFFECTIVE_NAME = "effectiveName"; - public static final String DIRECTION = "direction"; public static final String IMPORTED_MEMBERSHIP = "importedMembership"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String ALIAS_IDS = "aliasIds"; - public static final String NESTED_ACTION = "nestedAction"; - public static final String OWNED_RELATIONSHIP = "ownedRelationship"; public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String PORTION_KIND = "portionKind"; - public static final String NESTED_CONCERN = "nestedConcern"; - public static final String OWNED_IMPORT = "ownedImport"; public static final String IS_ABSTRACT = "isAbstract"; - public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String NESTED_METADATA = "nestedMetadata"; public static final String NESTED_RENDERING = "nestedRendering"; public static final String NESTED_CONNECTION = "nestedConnection"; + public static final String UNIONING_TYPE = "unioningType"; public static final String NESTED_INTERFACE = "nestedInterface"; public static final String OWNED_SPECIALIZATION = "ownedSpecialization"; public static final String NESTED_VIEWPOINT = "nestedViewpoint"; public static final String OWNED_FEATURE_INVERTING = "ownedFeatureInverting"; + public static final String DIRECTED_USAGE = "directedUsage"; + public static final String NESTED_PART = "nestedPart"; + public static final String CHAINING_FEATURE = "chainingFeature"; + public static final String IS_CONJUGATED = "isConjugated"; + public static final String IS_UNIQUE = "isUnique"; + public static final String NESTED_USAGE = "nestedUsage"; + public static final String VARIANT = "variant"; + public static final String NESTED_STATE = "nestedState"; + public static final String IS_ORDERED = "isOrdered"; + public static final String ELEMENT_ID = "elementId"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String QUALIFIED_NAME = "qualifiedName"; + public static final String INTERSECTING_TYPE = "intersectingType"; + public static final String NESTED_VERIFICATION_CASE = "nestedVerificationCase"; + public static final String END_FEATURE = "endFeature"; + public static final String IS_END = "isEnd"; + public static final String NESTED_ITEM = "nestedItem"; + public static final String FEATURING_TYPE = "featuringType"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String NAME = "name"; + public static final String OWNED_MEMBERSHIP = "ownedMembership"; + public static final String NESTED_FLOW = "nestedFlow"; + public static final String NESTED_CASE = "nestedCase"; + public static final String OWNED_DISJOINING = "ownedDisjoining"; + public static final String IS_INDIVIDUAL = "isIndividual"; + public static final String MEMBERSHIP = "membership"; + public static final String IS_IMPLIED_INCLUDED = "isImpliedIncluded"; + public static final String IS_NONUNIQUE = "isNonunique"; + public static final String OWNED_FEATURE_CHAINING = "ownedFeatureChaining"; + public static final String OWNED_TYPING = "ownedTyping"; + public static final String INHERITED_MEMBERSHIP = "inheritedMembership"; + public static final String PARAMETER = "parameter"; + public static final String OCCURRENCE_DEFINITION = "occurrenceDefinition"; + public static final String OWNED_END_FEATURE = "ownedEndFeature"; + public static final String OWNED_FEATURE_MEMBERSHIP = "ownedFeatureMembership"; + public static final String DEFINITION = "definition"; + public static final String NESTED_USE_CASE = "nestedUseCase"; + public static final String DIRECTION = "direction"; + public static final String NESTED_ACTION = "nestedAction"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String NESTED_CONCERN = "nestedConcern"; + public static final String OWNED_IMPORT = "ownedImport"; + public static final String DIFFERENCING_TYPE = "differencingType"; + public static final String VARIANT_MEMBERSHIP = "variantMembership"; + public static final String OWNED_UNIONING = "ownedUnioning"; + public static final String OWNED_INTERSECTING = "ownedIntersecting"; } diff --git a/public/jsonld/metamodel/AcceptActionUsage.jsonld b/public/jsonld/metamodel/AcceptActionUsage.jsonld index 06e5e168..d1680d40 100644 --- a/public/jsonld/metamodel/AcceptActionUsage.jsonld +++ b/public/jsonld/metamodel/AcceptActionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -108,6 +116,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ActionDefinition.jsonld b/public/jsonld/metamodel/ActionDefinition.jsonld index d7bfa0b2..d7c140f7 100644 --- a/public/jsonld/metamodel/ActionDefinition.jsonld +++ b/public/jsonld/metamodel/ActionDefinition.jsonld @@ -7,6 +7,7 @@ "action": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -19,8 +20,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -41,6 +44,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,9 +54,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -64,6 +70,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -78,6 +85,7 @@ "shortName": {"@type": "xsd:string"}, "step": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ActionUsage.jsonld b/public/jsonld/metamodel/ActionUsage.jsonld index 5bf1cb91..89d1f5c8 100644 --- a/public/jsonld/metamodel/ActionUsage.jsonld +++ b/public/jsonld/metamodel/ActionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ActorMembership.jsonld b/public/jsonld/metamodel/ActorMembership.jsonld index 3cae8e47..87d448c8 100644 --- a/public/jsonld/metamodel/ActorMembership.jsonld +++ b/public/jsonld/metamodel/ActorMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -29,7 +30,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -41,6 +41,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/AllocationDefinition.jsonld b/public/jsonld/metamodel/AllocationDefinition.jsonld index 98672d9d..fe85a04e 100644 --- a/public/jsonld/metamodel/AllocationDefinition.jsonld +++ b/public/jsonld/metamodel/AllocationDefinition.jsonld @@ -9,6 +9,7 @@ "allocation": {"@type": "@id"}, "associationEnd": {"@type": "@id"}, "connectionEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -21,8 +22,11 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -43,6 +47,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -52,9 +57,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -67,6 +74,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -86,6 +94,7 @@ "target": {"@type": "@id"}, "targetType": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/AllocationUsage.jsonld b/public/jsonld/metamodel/AllocationUsage.jsonld index ebf97fb6..af25c233 100644 --- a/public/jsonld/metamodel/AllocationUsage.jsonld +++ b/public/jsonld/metamodel/AllocationUsage.jsonld @@ -12,6 +12,7 @@ "connectionDefinition": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -28,12 +29,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -61,6 +65,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -78,6 +83,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -86,15 +92,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -117,6 +126,7 @@ "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/AnalysisCaseDefinition.jsonld b/public/jsonld/metamodel/AnalysisCaseDefinition.jsonld index e4e55775..dd137f09 100644 --- a/public/jsonld/metamodel/AnalysisCaseDefinition.jsonld +++ b/public/jsonld/metamodel/AnalysisCaseDefinition.jsonld @@ -10,6 +10,7 @@ "aliasIds": {"@type": "xsd:string"}, "analysisAction": {"@type": "@id"}, "calculation": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -23,8 +24,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -47,6 +50,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -56,9 +60,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -70,6 +76,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -87,6 +94,7 @@ "step": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/AnalysisCaseUsage.jsonld b/public/jsonld/metamodel/AnalysisCaseUsage.jsonld index ca84899c..8d47d3ba 100644 --- a/public/jsonld/metamodel/AnalysisCaseUsage.jsonld +++ b/public/jsonld/metamodel/AnalysisCaseUsage.jsonld @@ -15,6 +15,7 @@ "caseDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -32,11 +33,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -64,6 +67,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -82,6 +86,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -90,14 +95,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -116,6 +124,7 @@ "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/AnnotatingElement.jsonld b/public/jsonld/metamodel/AnnotatingElement.jsonld index 2860dddc..97ffa94d 100644 --- a/public/jsonld/metamodel/AnnotatingElement.jsonld +++ b/public/jsonld/metamodel/AnnotatingElement.jsonld @@ -11,6 +11,7 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Annotation.jsonld b/public/jsonld/metamodel/Annotation.jsonld index a4015719..9c9abe6c 100644 --- a/public/jsonld/metamodel/Annotation.jsonld +++ b/public/jsonld/metamodel/Annotation.jsonld @@ -11,6 +11,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/AssertConstraintUsage.jsonld b/public/jsonld/metamodel/AssertConstraintUsage.jsonld index ea070423..e4fcc6ae 100644 --- a/public/jsonld/metamodel/AssertConstraintUsage.jsonld +++ b/public/jsonld/metamodel/AssertConstraintUsage.jsonld @@ -11,6 +11,7 @@ "chainingFeature": {"@type": "@id"}, "constraintDefinition": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -28,11 +29,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNegated": {"@type": "xsd:boolean"}, @@ -61,6 +64,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -78,6 +82,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -86,14 +91,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -111,6 +119,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/AssignmentActionUsage.jsonld b/public/jsonld/metamodel/AssignmentActionUsage.jsonld index e3d9881b..cecae5f5 100644 --- a/public/jsonld/metamodel/AssignmentActionUsage.jsonld +++ b/public/jsonld/metamodel/AssignmentActionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -107,6 +115,7 @@ "targetArgument": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "valueExpression": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Association.jsonld b/public/jsonld/metamodel/Association.jsonld index effdf909..96e6d1a8 100644 --- a/public/jsonld/metamodel/Association.jsonld +++ b/public/jsonld/metamodel/Association.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "associationEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -18,8 +19,11 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -28,18 +32,21 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, @@ -53,7 +60,8 @@ "sourceType": {"@type": "@id"}, "target": {"@type": "@id"}, "targetType": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/AssociationStructure.jsonld b/public/jsonld/metamodel/AssociationStructure.jsonld index effdf909..96e6d1a8 100644 --- a/public/jsonld/metamodel/AssociationStructure.jsonld +++ b/public/jsonld/metamodel/AssociationStructure.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "associationEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -18,8 +19,11 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -28,18 +32,21 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, @@ -53,7 +60,8 @@ "sourceType": {"@type": "@id"}, "target": {"@type": "@id"}, "targetType": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/AttributeDefinition.jsonld b/public/jsonld/metamodel/AttributeDefinition.jsonld index 288fbc63..f5460d9b 100644 --- a/public/jsonld/metamodel/AttributeDefinition.jsonld +++ b/public/jsonld/metamodel/AttributeDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, @@ -38,6 +41,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,9 +51,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -61,6 +67,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -73,6 +80,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/AttributeUsage.jsonld b/public/jsonld/metamodel/AttributeUsage.jsonld index 41982a01..eaa8bf9a 100644 --- a/public/jsonld/metamodel/AttributeUsage.jsonld +++ b/public/jsonld/metamodel/AttributeUsage.jsonld @@ -9,6 +9,7 @@ "attributeDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -54,6 +57,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -70,6 +74,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -78,14 +83,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -98,6 +106,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Behavior.jsonld b/public/jsonld/metamodel/Behavior.jsonld index 8499fadb..a36b7168 100644 --- a/public/jsonld/metamodel/Behavior.jsonld +++ b/public/jsonld/metamodel/Behavior.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,17 +30,20 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, @@ -46,7 +52,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "step": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/BindingConnector.jsonld b/public/jsonld/metamodel/BindingConnector.jsonld index adba775c..17d167c2 100644 --- a/public/jsonld/metamodel/BindingConnector.jsonld +++ b/public/jsonld/metamodel/BindingConnector.jsonld @@ -9,6 +9,7 @@ "association": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,12 +24,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -42,6 +46,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,15 +55,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -75,7 +83,8 @@ "target": {"@type": "@id"}, "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/BindingConnectorAsUsage.jsonld b/public/jsonld/metamodel/BindingConnectorAsUsage.jsonld index 19a883c5..1935cb4f 100644 --- a/public/jsonld/metamodel/BindingConnectorAsUsage.jsonld +++ b/public/jsonld/metamodel/BindingConnectorAsUsage.jsonld @@ -10,6 +10,7 @@ "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -25,12 +26,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -56,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -72,6 +77,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -80,15 +86,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -108,6 +117,7 @@ "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/BooleanExpression.jsonld b/public/jsonld/metamodel/BooleanExpression.jsonld index 60d8a039..626e11a8 100644 --- a/public/jsonld/metamodel/BooleanExpression.jsonld +++ b/public/jsonld/metamodel/BooleanExpression.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,7 +77,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/CalculationDefinition.jsonld b/public/jsonld/metamodel/CalculationDefinition.jsonld index 4fc2daa5..16db2da0 100644 --- a/public/jsonld/metamodel/CalculationDefinition.jsonld +++ b/public/jsonld/metamodel/CalculationDefinition.jsonld @@ -8,6 +8,7 @@ "action": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "calculation": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -21,8 +22,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -44,6 +47,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -53,9 +57,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -67,6 +73,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -82,6 +89,7 @@ "shortName": {"@type": "xsd:string"}, "step": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/CalculationUsage.jsonld b/public/jsonld/metamodel/CalculationUsage.jsonld index 8712ff32..135f83f2 100644 --- a/public/jsonld/metamodel/CalculationUsage.jsonld +++ b/public/jsonld/metamodel/CalculationUsage.jsonld @@ -11,6 +11,7 @@ "calculationDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -28,11 +29,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -60,6 +63,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -77,6 +81,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -85,14 +90,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -109,6 +117,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/CaseDefinition.jsonld b/public/jsonld/metamodel/CaseDefinition.jsonld index 972f451a..8a915570 100644 --- a/public/jsonld/metamodel/CaseDefinition.jsonld +++ b/public/jsonld/metamodel/CaseDefinition.jsonld @@ -9,6 +9,7 @@ "actorParameter": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "calculation": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -22,8 +23,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -46,6 +49,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -55,9 +59,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -69,6 +75,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -85,6 +92,7 @@ "step": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/CaseUsage.jsonld b/public/jsonld/metamodel/CaseUsage.jsonld index 10d65a70..1534a1fb 100644 --- a/public/jsonld/metamodel/CaseUsage.jsonld +++ b/public/jsonld/metamodel/CaseUsage.jsonld @@ -13,6 +13,7 @@ "caseDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -30,11 +31,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -62,6 +65,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -80,6 +84,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -88,14 +93,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -113,6 +121,7 @@ "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Class.jsonld b/public/jsonld/metamodel/Class.jsonld index 15b23fce..ffdbd6ac 100644 --- a/public/jsonld/metamodel/Class.jsonld +++ b/public/jsonld/metamodel/Class.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,24 +30,28 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Classifier.jsonld b/public/jsonld/metamodel/Classifier.jsonld index 15b23fce..ffdbd6ac 100644 --- a/public/jsonld/metamodel/Classifier.jsonld +++ b/public/jsonld/metamodel/Classifier.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,24 +30,28 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/CollectExpression.jsonld b/public/jsonld/metamodel/CollectExpression.jsonld index e5b41a25..05639fff 100644 --- a/public/jsonld/metamodel/CollectExpression.jsonld +++ b/public/jsonld/metamodel/CollectExpression.jsonld @@ -9,6 +9,7 @@ "argument": {"@type": "@id"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -53,14 +57,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -72,7 +79,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Comment.jsonld b/public/jsonld/metamodel/Comment.jsonld index fadd6cf0..7a277f31 100644 --- a/public/jsonld/metamodel/Comment.jsonld +++ b/public/jsonld/metamodel/Comment.jsonld @@ -12,6 +12,7 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "locale": {"@type": "xsd:string"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ConcernDefinition.jsonld b/public/jsonld/metamodel/ConcernDefinition.jsonld index d8ea0ff7..75a00437 100644 --- a/public/jsonld/metamodel/ConcernDefinition.jsonld +++ b/public/jsonld/metamodel/ConcernDefinition.jsonld @@ -8,6 +8,7 @@ "actorParameter": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "assumedConstraint": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -22,8 +23,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -54,9 +58,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -68,6 +74,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -88,6 +95,7 @@ "subjectParameter": {"@type": "@id"}, "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ConcernUsage.jsonld b/public/jsonld/metamodel/ConcernUsage.jsonld index 0dd71f75..5971449f 100644 --- a/public/jsonld/metamodel/ConcernUsage.jsonld +++ b/public/jsonld/metamodel/ConcernUsage.jsonld @@ -13,6 +13,7 @@ "concernDefinition": {"@type": "@id"}, "constraintDefinition": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -31,11 +32,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -63,6 +66,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -80,6 +84,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -88,14 +93,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -119,6 +127,7 @@ "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ConjugatedPortDefinition.jsonld b/public/jsonld/metamodel/ConjugatedPortDefinition.jsonld index 9c413172..c5ffa428 100644 --- a/public/jsonld/metamodel/ConjugatedPortDefinition.jsonld +++ b/public/jsonld/metamodel/ConjugatedPortDefinition.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "conjugatedPortDefinition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -19,8 +20,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -51,9 +55,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -66,6 +72,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -78,6 +85,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ConjugatedPortTyping.jsonld b/public/jsonld/metamodel/ConjugatedPortTyping.jsonld index a8ce59d4..53d58c73 100644 --- a/public/jsonld/metamodel/ConjugatedPortTyping.jsonld +++ b/public/jsonld/metamodel/ConjugatedPortTyping.jsonld @@ -11,6 +11,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Conjugation.jsonld b/public/jsonld/metamodel/Conjugation.jsonld index 125e3153..ea56752e 100644 --- a/public/jsonld/metamodel/Conjugation.jsonld +++ b/public/jsonld/metamodel/Conjugation.jsonld @@ -10,6 +10,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "originalType": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ConnectionDefinition.jsonld b/public/jsonld/metamodel/ConnectionDefinition.jsonld index 9bd8ac84..ebd7771e 100644 --- a/public/jsonld/metamodel/ConnectionDefinition.jsonld +++ b/public/jsonld/metamodel/ConnectionDefinition.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "associationEnd": {"@type": "@id"}, "connectionEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -20,8 +21,11 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -42,6 +46,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -51,9 +56,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -66,6 +73,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -85,6 +93,7 @@ "target": {"@type": "@id"}, "targetType": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ConnectionUsage.jsonld b/public/jsonld/metamodel/ConnectionUsage.jsonld index ea23dfa8..aa9d7e9d 100644 --- a/public/jsonld/metamodel/ConnectionUsage.jsonld +++ b/public/jsonld/metamodel/ConnectionUsage.jsonld @@ -11,6 +11,7 @@ "connectionDefinition": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,12 +28,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -60,6 +64,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -77,6 +82,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -85,15 +91,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -116,6 +125,7 @@ "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Connector.jsonld b/public/jsonld/metamodel/Connector.jsonld index adba775c..17d167c2 100644 --- a/public/jsonld/metamodel/Connector.jsonld +++ b/public/jsonld/metamodel/Connector.jsonld @@ -9,6 +9,7 @@ "association": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,12 +24,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -42,6 +46,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,15 +55,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -75,7 +83,8 @@ "target": {"@type": "@id"}, "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ConnectorAsUsage.jsonld b/public/jsonld/metamodel/ConnectorAsUsage.jsonld index 19a883c5..1935cb4f 100644 --- a/public/jsonld/metamodel/ConnectorAsUsage.jsonld +++ b/public/jsonld/metamodel/ConnectorAsUsage.jsonld @@ -10,6 +10,7 @@ "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -25,12 +26,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -56,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -72,6 +77,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -80,15 +86,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -108,6 +117,7 @@ "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ConstraintDefinition.jsonld b/public/jsonld/metamodel/ConstraintDefinition.jsonld index e4e3636f..361716a5 100644 --- a/public/jsonld/metamodel/ConstraintDefinition.jsonld +++ b/public/jsonld/metamodel/ConstraintDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -19,8 +20,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -51,9 +55,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -65,6 +71,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -80,6 +87,7 @@ "shortName": {"@type": "xsd:string"}, "step": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ConstraintUsage.jsonld b/public/jsonld/metamodel/ConstraintUsage.jsonld index 15ec9f8c..32a1959e 100644 --- a/public/jsonld/metamodel/ConstraintUsage.jsonld +++ b/public/jsonld/metamodel/ConstraintUsage.jsonld @@ -10,6 +10,7 @@ "chainingFeature": {"@type": "@id"}, "constraintDefinition": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,11 +28,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -59,6 +62,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -76,6 +80,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -84,14 +89,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -109,6 +117,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ControlNode.jsonld b/public/jsonld/metamodel/ControlNode.jsonld index 5bf1cb91..89d1f5c8 100644 --- a/public/jsonld/metamodel/ControlNode.jsonld +++ b/public/jsonld/metamodel/ControlNode.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/DataType.jsonld b/public/jsonld/metamodel/DataType.jsonld index 15b23fce..ffdbd6ac 100644 --- a/public/jsonld/metamodel/DataType.jsonld +++ b/public/jsonld/metamodel/DataType.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,24 +30,28 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/DecisionNode.jsonld b/public/jsonld/metamodel/DecisionNode.jsonld index 5bf1cb91..89d1f5c8 100644 --- a/public/jsonld/metamodel/DecisionNode.jsonld +++ b/public/jsonld/metamodel/DecisionNode.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Definition.jsonld b/public/jsonld/metamodel/Definition.jsonld index 288fbc63..f5460d9b 100644 --- a/public/jsonld/metamodel/Definition.jsonld +++ b/public/jsonld/metamodel/Definition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, @@ -38,6 +41,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,9 +51,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -61,6 +67,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -73,6 +80,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Dependency.jsonld b/public/jsonld/metamodel/Dependency.jsonld index 48f84915..1794cb5e 100644 --- a/public/jsonld/metamodel/Dependency.jsonld +++ b/public/jsonld/metamodel/Dependency.jsonld @@ -10,6 +10,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Differencing.jsonld b/public/jsonld/metamodel/Differencing.jsonld new file mode 100644 index 00000000..14c4aa9e --- /dev/null +++ b/public/jsonld/metamodel/Differencing.jsonld @@ -0,0 +1,34 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml/v2/metamodel#", + "sysml": "http://omg.org/ns/sysml/v2/metamodel#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, + "documentation": {"@type": "@id"}, + "effectiveName": {"@type": "xsd:string"}, + "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, + "name": {"@type": "xsd:string"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "qualifiedName": {"@type": "xsd:string"}, + "relatedElement": {"@type": "@id"}, + "shortName": {"@type": "xsd:string"}, + "source": {"@type": "@id"}, + "target": {"@type": "@id"}, + "textualRepresentation": {"@type": "@id"}, + "typeDifferenced": {"@type": "@id"} + + } +} \ No newline at end of file diff --git a/public/jsonld/metamodel/Disjoining.jsonld b/public/jsonld/metamodel/Disjoining.jsonld index 668f18fc..2a9bc40e 100644 --- a/public/jsonld/metamodel/Disjoining.jsonld +++ b/public/jsonld/metamodel/Disjoining.jsonld @@ -10,6 +10,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Documentation.jsonld b/public/jsonld/metamodel/Documentation.jsonld index c805facf..b4390cb0 100644 --- a/public/jsonld/metamodel/Documentation.jsonld +++ b/public/jsonld/metamodel/Documentation.jsonld @@ -13,6 +13,7 @@ "documentedElement": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "locale": {"@type": "xsd:string"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Element.jsonld b/public/jsonld/metamodel/Element.jsonld index f1cb7297..8279d2b4 100644 --- a/public/jsonld/metamodel/Element.jsonld +++ b/public/jsonld/metamodel/Element.jsonld @@ -9,6 +9,7 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ElementFilterMembership.jsonld b/public/jsonld/metamodel/ElementFilterMembership.jsonld index 51214c24..375ea7b1 100644 --- a/public/jsonld/metamodel/ElementFilterMembership.jsonld +++ b/public/jsonld/metamodel/ElementFilterMembership.jsonld @@ -10,6 +10,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/EndFeatureMembership.jsonld b/public/jsonld/metamodel/EndFeatureMembership.jsonld index 33d6e9c3..d110b7d0 100644 --- a/public/jsonld/metamodel/EndFeatureMembership.jsonld +++ b/public/jsonld/metamodel/EndFeatureMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -27,7 +28,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -39,6 +39,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/EnumerationDefinition.jsonld b/public/jsonld/metamodel/EnumerationDefinition.jsonld index cd491efd..32a94929 100644 --- a/public/jsonld/metamodel/EnumerationDefinition.jsonld +++ b/public/jsonld/metamodel/EnumerationDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -19,8 +20,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, @@ -39,6 +42,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -48,9 +52,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -62,6 +68,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -74,6 +81,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/EnumerationUsage.jsonld b/public/jsonld/metamodel/EnumerationUsage.jsonld index 743c44ed..aa5391b3 100644 --- a/public/jsonld/metamodel/EnumerationUsage.jsonld +++ b/public/jsonld/metamodel/EnumerationUsage.jsonld @@ -9,6 +9,7 @@ "attributeDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -25,11 +26,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -55,6 +58,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -71,6 +75,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -79,14 +84,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -99,6 +107,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/EventOccurrenceUsage.jsonld b/public/jsonld/metamodel/EventOccurrenceUsage.jsonld index 8e826219..ff18833e 100644 --- a/public/jsonld/metamodel/EventOccurrenceUsage.jsonld +++ b/public/jsonld/metamodel/EventOccurrenceUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -25,11 +26,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -56,6 +59,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -73,6 +77,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -81,14 +86,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -103,6 +111,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ExhibitStateUsage.jsonld b/public/jsonld/metamodel/ExhibitStateUsage.jsonld index 8105dba7..b7e1082c 100644 --- a/public/jsonld/metamodel/ExhibitStateUsage.jsonld +++ b/public/jsonld/metamodel/ExhibitStateUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -31,11 +32,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -63,6 +66,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -80,6 +84,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -88,14 +93,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -113,6 +121,7 @@ "stateDefinition": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Expose.jsonld b/public/jsonld/metamodel/Expose.jsonld index ed64220f..6d630973 100644 --- a/public/jsonld/metamodel/Expose.jsonld +++ b/public/jsonld/metamodel/Expose.jsonld @@ -12,6 +12,8 @@ "importOwningNamespace": {"@type": "@id"}, "importedMemberName": {"@type": "xsd:string"}, "importedNamespace": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isImportAll": {"@type": "xsd:boolean"}, "isRecursive": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/Expression.jsonld b/public/jsonld/metamodel/Expression.jsonld index 84709d6e..f59a8ec0 100644 --- a/public/jsonld/metamodel/Expression.jsonld +++ b/public/jsonld/metamodel/Expression.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -69,7 +76,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Feature.jsonld b/public/jsonld/metamodel/Feature.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/Feature.jsonld +++ b/public/jsonld/metamodel/Feature.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/FeatureChainExpression.jsonld b/public/jsonld/metamodel/FeatureChainExpression.jsonld index 1fc99ed1..be489729 100644 --- a/public/jsonld/metamodel/FeatureChainExpression.jsonld +++ b/public/jsonld/metamodel/FeatureChainExpression.jsonld @@ -9,6 +9,7 @@ "argument": {"@type": "@id"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -53,14 +57,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -73,7 +80,8 @@ "shortName": {"@type": "xsd:string"}, "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/FeatureChaining.jsonld b/public/jsonld/metamodel/FeatureChaining.jsonld index 515a3945..00a03203 100644 --- a/public/jsonld/metamodel/FeatureChaining.jsonld +++ b/public/jsonld/metamodel/FeatureChaining.jsonld @@ -11,6 +11,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "featureChained": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/FeatureInverting.jsonld b/public/jsonld/metamodel/FeatureInverting.jsonld index 73312929..c26c6d86 100644 --- a/public/jsonld/metamodel/FeatureInverting.jsonld +++ b/public/jsonld/metamodel/FeatureInverting.jsonld @@ -11,6 +11,8 @@ "elementId": {"@type": "dcterms:identifier"}, "featureInverted": {"@type": "@id"}, "invertingFeature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/FeatureMembership.jsonld b/public/jsonld/metamodel/FeatureMembership.jsonld index 33d6e9c3..d110b7d0 100644 --- a/public/jsonld/metamodel/FeatureMembership.jsonld +++ b/public/jsonld/metamodel/FeatureMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -27,7 +28,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -39,6 +39,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/FeatureReferenceExpression.jsonld b/public/jsonld/metamodel/FeatureReferenceExpression.jsonld index 0054ff00..a1d37a1f 100644 --- a/public/jsonld/metamodel/FeatureReferenceExpression.jsonld +++ b/public/jsonld/metamodel/FeatureReferenceExpression.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,7 +77,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/FeatureTyping.jsonld b/public/jsonld/metamodel/FeatureTyping.jsonld index 34a79069..e22b3eb3 100644 --- a/public/jsonld/metamodel/FeatureTyping.jsonld +++ b/public/jsonld/metamodel/FeatureTyping.jsonld @@ -10,6 +10,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/FeatureValue.jsonld b/public/jsonld/metamodel/FeatureValue.jsonld index 8f51d489..5fdadfc4 100644 --- a/public/jsonld/metamodel/FeatureValue.jsonld +++ b/public/jsonld/metamodel/FeatureValue.jsonld @@ -11,6 +11,8 @@ "elementId": {"@type": "dcterms:identifier"}, "featureWithValue": {"@type": "@id"}, "isDefault": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isInitial": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/PrefixComment.jsonld b/public/jsonld/metamodel/Featuring.jsonld similarity index 66% rename from public/jsonld/metamodel/PrefixComment.jsonld rename to public/jsonld/metamodel/Featuring.jsonld index fadd6cf0..ba0d9db4 100644 --- a/public/jsonld/metamodel/PrefixComment.jsonld +++ b/public/jsonld/metamodel/Featuring.jsonld @@ -6,24 +6,29 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, - "annotatedElement": {"@type": "@id"}, - "annotation": {"@type": "@id"}, - "body": {"@type": "xsd:string"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "locale": {"@type": "xsd:string"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, + "relatedElement": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "source": {"@type": "@id"}, + "target": {"@type": "@id"}, + "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/FlowConnectionDefinition.jsonld b/public/jsonld/metamodel/FlowConnectionDefinition.jsonld new file mode 100644 index 00000000..e4464c39 --- /dev/null +++ b/public/jsonld/metamodel/FlowConnectionDefinition.jsonld @@ -0,0 +1,105 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml/v2/metamodel#", + "sysml": "http://omg.org/ns/sysml/v2/metamodel#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "action": {"@type": "@id"}, + "aliasIds": {"@type": "xsd:string"}, + "associationEnd": {"@type": "@id"}, + "connectionEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, + "directedFeature": {"@type": "@id"}, + "directedUsage": {"@type": "@id"}, + "documentation": {"@type": "@id"}, + "effectiveName": {"@type": "xsd:string"}, + "elementId": {"@type": "dcterms:identifier"}, + "endFeature": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "featureMembership": {"@type": "@id"}, + "importedMembership": {"@type": "@id"}, + "inheritedFeature": {"@type": "@id"}, + "inheritedMembership": {"@type": "@id"}, + "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, + "isAbstract": {"@type": "xsd:boolean"}, + "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, + "isIndividual": {"@type": "xsd:boolean"}, + "isSufficient": {"@type": "xsd:boolean"}, + "isVariation": {"@type": "xsd:boolean"}, + "lifeClass": {"@type": "@id"}, + "member": {"@type": "@id"}, + "membership": {"@type": "@id"}, + "multiplicity": {"@type": "@id"}, + "name": {"@type": "xsd:string"}, + "output": {"@type": "@id"}, + "ownedAction": {"@type": "@id"}, + "ownedAllocation": {"@type": "@id"}, + "ownedAnalysisCase": {"@type": "@id"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedAttribute": {"@type": "@id"}, + "ownedCalculation": {"@type": "@id"}, + "ownedCase": {"@type": "@id"}, + "ownedConcern": {"@type": "@id"}, + "ownedConjugator": {"@type": "@id"}, + "ownedConnection": {"@type": "@id"}, + "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, + "ownedDisjoining": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedEndFeature": {"@type": "@id"}, + "ownedEnumeration": {"@type": "@id"}, + "ownedFeature": {"@type": "@id"}, + "ownedFeatureMembership": {"@type": "@id"}, + "ownedFlow": {"@type": "@id"}, + "ownedImport": {"@type": "@id"}, + "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, + "ownedItem": {"@type": "@id"}, + "ownedMember": {"@type": "@id"}, + "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, + "ownedOccurrence": {"@type": "@id"}, + "ownedPart": {"@type": "@id"}, + "ownedPort": {"@type": "@id"}, + "ownedReference": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "ownedRendering": {"@type": "@id"}, + "ownedRequirement": {"@type": "@id"}, + "ownedSpecialization": {"@type": "@id"}, + "ownedState": {"@type": "@id"}, + "ownedSubclassification": {"@type": "@id"}, + "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, + "ownedUsage": {"@type": "@id"}, + "ownedUseCase": {"@type": "@id"}, + "ownedVerificationCase": {"@type": "@id"}, + "ownedView": {"@type": "@id"}, + "ownedViewpoint": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "parameter": {"@type": "@id"}, + "qualifiedName": {"@type": "xsd:string"}, + "relatedElement": {"@type": "@id"}, + "relatedType": {"@type": "@id"}, + "shortName": {"@type": "xsd:string"}, + "source": {"@type": "@id"}, + "sourceType": {"@type": "@id"}, + "step": {"@type": "@id"}, + "target": {"@type": "@id"}, + "targetType": {"@type": "@id"}, + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, + "usage": {"@type": "@id"}, + "variant": {"@type": "@id"}, + "variantMembership": {"@type": "@id"} + + } +} \ No newline at end of file diff --git a/public/jsonld/metamodel/FlowConnectionUsage.jsonld b/public/jsonld/metamodel/FlowConnectionUsage.jsonld index f241c59d..c11eeaee 100644 --- a/public/jsonld/metamodel/FlowConnectionUsage.jsonld +++ b/public/jsonld/metamodel/FlowConnectionUsage.jsonld @@ -5,6 +5,7 @@ "dcterms": "http://purl.org/dc/terms/", "xsd": "http://www.w3.org/2001/XMLSchema#", + "actionDefinition": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "association": {"@type": "@id"}, "behavior": {"@type": "@id"}, @@ -12,6 +13,7 @@ "connectionDefinition": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -23,17 +25,22 @@ "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, "featuringType": {"@type": "@id"}, + "flowConnectionDefinition": {"@type": "@id"}, "importedMembership": {"@type": "@id"}, "individualDefinition": {"@type": "@id"}, "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "interaction": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -65,6 +72,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -82,6 +90,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -90,15 +99,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -124,6 +136,7 @@ "targetInputFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ForLoopActionUsage.jsonld b/public/jsonld/metamodel/ForLoopActionUsage.jsonld index f9b89906..c27a04cd 100644 --- a/public/jsonld/metamodel/ForLoopActionUsage.jsonld +++ b/public/jsonld/metamodel/ForLoopActionUsage.jsonld @@ -11,6 +11,7 @@ "bodyAction": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,11 +28,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -59,6 +62,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -76,6 +80,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -84,14 +89,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -108,6 +116,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ForkNode.jsonld b/public/jsonld/metamodel/ForkNode.jsonld index 5bf1cb91..89d1f5c8 100644 --- a/public/jsonld/metamodel/ForkNode.jsonld +++ b/public/jsonld/metamodel/ForkNode.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/FramedConcernMembership.jsonld b/public/jsonld/metamodel/FramedConcernMembership.jsonld index 0a07f2b7..52ca1b74 100644 --- a/public/jsonld/metamodel/FramedConcernMembership.jsonld +++ b/public/jsonld/metamodel/FramedConcernMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "kind": {"@type": "@vocab"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, @@ -30,7 +31,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -44,6 +44,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/Function.jsonld b/public/jsonld/metamodel/Function.jsonld index 4066e511..5ba63b80 100644 --- a/public/jsonld/metamodel/Function.jsonld +++ b/public/jsonld/metamodel/Function.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, @@ -29,17 +32,20 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, @@ -49,7 +55,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "step": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/IfActionUsage.jsonld b/public/jsonld/metamodel/IfActionUsage.jsonld index e44458d6..d1c40c3a 100644 --- a/public/jsonld/metamodel/IfActionUsage.jsonld +++ b/public/jsonld/metamodel/IfActionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -28,11 +29,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -59,6 +62,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -76,6 +80,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -84,14 +89,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -108,6 +116,7 @@ "textualRepresentation": {"@type": "@id"}, "thenAction": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Import.jsonld b/public/jsonld/metamodel/Import.jsonld index ed64220f..6d630973 100644 --- a/public/jsonld/metamodel/Import.jsonld +++ b/public/jsonld/metamodel/Import.jsonld @@ -12,6 +12,8 @@ "importOwningNamespace": {"@type": "@id"}, "importedMemberName": {"@type": "xsd:string"}, "importedNamespace": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isImportAll": {"@type": "xsd:boolean"}, "isRecursive": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/IncludeUseCaseUsage.jsonld b/public/jsonld/metamodel/IncludeUseCaseUsage.jsonld index b7df8c40..85c1576a 100644 --- a/public/jsonld/metamodel/IncludeUseCaseUsage.jsonld +++ b/public/jsonld/metamodel/IncludeUseCaseUsage.jsonld @@ -13,6 +13,7 @@ "caseDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -32,11 +33,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -64,6 +67,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -82,6 +86,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -90,14 +95,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -116,6 +124,7 @@ "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "useCaseDefinition": {"@type": "@id"}, "useCaseIncluded": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Interaction.jsonld b/public/jsonld/metamodel/Interaction.jsonld index 21781644..554f3348 100644 --- a/public/jsonld/metamodel/Interaction.jsonld +++ b/public/jsonld/metamodel/Interaction.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "associationEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -18,8 +19,11 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -28,18 +32,21 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, @@ -55,7 +62,8 @@ "step": {"@type": "@id"}, "target": {"@type": "@id"}, "targetType": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/InterfaceDefinition.jsonld b/public/jsonld/metamodel/InterfaceDefinition.jsonld index f6c68f1f..56169f5d 100644 --- a/public/jsonld/metamodel/InterfaceDefinition.jsonld +++ b/public/jsonld/metamodel/InterfaceDefinition.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "associationEnd": {"@type": "@id"}, "connectionEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -21,8 +22,11 @@ "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, "interfaceEnd": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -43,6 +47,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -52,9 +57,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -67,6 +74,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -86,6 +94,7 @@ "target": {"@type": "@id"}, "targetType": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/InterfaceUsage.jsonld b/public/jsonld/metamodel/InterfaceUsage.jsonld index 962e4c72..d0a95e1e 100644 --- a/public/jsonld/metamodel/InterfaceUsage.jsonld +++ b/public/jsonld/metamodel/InterfaceUsage.jsonld @@ -11,6 +11,7 @@ "connectionDefinition": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -28,12 +29,15 @@ "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, "interfaceDefinition": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -61,6 +65,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -78,6 +83,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -86,15 +92,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -117,6 +126,7 @@ "targetFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Intersecting.jsonld b/public/jsonld/metamodel/Intersecting.jsonld new file mode 100644 index 00000000..a85f1c28 --- /dev/null +++ b/public/jsonld/metamodel/Intersecting.jsonld @@ -0,0 +1,34 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml/v2/metamodel#", + "sysml": "http://omg.org/ns/sysml/v2/metamodel#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "aliasIds": {"@type": "xsd:string"}, + "documentation": {"@type": "@id"}, + "effectiveName": {"@type": "xsd:string"}, + "elementId": {"@type": "dcterms:identifier"}, + "intersectingType": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, + "name": {"@type": "xsd:string"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "qualifiedName": {"@type": "xsd:string"}, + "relatedElement": {"@type": "@id"}, + "shortName": {"@type": "xsd:string"}, + "source": {"@type": "@id"}, + "target": {"@type": "@id"}, + "textualRepresentation": {"@type": "@id"}, + "typeIntersected": {"@type": "@id"} + + } +} \ No newline at end of file diff --git a/public/jsonld/metamodel/Invariant.jsonld b/public/jsonld/metamodel/Invariant.jsonld index bbf3c6fd..394d7524 100644 --- a/public/jsonld/metamodel/Invariant.jsonld +++ b/public/jsonld/metamodel/Invariant.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNegated": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -43,6 +46,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -51,14 +55,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -71,7 +78,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/InvocationExpression.jsonld b/public/jsonld/metamodel/InvocationExpression.jsonld index f1ea19cd..6c499408 100644 --- a/public/jsonld/metamodel/InvocationExpression.jsonld +++ b/public/jsonld/metamodel/InvocationExpression.jsonld @@ -9,6 +9,7 @@ "argument": {"@type": "@id"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -43,6 +46,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -51,14 +55,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,7 +77,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ItemDefinition.jsonld b/public/jsonld/metamodel/ItemDefinition.jsonld index 5d27479a..9da658ad 100644 --- a/public/jsonld/metamodel/ItemDefinition.jsonld +++ b/public/jsonld/metamodel/ItemDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,9 +53,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -63,6 +69,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -75,6 +82,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/ItemFeature.jsonld b/public/jsonld/metamodel/ItemFeature.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/ItemFeature.jsonld +++ b/public/jsonld/metamodel/ItemFeature.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ItemFlow.jsonld b/public/jsonld/metamodel/ItemFlow.jsonld index 04cdaa67..40a21265 100644 --- a/public/jsonld/metamodel/ItemFlow.jsonld +++ b/public/jsonld/metamodel/ItemFlow.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,12 +25,16 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "interaction": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -47,6 +52,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -55,15 +61,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -83,7 +92,8 @@ "targetFeature": {"@type": "@id"}, "targetInputFeature": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ItemFlowEnd.jsonld b/public/jsonld/metamodel/ItemFlowEnd.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/ItemFlowEnd.jsonld +++ b/public/jsonld/metamodel/ItemFlowEnd.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ItemFlowFeature.jsonld b/public/jsonld/metamodel/ItemFlowFeature.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/ItemFlowFeature.jsonld +++ b/public/jsonld/metamodel/ItemFlowFeature.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ItemUsage.jsonld b/public/jsonld/metamodel/ItemUsage.jsonld index 0a081664..9879282e 100644 --- a/public/jsonld/metamodel/ItemUsage.jsonld +++ b/public/jsonld/metamodel/ItemUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -56,6 +59,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -73,6 +77,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -81,14 +86,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -103,6 +111,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/JoinNode.jsonld b/public/jsonld/metamodel/JoinNode.jsonld index 5bf1cb91..89d1f5c8 100644 --- a/public/jsonld/metamodel/JoinNode.jsonld +++ b/public/jsonld/metamodel/JoinNode.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/LifeClass.jsonld b/public/jsonld/metamodel/LifeClass.jsonld index 15b23fce..ffdbd6ac 100644 --- a/public/jsonld/metamodel/LifeClass.jsonld +++ b/public/jsonld/metamodel/LifeClass.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,24 +30,28 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/LiteralBoolean.jsonld b/public/jsonld/metamodel/LiteralBoolean.jsonld index ea61ecfb..17631f8a 100644 --- a/public/jsonld/metamodel/LiteralBoolean.jsonld +++ b/public/jsonld/metamodel/LiteralBoolean.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,6 +77,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "value": {"@type": "xsd:boolean"} } diff --git a/public/jsonld/metamodel/LiteralExpression.jsonld b/public/jsonld/metamodel/LiteralExpression.jsonld index 84709d6e..f59a8ec0 100644 --- a/public/jsonld/metamodel/LiteralExpression.jsonld +++ b/public/jsonld/metamodel/LiteralExpression.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -69,7 +76,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/LiteralInfinity.jsonld b/public/jsonld/metamodel/LiteralInfinity.jsonld index 84709d6e..f59a8ec0 100644 --- a/public/jsonld/metamodel/LiteralInfinity.jsonld +++ b/public/jsonld/metamodel/LiteralInfinity.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -69,7 +76,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/LiteralInteger.jsonld b/public/jsonld/metamodel/LiteralInteger.jsonld index 28f3f5c7..2a59e8cc 100644 --- a/public/jsonld/metamodel/LiteralInteger.jsonld +++ b/public/jsonld/metamodel/LiteralInteger.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,6 +77,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "value": {"@type": "xsd:integer"} } diff --git a/public/jsonld/metamodel/LiteralRational.jsonld b/public/jsonld/metamodel/LiteralRational.jsonld index b46f27b7..5d28f12b 100644 --- a/public/jsonld/metamodel/LiteralRational.jsonld +++ b/public/jsonld/metamodel/LiteralRational.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,6 +77,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "value": {"@type": "xsd:decimal"} } diff --git a/public/jsonld/metamodel/LiteralString.jsonld b/public/jsonld/metamodel/LiteralString.jsonld index 5e3c2904..ef61050a 100644 --- a/public/jsonld/metamodel/LiteralString.jsonld +++ b/public/jsonld/metamodel/LiteralString.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -70,6 +77,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "value": {"@type": "xsd:string"} } diff --git a/public/jsonld/metamodel/LoopActionUsage.jsonld b/public/jsonld/metamodel/LoopActionUsage.jsonld index 00dfc1b6..2f58f9d9 100644 --- a/public/jsonld/metamodel/LoopActionUsage.jsonld +++ b/public/jsonld/metamodel/LoopActionUsage.jsonld @@ -11,6 +11,7 @@ "bodyAction": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,11 +28,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -58,6 +61,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -75,6 +79,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -83,14 +88,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -106,6 +114,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Membership.jsonld b/public/jsonld/metamodel/Membership.jsonld index 4af2d05f..fe689c29 100644 --- a/public/jsonld/metamodel/Membership.jsonld +++ b/public/jsonld/metamodel/Membership.jsonld @@ -9,6 +9,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/MergeNode.jsonld b/public/jsonld/metamodel/MergeNode.jsonld index 5bf1cb91..89d1f5c8 100644 --- a/public/jsonld/metamodel/MergeNode.jsonld +++ b/public/jsonld/metamodel/MergeNode.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Metaclass.jsonld b/public/jsonld/metamodel/Metaclass.jsonld index 15b23fce..ffdbd6ac 100644 --- a/public/jsonld/metamodel/Metaclass.jsonld +++ b/public/jsonld/metamodel/Metaclass.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,24 +30,28 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/MetadataDefinition.jsonld b/public/jsonld/metamodel/MetadataDefinition.jsonld index 5d27479a..9da658ad 100644 --- a/public/jsonld/metamodel/MetadataDefinition.jsonld +++ b/public/jsonld/metamodel/MetadataDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,9 +53,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -63,6 +69,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -75,6 +82,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/MetadataFeature.jsonld b/public/jsonld/metamodel/MetadataFeature.jsonld index 44ae6066..1d3a429a 100644 --- a/public/jsonld/metamodel/MetadataFeature.jsonld +++ b/public/jsonld/metamodel/MetadataFeature.jsonld @@ -9,6 +9,7 @@ "annotatedElement": {"@type": "@id"}, "annotation": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -67,7 +74,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/MetadataUsage.jsonld b/public/jsonld/metamodel/MetadataUsage.jsonld index f52c5600..e58024ed 100644 --- a/public/jsonld/metamodel/MetadataUsage.jsonld +++ b/public/jsonld/metamodel/MetadataUsage.jsonld @@ -10,6 +10,7 @@ "annotation": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -60,6 +63,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -77,6 +81,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -85,14 +90,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -107,6 +115,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Multiplicity.jsonld b/public/jsonld/metamodel/Multiplicity.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/Multiplicity.jsonld +++ b/public/jsonld/metamodel/Multiplicity.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/MultiplicityRange.jsonld b/public/jsonld/metamodel/MultiplicityRange.jsonld index 9fcf29ec..ee5530c9 100644 --- a/public/jsonld/metamodel/MultiplicityRange.jsonld +++ b/public/jsonld/metamodel/MultiplicityRange.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "bound": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -22,11 +23,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -41,6 +44,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,14 +53,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -67,6 +74,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "upperBound": {"@type": "@id"} } diff --git a/public/jsonld/metamodel/Namespace.jsonld b/public/jsonld/metamodel/Namespace.jsonld index b81c0e1a..41f6c3e1 100644 --- a/public/jsonld/metamodel/Namespace.jsonld +++ b/public/jsonld/metamodel/Namespace.jsonld @@ -10,6 +10,7 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, "name": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/NullExpression.jsonld b/public/jsonld/metamodel/NullExpression.jsonld index 84709d6e..f59a8ec0 100644 --- a/public/jsonld/metamodel/NullExpression.jsonld +++ b/public/jsonld/metamodel/NullExpression.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -42,6 +45,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,14 +54,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -69,7 +76,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/ObjectiveMembership.jsonld b/public/jsonld/metamodel/ObjectiveMembership.jsonld index 03a784b0..f21dd4e4 100644 --- a/public/jsonld/metamodel/ObjectiveMembership.jsonld +++ b/public/jsonld/metamodel/ObjectiveMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -28,7 +29,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -40,6 +40,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/OccurrenceDefinition.jsonld b/public/jsonld/metamodel/OccurrenceDefinition.jsonld index 5d27479a..9da658ad 100644 --- a/public/jsonld/metamodel/OccurrenceDefinition.jsonld +++ b/public/jsonld/metamodel/OccurrenceDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,9 +53,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -63,6 +69,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -75,6 +82,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/OccurrenceUsage.jsonld b/public/jsonld/metamodel/OccurrenceUsage.jsonld index c8de8d69..fc5c78ef 100644 --- a/public/jsonld/metamodel/OccurrenceUsage.jsonld +++ b/public/jsonld/metamodel/OccurrenceUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -55,6 +58,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -72,6 +76,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -80,14 +85,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -102,6 +110,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/OperatorExpression.jsonld b/public/jsonld/metamodel/OperatorExpression.jsonld index e5b41a25..05639fff 100644 --- a/public/jsonld/metamodel/OperatorExpression.jsonld +++ b/public/jsonld/metamodel/OperatorExpression.jsonld @@ -9,6 +9,7 @@ "argument": {"@type": "@id"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -53,14 +57,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -72,7 +79,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/OwningMembership.jsonld b/public/jsonld/metamodel/OwningMembership.jsonld index 67929fe3..945590ee 100644 --- a/public/jsonld/metamodel/OwningMembership.jsonld +++ b/public/jsonld/metamodel/OwningMembership.jsonld @@ -9,6 +9,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/Package.jsonld b/public/jsonld/metamodel/Package.jsonld index 8109db16..db9a2e94 100644 --- a/public/jsonld/metamodel/Package.jsonld +++ b/public/jsonld/metamodel/Package.jsonld @@ -11,6 +11,7 @@ "elementId": {"@type": "dcterms:identifier"}, "filterCondition": {"@type": "@id"}, "importedMembership": {"@type": "@id"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, "name": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/ParameterMembership.jsonld b/public/jsonld/metamodel/ParameterMembership.jsonld index 0ae70241..7bc5d1fd 100644 --- a/public/jsonld/metamodel/ParameterMembership.jsonld +++ b/public/jsonld/metamodel/ParameterMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -28,7 +29,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -40,6 +40,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/PartDefinition.jsonld b/public/jsonld/metamodel/PartDefinition.jsonld index 5d27479a..9da658ad 100644 --- a/public/jsonld/metamodel/PartDefinition.jsonld +++ b/public/jsonld/metamodel/PartDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,9 +53,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -63,6 +69,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -75,6 +82,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/PartUsage.jsonld b/public/jsonld/metamodel/PartUsage.jsonld index e6feaf57..04fbaf8b 100644 --- a/public/jsonld/metamodel/PartUsage.jsonld +++ b/public/jsonld/metamodel/PartUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -56,6 +59,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -73,6 +77,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -81,14 +86,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -104,6 +112,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/PerformActionUsage.jsonld b/public/jsonld/metamodel/PerformActionUsage.jsonld index 67c4206f..4da56d2c 100644 --- a/public/jsonld/metamodel/PerformActionUsage.jsonld +++ b/public/jsonld/metamodel/PerformActionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,11 +28,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -58,6 +61,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -75,6 +79,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -83,14 +88,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -107,6 +115,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/PortConjugation.jsonld b/public/jsonld/metamodel/PortConjugation.jsonld index 60acfc86..921b9750 100644 --- a/public/jsonld/metamodel/PortConjugation.jsonld +++ b/public/jsonld/metamodel/PortConjugation.jsonld @@ -11,6 +11,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "originalPortDefinition": {"@type": "@id"}, "originalType": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/PortDefinition.jsonld b/public/jsonld/metamodel/PortDefinition.jsonld index 2461a4ff..87c460af 100644 --- a/public/jsonld/metamodel/PortDefinition.jsonld +++ b/public/jsonld/metamodel/PortDefinition.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "conjugatedPortDefinition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -19,8 +20,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -41,6 +44,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,9 +54,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -64,6 +70,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -76,6 +83,7 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/PortUsage.jsonld b/public/jsonld/metamodel/PortUsage.jsonld index 3f6e81b8..7c12e266 100644 --- a/public/jsonld/metamodel/PortUsage.jsonld +++ b/public/jsonld/metamodel/PortUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -55,6 +58,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -72,6 +76,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -80,14 +85,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -103,6 +111,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/PortioningFeature.jsonld b/public/jsonld/metamodel/PortioningFeature.jsonld index 1efa6406..ce7abadb 100644 --- a/public/jsonld/metamodel/PortioningFeature.jsonld +++ b/public/jsonld/metamodel/PortioningFeature.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -65,7 +72,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Predicate.jsonld b/public/jsonld/metamodel/Predicate.jsonld index 4066e511..5ba63b80 100644 --- a/public/jsonld/metamodel/Predicate.jsonld +++ b/public/jsonld/metamodel/Predicate.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, @@ -29,17 +32,20 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, @@ -49,7 +55,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "step": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Redefinition.jsonld b/public/jsonld/metamodel/Redefinition.jsonld index 25d94d66..6890e5d3 100644 --- a/public/jsonld/metamodel/Redefinition.jsonld +++ b/public/jsonld/metamodel/Redefinition.jsonld @@ -10,6 +10,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ReferenceSubsetting.jsonld b/public/jsonld/metamodel/ReferenceSubsetting.jsonld new file mode 100644 index 00000000..b89b4395 --- /dev/null +++ b/public/jsonld/metamodel/ReferenceSubsetting.jsonld @@ -0,0 +1,40 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml/v2/metamodel#", + "sysml": "http://omg.org/ns/sysml/v2/metamodel#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "aliasIds": {"@type": "xsd:string"}, + "documentation": {"@type": "@id"}, + "effectiveName": {"@type": "xsd:string"}, + "elementId": {"@type": "dcterms:identifier"}, + "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, + "name": {"@type": "xsd:string"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningFeature": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "owningType": {"@type": "@id"}, + "qualifiedName": {"@type": "xsd:string"}, + "referencedFeature": {"@type": "@id"}, + "referencingFeature": {"@type": "@id"}, + "relatedElement": {"@type": "@id"}, + "shortName": {"@type": "xsd:string"}, + "source": {"@type": "@id"}, + "specific": {"@type": "@id"}, + "subsettedFeature": {"@type": "@id"}, + "subsettingFeature": {"@type": "@id"}, + "target": {"@type": "@id"}, + "textualRepresentation": {"@type": "@id"} + + } +} \ No newline at end of file diff --git a/public/jsonld/metamodel/ReferenceUsage.jsonld b/public/jsonld/metamodel/ReferenceUsage.jsonld index 6dd55a73..7b205548 100644 --- a/public/jsonld/metamodel/ReferenceUsage.jsonld +++ b/public/jsonld/metamodel/ReferenceUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -53,6 +56,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -69,6 +73,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -77,14 +82,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -97,6 +105,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Relationship.jsonld b/public/jsonld/metamodel/Relationship.jsonld index 82df44df..a5bc5e21 100644 --- a/public/jsonld/metamodel/Relationship.jsonld +++ b/public/jsonld/metamodel/Relationship.jsonld @@ -9,6 +9,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/RenderingDefinition.jsonld b/public/jsonld/metamodel/RenderingDefinition.jsonld index c4bdd37d..621fb915 100644 --- a/public/jsonld/metamodel/RenderingDefinition.jsonld +++ b/public/jsonld/metamodel/RenderingDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,9 +53,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -63,6 +69,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -76,6 +83,7 @@ "rendering": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/RenderingUsage.jsonld b/public/jsonld/metamodel/RenderingUsage.jsonld index 901e0b0b..eb4dd847 100644 --- a/public/jsonld/metamodel/RenderingUsage.jsonld +++ b/public/jsonld/metamodel/RenderingUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -56,6 +59,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -73,6 +77,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -81,14 +86,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -105,6 +113,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/RequirementConstraintMembership.jsonld b/public/jsonld/metamodel/RequirementConstraintMembership.jsonld index 75cc750b..6e6edacb 100644 --- a/public/jsonld/metamodel/RequirementConstraintMembership.jsonld +++ b/public/jsonld/metamodel/RequirementConstraintMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "kind": {"@type": "@vocab"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, @@ -29,7 +30,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -42,6 +42,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/RequirementDefinition.jsonld b/public/jsonld/metamodel/RequirementDefinition.jsonld index d8ea0ff7..75a00437 100644 --- a/public/jsonld/metamodel/RequirementDefinition.jsonld +++ b/public/jsonld/metamodel/RequirementDefinition.jsonld @@ -8,6 +8,7 @@ "actorParameter": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "assumedConstraint": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -22,8 +23,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -54,9 +58,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -68,6 +74,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -88,6 +95,7 @@ "subjectParameter": {"@type": "@id"}, "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/RequirementUsage.jsonld b/public/jsonld/metamodel/RequirementUsage.jsonld index 110913de..96492510 100644 --- a/public/jsonld/metamodel/RequirementUsage.jsonld +++ b/public/jsonld/metamodel/RequirementUsage.jsonld @@ -12,6 +12,7 @@ "chainingFeature": {"@type": "@id"}, "constraintDefinition": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -30,11 +31,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -62,6 +65,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -79,6 +83,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -87,14 +92,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -118,6 +126,7 @@ "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/RequirementVerificationMembership.jsonld b/public/jsonld/metamodel/RequirementVerificationMembership.jsonld index 37c1ee89..98b3dac0 100644 --- a/public/jsonld/metamodel/RequirementVerificationMembership.jsonld +++ b/public/jsonld/metamodel/RequirementVerificationMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "kind": {"@type": "@vocab"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, @@ -30,7 +31,6 @@ "ownedRelationship": {"@type": "@id"}, "ownedRequirement": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -43,6 +43,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "verifiedRequirement": {"@type": "@id"}, "visibility": {"@type": "@vocab"} diff --git a/public/jsonld/metamodel/ResultExpressionMembership.jsonld b/public/jsonld/metamodel/ResultExpressionMembership.jsonld index 8edc7195..8898f8ef 100644 --- a/public/jsonld/metamodel/ResultExpressionMembership.jsonld +++ b/public/jsonld/metamodel/ResultExpressionMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -28,7 +29,6 @@ "ownedRelationship": {"@type": "@id"}, "ownedResultExpression": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -40,6 +40,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/ReturnParameterMembership.jsonld b/public/jsonld/metamodel/ReturnParameterMembership.jsonld index 0ae70241..7bc5d1fd 100644 --- a/public/jsonld/metamodel/ReturnParameterMembership.jsonld +++ b/public/jsonld/metamodel/ReturnParameterMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -28,7 +29,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -40,6 +40,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/SatisfyRequirementUsage.jsonld b/public/jsonld/metamodel/SatisfyRequirementUsage.jsonld index 0b0970cd..d51f1fd1 100644 --- a/public/jsonld/metamodel/SatisfyRequirementUsage.jsonld +++ b/public/jsonld/metamodel/SatisfyRequirementUsage.jsonld @@ -13,6 +13,7 @@ "chainingFeature": {"@type": "@id"}, "constraintDefinition": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -31,11 +32,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNegated": {"@type": "xsd:boolean"}, @@ -64,6 +67,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -81,6 +85,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -89,14 +94,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -122,6 +130,7 @@ "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/SelectExpression.jsonld b/public/jsonld/metamodel/SelectExpression.jsonld index e5b41a25..05639fff 100644 --- a/public/jsonld/metamodel/SelectExpression.jsonld +++ b/public/jsonld/metamodel/SelectExpression.jsonld @@ -9,6 +9,7 @@ "argument": {"@type": "@id"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -53,14 +57,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -72,7 +79,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/SendActionUsage.jsonld b/public/jsonld/metamodel/SendActionUsage.jsonld index c99a1a9f..ddcd747c 100644 --- a/public/jsonld/metamodel/SendActionUsage.jsonld +++ b/public/jsonld/metamodel/SendActionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -26,11 +27,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -107,6 +115,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/SourceEnd.jsonld b/public/jsonld/metamodel/SourceEnd.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/SourceEnd.jsonld +++ b/public/jsonld/metamodel/SourceEnd.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Specialization.jsonld b/public/jsonld/metamodel/Specialization.jsonld index e7e847cc..afa39423 100644 --- a/public/jsonld/metamodel/Specialization.jsonld +++ b/public/jsonld/metamodel/Specialization.jsonld @@ -10,6 +10,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/StakeholderMembership.jsonld b/public/jsonld/metamodel/StakeholderMembership.jsonld index 5732be7f..56a52821 100644 --- a/public/jsonld/metamodel/StakeholderMembership.jsonld +++ b/public/jsonld/metamodel/StakeholderMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -29,7 +30,6 @@ "ownedRelationship": {"@type": "@id"}, "ownedStakeholderParameter": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -41,6 +41,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/StateDefinition.jsonld b/public/jsonld/metamodel/StateDefinition.jsonld index bfed6486..b52f5f0b 100644 --- a/public/jsonld/metamodel/StateDefinition.jsonld +++ b/public/jsonld/metamodel/StateDefinition.jsonld @@ -7,6 +7,7 @@ "action": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "doAction": {"@type": "@id"}, @@ -22,8 +23,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isParallel": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -54,9 +58,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -68,6 +74,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -83,6 +90,7 @@ "state": {"@type": "@id"}, "step": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/StateSubactionMembership.jsonld b/public/jsonld/metamodel/StateSubactionMembership.jsonld index 5df54403..7855df0f 100644 --- a/public/jsonld/metamodel/StateSubactionMembership.jsonld +++ b/public/jsonld/metamodel/StateSubactionMembership.jsonld @@ -10,8 +10,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "kind": {"@type": "@vocab"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, @@ -29,7 +30,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -41,6 +41,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/StateUsage.jsonld b/public/jsonld/metamodel/StateUsage.jsonld index 71f630b3..c50d20b8 100644 --- a/public/jsonld/metamodel/StateUsage.jsonld +++ b/public/jsonld/metamodel/StateUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -29,11 +30,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -61,6 +64,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -78,6 +82,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -86,14 +91,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -110,6 +118,7 @@ "stateDefinition": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/Step.jsonld b/public/jsonld/metamodel/Step.jsonld index 1953554a..95e48300 100644 --- a/public/jsonld/metamodel/Step.jsonld +++ b/public/jsonld/metamodel/Step.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -22,11 +23,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -48,14 +52,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -66,7 +73,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Structure.jsonld b/public/jsonld/metamodel/Structure.jsonld index 15b23fce..ffdbd6ac 100644 --- a/public/jsonld/metamodel/Structure.jsonld +++ b/public/jsonld/metamodel/Structure.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,24 +30,28 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Subclassification.jsonld b/public/jsonld/metamodel/Subclassification.jsonld index 47889fe3..d32cdc7a 100644 --- a/public/jsonld/metamodel/Subclassification.jsonld +++ b/public/jsonld/metamodel/Subclassification.jsonld @@ -10,6 +10,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/SubjectMembership.jsonld b/public/jsonld/metamodel/SubjectMembership.jsonld index 091bf672..7b56bc27 100644 --- a/public/jsonld/metamodel/SubjectMembership.jsonld +++ b/public/jsonld/metamodel/SubjectMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -29,7 +30,6 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubjectParameter": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -41,6 +41,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/Subsetting.jsonld b/public/jsonld/metamodel/Subsetting.jsonld index 0675f168..4144339d 100644 --- a/public/jsonld/metamodel/Subsetting.jsonld +++ b/public/jsonld/metamodel/Subsetting.jsonld @@ -10,6 +10,8 @@ "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, "general": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/Succession.jsonld b/public/jsonld/metamodel/Succession.jsonld index 81a990d9..f9947f5b 100644 --- a/public/jsonld/metamodel/Succession.jsonld +++ b/public/jsonld/metamodel/Succession.jsonld @@ -9,6 +9,7 @@ "association": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -25,12 +26,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -44,6 +48,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -52,15 +57,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -79,7 +87,8 @@ "textualRepresentation": {"@type": "@id"}, "transitionStep": {"@type": "@id"}, "triggerStep": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/SuccessionAsUsage.jsonld b/public/jsonld/metamodel/SuccessionAsUsage.jsonld index 82282b00..1aa670a4 100644 --- a/public/jsonld/metamodel/SuccessionAsUsage.jsonld +++ b/public/jsonld/metamodel/SuccessionAsUsage.jsonld @@ -10,6 +10,7 @@ "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,12 +28,15 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -58,6 +62,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +79,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,15 +88,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -112,6 +121,7 @@ "transitionStep": {"@type": "@id"}, "triggerStep": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/SuccessionFlowConnectionUsage.jsonld b/public/jsonld/metamodel/SuccessionFlowConnectionUsage.jsonld index 07e8ebe3..01512283 100644 --- a/public/jsonld/metamodel/SuccessionFlowConnectionUsage.jsonld +++ b/public/jsonld/metamodel/SuccessionFlowConnectionUsage.jsonld @@ -5,6 +5,7 @@ "dcterms": "http://purl.org/dc/terms/", "xsd": "http://www.w3.org/2001/XMLSchema#", + "actionDefinition": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "association": {"@type": "@id"}, "behavior": {"@type": "@id"}, @@ -12,6 +13,7 @@ "connectionDefinition": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -24,18 +26,23 @@ "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, "featuringType": {"@type": "@id"}, + "flowConnectionDefinition": {"@type": "@id"}, "guardExpression": {"@type": "@id"}, "importedMembership": {"@type": "@id"}, "individualDefinition": {"@type": "@id"}, "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "interaction": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -67,6 +74,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -84,6 +92,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -92,15 +101,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -128,6 +140,7 @@ "transitionStep": {"@type": "@id"}, "triggerStep": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/SuccessionItemFlow.jsonld b/public/jsonld/metamodel/SuccessionItemFlow.jsonld index 0747b7e8..27bc0dd3 100644 --- a/public/jsonld/metamodel/SuccessionItemFlow.jsonld +++ b/public/jsonld/metamodel/SuccessionItemFlow.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "connectorEnd": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -26,12 +27,16 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "interaction": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isDirected": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -49,6 +54,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -57,15 +63,18 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -87,7 +96,8 @@ "textualRepresentation": {"@type": "@id"}, "transitionStep": {"@type": "@id"}, "triggerStep": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/TargetEnd.jsonld b/public/jsonld/metamodel/TargetEnd.jsonld index 7a997824..4ee0e73d 100644 --- a/public/jsonld/metamodel/TargetEnd.jsonld +++ b/public/jsonld/metamodel/TargetEnd.jsonld @@ -7,6 +7,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -21,11 +22,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -39,6 +42,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -47,14 +51,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -64,7 +71,8 @@ "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/TextualRepresentation.jsonld b/public/jsonld/metamodel/TextualRepresentation.jsonld index eadfde79..348b1c3e 100644 --- a/public/jsonld/metamodel/TextualRepresentation.jsonld +++ b/public/jsonld/metamodel/TextualRepresentation.jsonld @@ -12,6 +12,7 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "language": {"@type": "xsd:string"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/TransitionFeatureMembership.jsonld b/public/jsonld/metamodel/TransitionFeatureMembership.jsonld index 599cf033..6dc14b3e 100644 --- a/public/jsonld/metamodel/TransitionFeatureMembership.jsonld +++ b/public/jsonld/metamodel/TransitionFeatureMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "kind": {"@type": "@vocab"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, @@ -28,7 +29,6 @@ "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -41,6 +41,7 @@ "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "transitionFeature": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/TransitionUsage.jsonld b/public/jsonld/metamodel/TransitionUsage.jsonld index e7afd6fd..f5338906 100644 --- a/public/jsonld/metamodel/TransitionUsage.jsonld +++ b/public/jsonld/metamodel/TransitionUsage.jsonld @@ -10,6 +10,7 @@ "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -28,11 +29,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -59,6 +62,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -76,6 +80,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -84,14 +89,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -111,6 +119,7 @@ "textualRepresentation": {"@type": "@id"}, "triggerAction": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/TriggerInvocationExpression.jsonld b/public/jsonld/metamodel/TriggerInvocationExpression.jsonld index 92f7b347..1c745440 100644 --- a/public/jsonld/metamodel/TriggerInvocationExpression.jsonld +++ b/public/jsonld/metamodel/TriggerInvocationExpression.jsonld @@ -9,6 +9,7 @@ "argument": {"@type": "@id"}, "behavior": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, @@ -24,11 +25,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -44,6 +47,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -52,14 +56,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, @@ -71,7 +78,8 @@ "result": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, - "type": {"@type": "@id"} + "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Type.jsonld b/public/jsonld/metamodel/Type.jsonld index f1a1aef4..51de8ed2 100644 --- a/public/jsonld/metamodel/Type.jsonld +++ b/public/jsonld/metamodel/Type.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, @@ -17,8 +18,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "member": {"@type": "@id"}, "membership": {"@type": "@id"}, @@ -27,23 +30,27 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, "ownedFeature": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "qualifiedName": {"@type": "xsd:string"}, "shortName": {"@type": "xsd:string"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/TypeFeaturing.jsonld b/public/jsonld/metamodel/TypeFeaturing.jsonld index ceade41c..1d4c3003 100644 --- a/public/jsonld/metamodel/TypeFeaturing.jsonld +++ b/public/jsonld/metamodel/TypeFeaturing.jsonld @@ -9,8 +9,11 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "feature": {"@type": "@id"}, "featureOfType": {"@type": "@id"}, "featuringType": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, @@ -27,7 +30,8 @@ "shortName": {"@type": "xsd:string"}, "source": {"@type": "@id"}, "target": {"@type": "@id"}, - "textualRepresentation": {"@type": "@id"} + "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/metamodel/Unioning.jsonld b/public/jsonld/metamodel/Unioning.jsonld new file mode 100644 index 00000000..24181031 --- /dev/null +++ b/public/jsonld/metamodel/Unioning.jsonld @@ -0,0 +1,34 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml/v2/metamodel#", + "sysml": "http://omg.org/ns/sysml/v2/metamodel#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "aliasIds": {"@type": "xsd:string"}, + "documentation": {"@type": "@id"}, + "effectiveName": {"@type": "xsd:string"}, + "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, + "name": {"@type": "xsd:string"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "qualifiedName": {"@type": "xsd:string"}, + "relatedElement": {"@type": "@id"}, + "shortName": {"@type": "xsd:string"}, + "source": {"@type": "@id"}, + "target": {"@type": "@id"}, + "textualRepresentation": {"@type": "@id"}, + "typeUnioned": {"@type": "@id"}, + "unioningType": {"@type": "@id"} + + } +} \ No newline at end of file diff --git a/public/jsonld/metamodel/Usage.jsonld b/public/jsonld/metamodel/Usage.jsonld index 6dd55a73..7b205548 100644 --- a/public/jsonld/metamodel/Usage.jsonld +++ b/public/jsonld/metamodel/Usage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -23,11 +24,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, "isPortion": {"@type": "xsd:boolean"}, @@ -53,6 +56,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -69,6 +73,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -77,14 +82,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -97,6 +105,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/UseCaseDefinition.jsonld b/public/jsonld/metamodel/UseCaseDefinition.jsonld index a76c951e..6abf230f 100644 --- a/public/jsonld/metamodel/UseCaseDefinition.jsonld +++ b/public/jsonld/metamodel/UseCaseDefinition.jsonld @@ -9,6 +9,7 @@ "actorParameter": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "calculation": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -23,8 +24,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -47,6 +50,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -56,9 +60,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -70,6 +76,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -86,6 +93,7 @@ "step": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"} diff --git a/public/jsonld/metamodel/UseCaseUsage.jsonld b/public/jsonld/metamodel/UseCaseUsage.jsonld index 7eff4a97..14aeb2f8 100644 --- a/public/jsonld/metamodel/UseCaseUsage.jsonld +++ b/public/jsonld/metamodel/UseCaseUsage.jsonld @@ -13,6 +13,7 @@ "caseDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -31,11 +32,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -63,6 +66,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -81,6 +85,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -89,14 +94,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -114,6 +122,7 @@ "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "useCaseDefinition": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/VariantMembership.jsonld b/public/jsonld/metamodel/VariantMembership.jsonld index ce0b592e..5c1af37d 100644 --- a/public/jsonld/metamodel/VariantMembership.jsonld +++ b/public/jsonld/metamodel/VariantMembership.jsonld @@ -9,6 +9,8 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, diff --git a/public/jsonld/metamodel/VerificationCaseDefinition.jsonld b/public/jsonld/metamodel/VerificationCaseDefinition.jsonld index 0e5bee0a..295275cc 100644 --- a/public/jsonld/metamodel/VerificationCaseDefinition.jsonld +++ b/public/jsonld/metamodel/VerificationCaseDefinition.jsonld @@ -9,6 +9,7 @@ "actorParameter": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "calculation": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -22,8 +23,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -46,6 +49,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -55,9 +59,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -69,6 +75,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -85,6 +92,7 @@ "step": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/VerificationCaseUsage.jsonld b/public/jsonld/metamodel/VerificationCaseUsage.jsonld index 19038706..61b32795 100644 --- a/public/jsonld/metamodel/VerificationCaseUsage.jsonld +++ b/public/jsonld/metamodel/VerificationCaseUsage.jsonld @@ -13,6 +13,7 @@ "caseDefinition": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -30,11 +31,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -62,6 +65,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -80,6 +84,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -88,14 +93,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -113,6 +121,7 @@ "subjectParameter": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ViewDefinition.jsonld b/public/jsonld/metamodel/ViewDefinition.jsonld index e3024b1e..31487fbc 100644 --- a/public/jsonld/metamodel/ViewDefinition.jsonld +++ b/public/jsonld/metamodel/ViewDefinition.jsonld @@ -6,6 +6,7 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasIds": {"@type": "xsd:string"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -18,8 +19,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, "isVariation": {"@type": "xsd:boolean"}, @@ -40,6 +43,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -49,9 +53,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -63,6 +69,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -76,6 +83,7 @@ "satisfiedViewpoint": {"@type": "@id"}, "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ViewRenderingMembership.jsonld b/public/jsonld/metamodel/ViewRenderingMembership.jsonld index 93891d88..fced9671 100644 --- a/public/jsonld/metamodel/ViewRenderingMembership.jsonld +++ b/public/jsonld/metamodel/ViewRenderingMembership.jsonld @@ -9,8 +9,9 @@ "documentation": {"@type": "@id"}, "effectiveName": {"@type": "xsd:string"}, "elementId": {"@type": "dcterms:identifier"}, - "featureOfType": {"@type": "@id"}, - "featuringType": {"@type": "@id"}, + "feature": {"@type": "@id"}, + "isImplied": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, "memberElementId": {"@type": "xsd:string"}, "memberName": {"@type": "xsd:string"}, @@ -28,7 +29,6 @@ "ownedRelationship": {"@type": "@id"}, "ownedRendering": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, @@ -41,6 +41,7 @@ "source": {"@type": "@id"}, "target": {"@type": "@id"}, "textualRepresentation": {"@type": "@id"}, + "type": {"@type": "@id"}, "visibility": {"@type": "@vocab"} } diff --git a/public/jsonld/metamodel/ViewUsage.jsonld b/public/jsonld/metamodel/ViewUsage.jsonld index ac1028d5..2748ce08 100644 --- a/public/jsonld/metamodel/ViewUsage.jsonld +++ b/public/jsonld/metamodel/ViewUsage.jsonld @@ -8,6 +8,7 @@ "aliasIds": {"@type": "xsd:string"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -25,11 +26,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -57,6 +60,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -74,6 +78,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -82,14 +87,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -106,6 +114,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ViewpointDefinition.jsonld b/public/jsonld/metamodel/ViewpointDefinition.jsonld index 5f99526a..d1e1359c 100644 --- a/public/jsonld/metamodel/ViewpointDefinition.jsonld +++ b/public/jsonld/metamodel/ViewpointDefinition.jsonld @@ -8,6 +8,7 @@ "actorParameter": {"@type": "@id"}, "aliasIds": {"@type": "xsd:string"}, "assumedConstraint": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "documentation": {"@type": "@id"}, @@ -22,8 +23,10 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isSufficient": {"@type": "xsd:boolean"}, @@ -45,6 +48,7 @@ "ownedConjugator": {"@type": "@id"}, "ownedConnection": {"@type": "@id"}, "ownedConstraint": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -54,9 +58,11 @@ "ownedFlow": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, "ownedInterface": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedItem": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, + "ownedMetadata": {"@type": "@id"}, "ownedOccurrence": {"@type": "@id"}, "ownedPart": {"@type": "@id"}, "ownedPort": {"@type": "@id"}, @@ -68,6 +74,7 @@ "ownedState": {"@type": "@id"}, "ownedSubclassification": {"@type": "@id"}, "ownedTransition": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "ownedUsage": {"@type": "@id"}, "ownedUseCase": {"@type": "@id"}, "ownedVerificationCase": {"@type": "@id"}, @@ -88,6 +95,7 @@ "subjectParameter": {"@type": "@id"}, "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/ViewpointUsage.jsonld b/public/jsonld/metamodel/ViewpointUsage.jsonld index af9abb5f..6f5f574a 100644 --- a/public/jsonld/metamodel/ViewpointUsage.jsonld +++ b/public/jsonld/metamodel/ViewpointUsage.jsonld @@ -12,6 +12,7 @@ "chainingFeature": {"@type": "@id"}, "constraintDefinition": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -30,11 +31,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isModelLevelEvaluable": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, @@ -62,6 +65,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -79,6 +83,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -87,14 +92,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -118,6 +126,7 @@ "text": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, diff --git a/public/jsonld/metamodel/WhileLoopActionUsage.jsonld b/public/jsonld/metamodel/WhileLoopActionUsage.jsonld index beee1e60..a12b3f01 100644 --- a/public/jsonld/metamodel/WhileLoopActionUsage.jsonld +++ b/public/jsonld/metamodel/WhileLoopActionUsage.jsonld @@ -11,6 +11,7 @@ "bodyAction": {"@type": "@id"}, "chainingFeature": {"@type": "@id"}, "definition": {"@type": "@id"}, + "differencingType": {"@type": "@id"}, "directedFeature": {"@type": "@id"}, "directedUsage": {"@type": "@id"}, "direction": {"@type": "@vocab"}, @@ -27,11 +28,13 @@ "inheritedFeature": {"@type": "@id"}, "inheritedMembership": {"@type": "@id"}, "input": {"@type": "@id"}, + "intersectingType": {"@type": "@id"}, "isAbstract": {"@type": "xsd:boolean"}, "isComposite": {"@type": "xsd:boolean"}, "isConjugated": {"@type": "xsd:boolean"}, "isDerived": {"@type": "xsd:boolean"}, "isEnd": {"@type": "xsd:boolean"}, + "isImpliedIncluded": {"@type": "xsd:boolean"}, "isIndividual": {"@type": "xsd:boolean"}, "isNonunique": {"@type": "xsd:boolean"}, "isOrdered": {"@type": "xsd:boolean"}, @@ -58,6 +61,7 @@ "nestedFlow": {"@type": "@id"}, "nestedInterface": {"@type": "@id"}, "nestedItem": {"@type": "@id"}, + "nestedMetadata": {"@type": "@id"}, "nestedOccurrence": {"@type": "@id"}, "nestedPart": {"@type": "@id"}, "nestedPort": {"@type": "@id"}, @@ -75,6 +79,7 @@ "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, + "ownedDifferencing": {"@type": "@id"}, "ownedDisjoining": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -83,14 +88,17 @@ "ownedFeatureInverting": {"@type": "@id"}, "ownedFeatureMembership": {"@type": "@id"}, "ownedImport": {"@type": "@id"}, + "ownedIntersecting": {"@type": "@id"}, "ownedMember": {"@type": "@id"}, "ownedMembership": {"@type": "@id"}, "ownedRedefinition": {"@type": "@id"}, + "ownedReferenceSubsetting": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedSpecialization": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, + "ownedUnioning": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -106,6 +114,7 @@ "shortName": {"@type": "xsd:string"}, "textualRepresentation": {"@type": "@id"}, "type": {"@type": "@id"}, + "unioningType": {"@type": "@id"}, "untilArgument": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, From 13caac7608b17defa24a1485b94e88e1da0e6540 Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Thu, 8 Sep 2022 22:13:29 -0400 Subject: [PATCH 4/5] fix: ST5AS-207 Project PUT --- app/jackson/JpaIdentityDeserializer.java | 10 ++++++---- app/jackson/RecordSerialization.java | 5 ++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/jackson/JpaIdentityDeserializer.java b/app/jackson/JpaIdentityDeserializer.java index d8e09a6e..d49449ad 100644 --- a/app/jackson/JpaIdentityDeserializer.java +++ b/app/jackson/JpaIdentityDeserializer.java @@ -52,16 +52,18 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti if (p.currentToken() != JsonToken.START_OBJECT) { throw new JsonParseException(p, "Expected START_OBJECT. Received " + p.getCurrentName() + "."); } + T t = null; JsonToken token; while ((token = p.nextToken()) != null && token != JsonToken.END_OBJECT) { - if (token == JsonToken.FIELD_NAME && isIdentityField(p.getCurrentName())) { - if (p.nextToken() == null) { + if (t == null && token == JsonToken.FIELD_NAME && isIdentityField(p.getCurrentName())) { + token = p.nextToken(); + if (token == null) { throw new JsonParseException(p, "No value for identity field."); } - return deserializeFromIdentity(p); + t = deserializeFromIdentity(p); } } - return null; + return t; } @Override diff --git a/app/jackson/RecordSerialization.java b/app/jackson/RecordSerialization.java index d697262f..cb231150 100644 --- a/app/jackson/RecordSerialization.java +++ b/app/jackson/RecordSerialization.java @@ -66,14 +66,13 @@ protected boolean isIdentityField(String field) { } @Override - @SuppressWarnings("unchecked") protected R deserializeFromIdentity(JsonParser parser) throws IOException { UUID id = UUID.fromString(parser.getText()); - Record record = getEntityManager().find(getRecordClass(), id); + R record = getEntityManager().find(getRecordClass(), id); if (record == null) { throw new IOException(new EntityNotFoundException("Record " + id + " not found.")); } - return (R) record; + return record; } } From 74567cf4a5839e8fbce945cbb0f691bf139ed24f Mon Sep 17 00:00:00 2001 From: Ivan Gomes Date: Thu, 8 Sep 2022 22:18:53 -0400 Subject: [PATCH 5/5] Update version number to 2022-08 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2da6cf6d..ea9e7508 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ name := """SysML-v2-API-Services""" organization := "org.omg" -version := "2022-07" +version := "2022-08" javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")