From 3234b4ee7f7416e44b031261e8ec218971ac6435 Mon Sep 17 00:00:00 2001 From: ivan-gomes Date: Tue, 10 Nov 2020 18:34:24 -0800 Subject: [PATCH 1/6] Update version number to 2020-10 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7fe6acf4..67be47ec 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ name := """SysML-v2-API-Services""" organization := "org.omg" -version := "2020-09" +version := "2020-10" javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint") From 1c70ea9832c87c29465bc2dee70a71bf6d736d31 Mon Sep 17 00:00:00 2001 From: Manas Bajaj Date: Wed, 11 Nov 2020 09:17:30 +0530 Subject: [PATCH 2/6] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 08fdb157..68113849 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # SysML v2 API and Services -Pilot implementation of SysML v2 API and Services using Play framework. More details coming soon... +Pilot implementation of REST/HTTP Platform-specific model (PSM) of SysML v2 API and Services + +## Usage Scenarios +There are two broad usage scenarios. ## PostgreSQL Docker Configuration `docker run --name sysml2-postgres -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_DB=sysml2 -d postgres` From 15fc831431b2da3ca880233c5eeebc737532def1 Mon Sep 17 00:00:00 2001 From: Manas Bajaj Date: Wed, 11 Nov 2020 11:23:47 +0530 Subject: [PATCH 3/6] Added instructions to setup/run locally --- README.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 68113849..512d9850 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,80 @@ # SysML v2 API and Services -Pilot implementation of REST/HTTP Platform-specific model (PSM) of SysML v2 API and Services +Pilot implementation of REST/HTTP Platform-specific model (PSM) of SysML v2 API and Services, managed by the SysML v2 Submission Team (SST). ## Usage Scenarios -There are two broad usage scenarios. +There are two main usage scenarios. + +1. **Scenario 1: Accessing SysML v2 REST/HTTP API deployed on SST servers** +You do not need to clone this repository or setup anything on your local machine. You can access the REST/HTTP API on one of our deployed servers via Swagger doc, or a REST API client (e.g Postman) on your local machine. Ignore the rest of the instructions if you are interested in this scenario. Contact the SST to learn more. + +2. **Scenario 2: Running the SysML v2 REST/HTTP API and Services locally on your machine** +You can clone this repository, setup the backend database (PostgreSQL), and run the pilot implementation of SysML v2 API & Services locally on your machine. The same REST API that is deployed on the SST servers will be available on localhost. Follow the instructions below if you are interested in this scenario. + +## Setting up pilot implementation of SysML v2 API and Services on your local machine + +### Setup PostgreSQL +This pilot implementation uses PostgreSQL as the backend database. The easiest way to setup PostgreSQL locally is to run it as a Docker container. + +1. Use the `docker pull` command to download the docker image for the latest version of PostgreSQL available on Docker Hub - https://hub.docker.com/_/postgres + +2. Use the `docker run` command to start a docker container from the downloaded image, as shown below. This will initialize PostgreSQL database in a Docker container and make it available at port 5432 on your local machine. -## PostgreSQL Docker Configuration `docker run --name sysml2-postgres -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_DB=sysml2 -d postgres` + +3. Connect to the PostgreSQL database, running as a docker container, from any PostgreSQL client to verify. Use the following connection details. +- Host = localhost +- Port = 5432 +- User = postgres +- Password = mysecretpassword + +### Setup Java 11 +This pilot implementation uses JDK 11 for compiling and running SysML v2 API and Services. Download and setup JDK 11 on your machine. You can use Oracle JDK 11 or OpenJDK 11. + +### Setup sbt +This pilot implementation uses the Play framework (https://www.playframework.com/) for the web-application and sbt (https://www.scala-sbt.org/) as the build tool. You need to setup sbt to be able to compile and run SysML v2 API and Services. There are two options to do this: + +**1. Option 1** - Use IntelliJ as your IDE and install the Scala plugin as shown here - https://www.jetbrains.com/help/idea/discover-intellij-idea-for-scala.html. This will setup sbt and related infrastructure for compiling and running the SysML v2 API and Services web-application, either from within IntelliJ or from the command line. + +**2. Option 2** - Install sbt as a standalone on your machine from here - https://www.scala-sbt.org/. You will be compiling and running SysML v2 API and Services web-application from the command line. + +### Clone this repository +Clone this repository (SysML-v2-API-Services). Check out the latest release/tag (e.g. 2020-10) or the develop branch. + +### Run SysML v2 API & Services +1. Run `sbt clean` command to clean the project, as shown below. + +2. Run `sbt run` command to compile and run the SysML v2 API and Services web-application, as shown below. + +``` +User@Machine MINGW64 ~/MyGitRepos/SysML-v2-API-Services (develop) +$ sbt clean +[info] Loading global plugins from C:\Users\User\.sbt\1.0\plugins +[info] Loading settings for project sysml-v2-api-services-build from plugins.sbt,scaffold.sbt ... +[info] Loading project definition from C:\Users\User\MyGitRepos\SysML-v2-API-Services\project +[info] Loading settings for project root from build.sbt ... +[info] Set current project to SysML-v2-API-Services (in build file:/C:/Users/User/MyGitRepos/SysML-v2-API-Services/) +[success] Total time: 0 s, completed Nov 11, 2020, 10:54:27 AM + +User@Machine MINGW64 ~/MyGitRepos/SysML-v2-API-Services (develop) +$ sbt run +[info] Loading global plugins from C:\Users\User\.sbt\1.0\plugins +[info] Loading settings for project sysml-v2-api-services-build from plugins.sbt,scaffold.sbt ... +[info] Loading project definition from C:\Users\User\MyGitRepos\SysML-v2-API-Services\project +[info] Loading settings for project root from build.sbt ... +[info] Set current project to SysML-v2-API-Services (in build file:/C:/Users/User/MyGitRepos/SysML-v2-API-Services/) +[info] Updating ... +[info] Done updating. +[warn] There may be incompatibilities among your library dependencies; run 'evicted' to see detailed eviction warnings. + +--- (Running the application, auto-reloading is enabled) --- + +[info] p.c.s.AkkaHttpServer - Listening for HTTP on /0:0:0:0:0:0:0:0:9000 + +(Server started, use Enter to stop and go back to the console...) +``` + +3. Open a web-browser and go to `localhost:9000/docs/`. This will start to load the application and compile the web-application which may take a few minutes. Once loaded, you will see the Swagger doc for the SysML v2 REST/HTTP API as shown below. + +![REST/HTTP API](https://gist.githubusercontent.com/manasbajaj/0635b32fcf42a75eeca79744af953732/raw/0f73c2f3c8464bc36cb9341516bf9bdfb2342163/SysML-v2-REST-HTTP-API-Swagger-Doc.png) + +4. You can now make REST/HTTP requests to your local SysML v2 API and Services web application either via Swagger doc, or via any REST/HTTP client such as Postman. From 82b7d2be04821b8b22a701099c08e1598a6c6828 Mon Sep 17 00:00:00 2001 From: Manas Bajaj Date: Wed, 11 Nov 2020 11:27:11 +0530 Subject: [PATCH 4/6] Updated formatting --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 512d9850..110e94f1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This pilot implementation uses PostgreSQL as the backend database. The easiest w 2. Use the `docker run` command to start a docker container from the downloaded image, as shown below. This will initialize PostgreSQL database in a Docker container and make it available at port 5432 on your local machine. -`docker run --name sysml2-postgres -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_DB=sysml2 -d postgres` +```docker run --name sysml2-postgres -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -e POSTGRES_DB=sysml2 -d postgres``` 3. Connect to the PostgreSQL database, running as a docker container, from any PostgreSQL client to verify. Use the following connection details. - Host = localhost From ef1ad6a374b81d53e1df31270dcb714c8506bfb6 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 21 Nov 2020 13:55:41 -0800 Subject: [PATCH 5/6] ST5AS-101 Update to 2020-11 metamodel baseline --- app/org/omg/sysml/metamodel/Association.java | 2 - app/org/omg/sysml/metamodel/Connector.java | 2 - app/org/omg/sysml/metamodel/Feature.java | 8 +- .../sysml/metamodel/FeatureMembership.java | 2 +- app/org/omg/sysml/metamodel/FeatureValue.java | 6 +- .../RequirementVerificationMembership.java | 34 + .../omg/sysml/metamodel/TypeFeaturing.java | 34 + .../metamodel/VerificationCaseDefinition.java | 2 +- .../metamodel/VerificationCaseUsage.java | 2 + .../metamodel/impl/AcceptActionUsageImpl.java | 74 +- .../sysml/metamodel/impl/ActionUsageImpl.java | 74 +- .../metamodel/impl/AnalysisCaseUsageImpl.java | 74 +- .../impl/AssertConstraintUsageImpl.java | 74 +- .../sysml/metamodel/impl/AssociationImpl.java | 21 - .../metamodel/impl/AttributeUsageImpl.java | 74 +- .../metamodel/impl/BindingConnectorImpl.java | 100 +- .../metamodel/impl/BlockExpressionImpl.java | 74 +- .../metamodel/impl/BooleanExpressionImpl.java | 74 +- .../metamodel/impl/CalculationUsageImpl.java | 74 +- .../sysml/metamodel/impl/CaseUsageImpl.java | 74 +- .../impl/ConnectionDefinitionImpl.java | 21 - .../metamodel/impl/ConnectionUsageImpl.java | 100 +- .../sysml/metamodel/impl/ConnectorImpl.java | 100 +- .../metamodel/impl/ConstraintUsageImpl.java | 74 +- .../sysml/metamodel/impl/ControlNodeImpl.java | 74 +- .../metamodel/impl/DecisionNodeImpl.java | 74 +- .../impl/EndFeatureMembershipImpl.java | 59 ++ .../metamodel/impl/ExhibitStateUsageImpl.java | 74 +- .../sysml/metamodel/impl/ExpressionImpl.java | 74 +- .../omg/sysml/metamodel/impl/FeatureImpl.java | 74 +- .../metamodel/impl/FeatureMembershipImpl.java | 59 ++ .../impl/FeatureReferenceExpressionImpl.java | 74 +- .../metamodel/impl/FeatureValueImpl.java | 157 ---- .../sysml/metamodel/impl/ForkNodeImpl.java | 74 +- .../metamodel/impl/IndividualUsageImpl.java | 74 +- .../impl/InstanceCreationExpressionImpl.java | 74 +- .../sysml/metamodel/impl/InteractionImpl.java | 21 - .../impl/InterfaceDefinitionImpl.java | 21 - .../metamodel/impl/InterfaceUsageImpl.java | 100 +- .../sysml/metamodel/impl/InvariantImpl.java | 74 +- .../impl/InvocationExpressionImpl.java | 74 +- .../sysml/metamodel/impl/ItemFeatureImpl.java | 74 +- .../sysml/metamodel/impl/ItemFlowEndImpl.java | 74 +- .../metamodel/impl/ItemFlowFeatureImpl.java | 74 +- .../sysml/metamodel/impl/ItemFlowImpl.java | 100 +- .../sysml/metamodel/impl/ItemUsageImpl.java | 74 +- .../sysml/metamodel/impl/JoinNodeImpl.java | 74 +- .../metamodel/impl/LiteralBooleanImpl.java | 74 +- .../metamodel/impl/LiteralExpressionImpl.java | 74 +- .../metamodel/impl/LiteralIntegerImpl.java | 74 +- .../sysml/metamodel/impl/LiteralRealImpl.java | 74 +- .../metamodel/impl/LiteralStringImpl.java | 74 +- .../metamodel/impl/LiteralUnboundedImpl.java | 74 +- .../sysml/metamodel/impl/MergeNodeImpl.java | 74 +- .../metamodel/impl/MultiplicityImpl.java | 74 +- .../metamodel/impl/MultiplicityRangeImpl.java | 74 +- .../metamodel/impl/NullExpressionImpl.java | 74 +- .../impl/ObjectiveMembershipImpl.java | 59 ++ .../impl/OperatorExpressionImpl.java | 74 +- .../impl/ParameterMembershipImpl.java | 59 ++ .../sysml/metamodel/impl/PartUsageImpl.java | 74 +- .../impl/PerformActionUsageImpl.java | 74 +- .../sysml/metamodel/impl/PortUsageImpl.java | 74 +- .../impl/QueryPathExpressionImpl.java | 74 +- .../impl/QueryPathStepExpressionImpl.java | 74 +- .../impl/QueryQualifierExpressionImpl.java | 74 +- .../metamodel/impl/ReferenceUsageImpl.java | 74 +- .../metamodel/impl/RenderingUsageImpl.java | 74 +- .../RequirementConstraintMembershipImpl.java | 59 ++ .../metamodel/impl/RequirementUsageImpl.java | 74 +- ...RequirementVerificationMembershipImpl.java | 880 ++++++++++++++++++ .../impl/ResultExpressionMembershipImpl.java | 59 ++ .../impl/ReturnParameterMembershipImpl.java | 59 ++ .../impl/SatisfyRequirementUsageImpl.java | 74 +- .../metamodel/impl/SendActionUsageImpl.java | 74 +- .../metamodel/impl/SnapshotFeatureImpl.java | 74 +- .../sysml/metamodel/impl/SourceEndImpl.java | 74 +- .../impl/StateSubactionMembershipImpl.java | 59 ++ .../sysml/metamodel/impl/StateUsageImpl.java | 74 +- .../omg/sysml/metamodel/impl/StepImpl.java | 74 +- .../metamodel/impl/SubjectMembershipImpl.java | 59 ++ .../sysml/metamodel/impl/SuccessionImpl.java | 100 +- .../impl/SuccessionItemFlowImpl.java | 100 +- .../sysml/metamodel/impl/TargetEndImpl.java | 74 +- .../metamodel/impl/TimeSliceFeatureImpl.java | 74 +- .../impl/TransferActionUsageImpl.java | 74 +- .../impl/TransitionFeatureMembershipImpl.java | 59 ++ .../metamodel/impl/TransitionUsageImpl.java | 74 +- .../metamodel/impl/TypeFeaturingImpl.java | 555 +++++++++++ .../omg/sysml/metamodel/impl/UsageImpl.java | 74 +- .../impl/VerificationCaseDefinitionImpl.java | 26 + .../impl/VerificationCaseUsageImpl.java | 100 +- .../sysml/metamodel/impl/ViewUsageImpl.java | 74 +- .../metamodel/impl/ViewpointUsageImpl.java | 74 +- .../sysml/metamodel/impl/package-info.java | 29 +- .../impl/AcceptActionUsageImpl_.java | 9 +- .../metamodel/impl/ActionUsageImpl_.java | 9 +- .../impl/AnalysisCaseUsageImpl_.java | 9 +- .../impl/AssertConstraintUsageImpl_.java | 9 +- .../metamodel/impl/AttributeUsageImpl_.java | 9 +- .../metamodel/impl/BindingConnectorImpl_.java | 11 +- .../metamodel/impl/BlockExpressionImpl_.java | 9 +- .../impl/BooleanExpressionImpl_.java | 9 +- .../metamodel/impl/CalculationUsageImpl_.java | 9 +- .../sysml/metamodel/impl/CaseUsageImpl_.java | 9 +- .../metamodel/impl/ConnectionUsageImpl_.java | 11 +- .../sysml/metamodel/impl/ConnectorImpl_.java | 11 +- .../metamodel/impl/ConstraintUsageImpl_.java | 9 +- .../metamodel/impl/ControlNodeImpl_.java | 9 +- .../metamodel/impl/DecisionNodeImpl_.java | 9 +- .../impl/ExhibitStateUsageImpl_.java | 9 +- .../sysml/metamodel/impl/ExpressionImpl_.java | 9 +- .../sysml/metamodel/impl/FeatureImpl_.java | 9 +- .../impl/FeatureReferenceExpressionImpl_.java | 9 +- .../metamodel/impl/FeatureValueImpl_.java | 13 - .../sysml/metamodel/impl/ForkNodeImpl_.java | 9 +- .../metamodel/impl/IndividualUsageImpl_.java | 9 +- .../impl/InstanceCreationExpressionImpl_.java | 9 +- .../metamodel/impl/InterfaceUsageImpl_.java | 11 +- .../sysml/metamodel/impl/InvariantImpl_.java | 9 +- .../impl/InvocationExpressionImpl_.java | 9 +- .../metamodel/impl/ItemFeatureImpl_.java | 9 +- .../metamodel/impl/ItemFlowEndImpl_.java | 9 +- .../metamodel/impl/ItemFlowFeatureImpl_.java | 9 +- .../sysml/metamodel/impl/ItemFlowImpl_.java | 11 +- .../sysml/metamodel/impl/ItemUsageImpl_.java | 9 +- .../sysml/metamodel/impl/JoinNodeImpl_.java | 9 +- .../metamodel/impl/LiteralBooleanImpl_.java | 9 +- .../impl/LiteralExpressionImpl_.java | 9 +- .../metamodel/impl/LiteralIntegerImpl_.java | 9 +- .../metamodel/impl/LiteralRealImpl_.java | 9 +- .../metamodel/impl/LiteralStringImpl_.java | 9 +- .../metamodel/impl/LiteralUnboundedImpl_.java | 9 +- .../sysml/metamodel/impl/MergeNodeImpl_.java | 9 +- .../metamodel/impl/MultiplicityImpl_.java | 9 +- .../impl/MultiplicityRangeImpl_.java | 9 +- .../metamodel/impl/NullExpressionImpl_.java | 9 +- .../impl/OperatorExpressionImpl_.java | 9 +- .../sysml/metamodel/impl/PartUsageImpl_.java | 9 +- .../impl/PerformActionUsageImpl_.java | 9 +- .../sysml/metamodel/impl/PortUsageImpl_.java | 9 +- .../impl/QueryPathExpressionImpl_.java | 9 +- .../impl/QueryPathStepExpressionImpl_.java | 9 +- .../impl/QueryQualifierExpressionImpl_.java | 9 +- .../metamodel/impl/ReferenceUsageImpl_.java | 9 +- .../metamodel/impl/RenderingUsageImpl_.java | 9 +- .../metamodel/impl/RequirementUsageImpl_.java | 9 +- ...equirementVerificationMembershipImpl_.java | 72 ++ .../impl/SatisfyRequirementUsageImpl_.java | 9 +- .../metamodel/impl/SendActionUsageImpl_.java | 9 +- .../metamodel/impl/SnapshotFeatureImpl_.java | 9 +- .../sysml/metamodel/impl/SourceEndImpl_.java | 9 +- .../sysml/metamodel/impl/StateUsageImpl_.java | 9 +- .../omg/sysml/metamodel/impl/StepImpl_.java | 9 +- .../sysml/metamodel/impl/SuccessionImpl_.java | 11 +- .../impl/SuccessionItemFlowImpl_.java | 11 +- .../sysml/metamodel/impl/TargetEndImpl_.java | 9 +- .../metamodel/impl/TimeSliceFeatureImpl_.java | 9 +- .../impl/TransferActionUsageImpl_.java | 9 +- .../metamodel/impl/TransitionUsageImpl_.java | 9 +- .../metamodel/impl/TypeFeaturingImpl_.java | 51 + .../omg/sysml/metamodel/impl/UsageImpl_.java | 9 +- .../impl/VerificationCaseDefinitionImpl_.java | 2 + .../impl/VerificationCaseUsageImpl_.java | 11 +- .../sysml/metamodel/impl/ViewUsageImpl_.java | 9 +- .../metamodel/impl/ViewpointUsageImpl_.java | 9 +- public/jsonld/AcceptActionUsage.jsonld | 4 +- public/jsonld/ActionUsage.jsonld | 4 +- public/jsonld/AnalysisCaseUsage.jsonld | 4 +- public/jsonld/AssertConstraintUsage.jsonld | 4 +- public/jsonld/Association.jsonld | 1 - public/jsonld/AttributeUsage.jsonld | 4 +- public/jsonld/BindingConnector.jsonld | 5 +- public/jsonld/BlockExpression.jsonld | 4 +- public/jsonld/BooleanExpression.jsonld | 4 +- public/jsonld/CalculationUsage.jsonld | 4 +- public/jsonld/CaseUsage.jsonld | 4 +- public/jsonld/ConnectionDefinition.jsonld | 1 - public/jsonld/ConnectionUsage.jsonld | 5 +- public/jsonld/Connector.jsonld | 5 +- public/jsonld/ConstraintUsage.jsonld | 4 +- public/jsonld/ControlNode.jsonld | 4 +- public/jsonld/DecisionNode.jsonld | 4 +- public/jsonld/EndFeatureMembership.jsonld | 3 + public/jsonld/ExhibitStateUsage.jsonld | 4 +- public/jsonld/Expression.jsonld | 4 +- public/jsonld/Feature.jsonld | 4 +- public/jsonld/FeatureMembership.jsonld | 3 + .../jsonld/FeatureReferenceExpression.jsonld | 4 +- public/jsonld/FeatureValue.jsonld | 9 - public/jsonld/ForkNode.jsonld | 4 +- public/jsonld/IndividualUsage.jsonld | 4 +- .../jsonld/InstanceCreationExpression.jsonld | 4 +- public/jsonld/Interaction.jsonld | 1 - public/jsonld/InterfaceDefinition.jsonld | 1 - public/jsonld/InterfaceUsage.jsonld | 5 +- public/jsonld/Invariant.jsonld | 4 +- public/jsonld/InvocationExpression.jsonld | 4 +- public/jsonld/ItemFeature.jsonld | 4 +- public/jsonld/ItemFlow.jsonld | 5 +- public/jsonld/ItemFlowEnd.jsonld | 4 +- public/jsonld/ItemFlowFeature.jsonld | 4 +- public/jsonld/ItemUsage.jsonld | 4 +- public/jsonld/JoinNode.jsonld | 4 +- public/jsonld/LiteralBoolean.jsonld | 4 +- public/jsonld/LiteralExpression.jsonld | 4 +- public/jsonld/LiteralInteger.jsonld | 4 +- public/jsonld/LiteralReal.jsonld | 4 +- public/jsonld/LiteralString.jsonld | 4 +- public/jsonld/LiteralUnbounded.jsonld | 4 +- public/jsonld/MergeNode.jsonld | 4 +- public/jsonld/Multiplicity.jsonld | 4 +- public/jsonld/MultiplicityRange.jsonld | 4 +- public/jsonld/NullExpression.jsonld | 4 +- public/jsonld/ObjectiveMembership.jsonld | 3 + public/jsonld/OperatorExpression.jsonld | 4 +- public/jsonld/ParameterMembership.jsonld | 3 + public/jsonld/PartUsage.jsonld | 4 +- public/jsonld/PerformActionUsage.jsonld | 4 +- public/jsonld/PortUsage.jsonld | 4 +- public/jsonld/QueryPathExpression.jsonld | 4 +- public/jsonld/QueryPathStepExpression.jsonld | 4 +- public/jsonld/QueryQualifierExpression.jsonld | 4 +- public/jsonld/ReferenceUsage.jsonld | 4 +- public/jsonld/RenderingUsage.jsonld | 4 +- .../RequirementConstraintMembership.jsonld | 3 + public/jsonld/RequirementUsage.jsonld | 4 +- .../RequirementVerificationMembership.jsonld | 50 + .../jsonld/ResultExpressionMembership.jsonld | 3 + .../jsonld/ReturnParameterMembership.jsonld | 3 + public/jsonld/SatisfyRequirementUsage.jsonld | 4 +- public/jsonld/SendActionUsage.jsonld | 4 +- public/jsonld/SnapshotFeature.jsonld | 4 +- public/jsonld/SourceEnd.jsonld | 4 +- public/jsonld/StateSubactionMembership.jsonld | 3 + public/jsonld/StateUsage.jsonld | 4 +- public/jsonld/Step.jsonld | 4 +- public/jsonld/SubjectMembership.jsonld | 3 + public/jsonld/Succession.jsonld | 5 +- public/jsonld/SuccessionItemFlow.jsonld | 5 +- public/jsonld/TargetEnd.jsonld | 4 +- public/jsonld/TimeSliceFeature.jsonld | 4 +- public/jsonld/TransferActionUsage.jsonld | 4 +- .../jsonld/TransitionFeatureMembership.jsonld | 3 + public/jsonld/TransitionUsage.jsonld | 4 +- public/jsonld/TypeFeaturing.jsonld | 32 + public/jsonld/Usage.jsonld | 4 +- .../jsonld/VerificationCaseDefinition.jsonld | 3 +- public/jsonld/VerificationCaseUsage.jsonld | 7 +- public/jsonld/ViewUsage.jsonld | 4 +- public/jsonld/ViewpointUsage.jsonld | 4 +- 251 files changed, 5375 insertions(+), 3367 deletions(-) create mode 100644 app/org/omg/sysml/metamodel/RequirementVerificationMembership.java create mode 100644 app/org/omg/sysml/metamodel/TypeFeaturing.java create mode 100644 app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java create mode 100644 app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java create mode 100644 generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java create mode 100644 generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java create mode 100644 public/jsonld/RequirementVerificationMembership.jsonld create mode 100644 public/jsonld/TypeFeaturing.jsonld diff --git a/app/org/omg/sysml/metamodel/Association.java b/app/org/omg/sysml/metamodel/Association.java index 0b804344..bfd6c28d 100644 --- a/app/org/omg/sysml/metamodel/Association.java +++ b/app/org/omg/sysml/metamodel/Association.java @@ -28,8 +28,6 @@ public interface Association extends Class, Relationship, MofObject { List getRelatedType(); - Connector getOwningConnector(); - Collection getAssociationEnd(); Type getSourceType(); diff --git a/app/org/omg/sysml/metamodel/Connector.java b/app/org/omg/sysml/metamodel/Connector.java index 84706c5e..49e4d506 100644 --- a/app/org/omg/sysml/metamodel/Connector.java +++ b/app/org/omg/sysml/metamodel/Connector.java @@ -32,8 +32,6 @@ public interface Connector extends Feature, Relationship, MofObject { Boolean getIsDirected(); - Collection getOwnedAssociationType(); - Collection getConnectorEnd(); Feature getSourceFeature(); diff --git a/app/org/omg/sysml/metamodel/Feature.java b/app/org/omg/sysml/metamodel/Feature.java index 4ea11356..d2bbc564 100644 --- a/app/org/omg/sysml/metamodel/Feature.java +++ b/app/org/omg/sysml/metamodel/Feature.java @@ -26,8 +26,6 @@ import java.util.Set; public interface Feature extends Type, MofObject { - Collection getReferencedType(); - Type getOwningType(); Boolean getIsUnique(); @@ -36,8 +34,6 @@ public interface Feature extends Type, MofObject { Collection getType(); - Collection getOwnedType(); - Collection getOwnedRedefinition(); Collection getOwnedSubsetting(); @@ -52,5 +48,9 @@ public interface Feature extends Type, MofObject { Collection getOwnedTyping(); + Collection getFeaturingType(); + + Collection getOwnedTypeFeaturing(); + 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 6fc07cdc..5bdf6a7f 100644 --- a/app/org/omg/sysml/metamodel/FeatureMembership.java +++ b/app/org/omg/sysml/metamodel/FeatureMembership.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; -public interface FeatureMembership extends Membership, MofObject { +public interface FeatureMembership extends Membership, TypeFeaturing, MofObject { Type getOwningType(); Boolean getIsDerived(); diff --git a/app/org/omg/sysml/metamodel/FeatureValue.java b/app/org/omg/sysml/metamodel/FeatureValue.java index 06be3e93..d4cab7ad 100644 --- a/app/org/omg/sysml/metamodel/FeatureValue.java +++ b/app/org/omg/sysml/metamodel/FeatureValue.java @@ -25,10 +25,10 @@ import java.util.List; import java.util.Set; -public interface FeatureValue extends FeatureMembership, MofObject { +public interface FeatureValue extends Membership, MofObject { Feature getFeatureWithValue(); - BindingConnector getValueConnector(); - Expression getValue(); + + BindingConnector getValueConnector(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/RequirementVerificationMembership.java b/app/org/omg/sysml/metamodel/RequirementVerificationMembership.java new file mode 100644 index 00000000..e0d6a8ab --- /dev/null +++ b/app/org/omg/sysml/metamodel/RequirementVerificationMembership.java @@ -0,0 +1,34 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * + * 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 RequirementVerificationMembership extends RequirementConstraintMembership, MofObject { + RequirementUsage getOwnedRequirement(); + + RequirementConstraintKind getKind(); + + RequirementUsage getVerifiedRequirement(); +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/TypeFeaturing.java b/app/org/omg/sysml/metamodel/TypeFeaturing.java new file mode 100644 index 00000000..50af92b8 --- /dev/null +++ b/app/org/omg/sysml/metamodel/TypeFeaturing.java @@ -0,0 +1,34 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * + * 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 TypeFeaturing extends Relationship, MofObject { + Feature getFeatureOfType(); + + Type getFeaturingType(); + + Feature getOwningFeatureOfType(); +} \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/VerificationCaseDefinition.java b/app/org/omg/sysml/metamodel/VerificationCaseDefinition.java index ca4a4bae..af580a0d 100644 --- a/app/org/omg/sysml/metamodel/VerificationCaseDefinition.java +++ b/app/org/omg/sysml/metamodel/VerificationCaseDefinition.java @@ -26,5 +26,5 @@ import java.util.Set; public interface VerificationCaseDefinition extends CaseDefinition, MofObject { - + Collection getVerifiedRequirement(); } \ No newline at end of file diff --git a/app/org/omg/sysml/metamodel/VerificationCaseUsage.java b/app/org/omg/sysml/metamodel/VerificationCaseUsage.java index 32431817..a4a27407 100644 --- a/app/org/omg/sysml/metamodel/VerificationCaseUsage.java +++ b/app/org/omg/sysml/metamodel/VerificationCaseUsage.java @@ -27,4 +27,6 @@ public interface VerificationCaseUsage extends CaseUsage, MofObject { VerificationCaseDefinition getVerificationCaseDefinition(); + + Collection getVerifiedRequirement(); } \ 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 f6bd9597..c93d5328 100644 --- a/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl.java @@ -314,6 +314,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1645,27 +1671,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AcceptActionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AcceptActionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1884,32 +1910,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AcceptActionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java index d6587842..cafd0e08 100644 --- a/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ActionUsageImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ActionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ActionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ActionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java index d3ed574d..2b37ab3e 100644 --- a/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl.java @@ -382,6 +382,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1755,27 +1781,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AnalysisCaseUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AnalysisCaseUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1994,32 +2020,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AnalysisCaseUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java index c8451c53..b0a16622 100644 --- a/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl.java @@ -330,6 +330,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1682,27 +1708,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AssertConstraintUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AssertConstraintUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1942,32 +1968,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AssertConstraintUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/AssociationImpl.java b/app/org/omg/sysml/metamodel/impl/AssociationImpl.java index 3ce71e7b..b1d409f4 100644 --- a/app/org/omg/sysml/metamodel/impl/AssociationImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AssociationImpl.java @@ -921,27 +921,6 @@ public void setOwner(Element owner) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningConnector") - private Connector owningConnector; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "ConnectorMetaDef", metaColumn = @javax.persistence.Column(name = "owningConnectorType"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningConnectorId", table = "Association") - public Connector getOwningConnector() { - return owningConnector; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = ConnectorImpl.class) - public void setOwningConnector(Connector owningConnector) { - this.owningConnector = owningConnector; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java index 52ce3981..2f3c1f62 100644 --- a/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/AttributeUsageImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1598,27 +1624,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AttributeUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "AttributeUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1811,32 +1837,6 @@ public void setOwningUsage(Usage owningUsage) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "AttributeUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java index 5937fc84..acec3d72 100644 --- a/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BindingConnectorImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -726,32 +752,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BindingConnector_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1102,27 +1102,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BindingConnector_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "BindingConnector_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1292,32 +1292,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BindingConnector_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java index dc8a711a..3ed08b9e 100644 --- a/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BlockExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "BlockExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BlockExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "BlockExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BlockExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java index 3e17e572..4f9615dd 100644 --- a/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/BooleanExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BooleanExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "BooleanExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1249,32 +1275,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "BooleanExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java b/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java index b4770d9c..f8980331 100644 --- a/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CalculationUsageImpl.java @@ -314,6 +314,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1666,27 +1692,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "CalculationUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "CalculationUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1905,32 +1931,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "CalculationUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java index 60859490..f6ece838 100644 --- a/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/CaseUsageImpl.java @@ -335,6 +335,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1708,27 +1734,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "CaseUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "CaseUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1947,32 +1973,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "CaseUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java index 6578c0ae..8575d874 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectionDefinitionImpl.java @@ -1535,27 +1535,6 @@ public void setOwner(Element owner) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningConnector") - private Connector owningConnector; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "ConnectorMetaDef", metaColumn = @javax.persistence.Column(name = "owningConnectorType"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningConnectorId", table = "ConnectionDefinition") - public Connector getOwningConnector() { - return owningConnector; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = ConnectorImpl.class) - public void setOwningConnector(Connector owningConnector) { - this.owningConnector = owningConnector; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java index d6349a65..9192229b 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectionUsageImpl.java @@ -319,6 +319,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1366,32 +1392,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ConnectionUsage_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1742,27 +1742,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ConnectionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ConnectionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -2000,32 +2000,6 @@ public void setPartDefinition(Collection partDefinition) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ConnectionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java index 73949e9c..fed5b097 100644 --- a/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConnectorImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -726,32 +752,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Connector_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1102,27 +1102,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Connector_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Connector_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1292,32 +1292,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Connector_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java index fdf479e3..026a2414 100644 --- a/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ConstraintUsageImpl.java @@ -288,6 +288,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1640,27 +1666,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ConstraintUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ConstraintUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1900,32 +1926,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ConstraintUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java b/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java index 6cea0bcb..dfa88970 100644 --- a/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ControlNodeImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ControlNode_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ControlNode_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ControlNode_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java b/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java index d2e00c15..6a4f101b 100644 --- a/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/DecisionNodeImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "DecisionNode_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "DecisionNode_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "DecisionNode_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java index 4e242d16..a1c99ed9 100644 --- a/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/EndFeatureMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "EndFeatureMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "EndFeatureMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -552,6 +590,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "EndFeatureMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java index 4dd8e5b8..e1c502fa 100644 --- a/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl.java @@ -377,6 +377,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1708,27 +1734,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ExhibitStateUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ExhibitStateUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1947,32 +1973,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ExhibitStateUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("stateDefinition") private Collection stateDefinition; diff --git a/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java index 76daea66..5fa6554e 100644 --- a/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Expression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Expression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Expression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/FeatureImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureImpl.java index 86fc10e3..a98ba5ad 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Feature_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Feature_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Feature_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java index 593af3f6..8896d3aa 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "FeatureMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "FeatureMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -552,6 +590,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "FeatureMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java index 48e4b677..05cdbc99 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "FeatureReferenceExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "FeatureReferenceExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "FeatureReferenceExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("referent") private Feature referent; diff --git a/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java b/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java index a1c9ae82..49da35f2 100644 --- a/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java +++ b/app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java @@ -92,24 +92,6 @@ public void setAliasId(Collection aliasId) { - // @info.archinnov.achilles.annotations.Column("direction") - // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) - private FeatureDirectionKind direction; - - @JsonGetter - @javax.persistence.Enumerated(EnumType.STRING) - @javax.persistence.Column(name = "direction", table = "FeatureValue") - public FeatureDirectionKind getDirection() { - return direction; - } - - @JsonSetter - public void setDirection(FeatureDirectionKind direction) { - this.direction = direction; - } - - - // @info.archinnov.achilles.annotations.Column("documentation") private Collection documentation; @@ -160,13 +142,11 @@ public void setDocumentationComment(Collection documentationComment) { - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("featureWithValue") private Feature featureWithValue; @JsonGetter @JsonSerialize(using = MofObjectSerializer.class) - // @javax.persistence.Transient @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureWithValueType"), fetch = FetchType.LAZY) @JoinColumn(name = "featureWithValueId", table = "FeatureValue") public Feature getFeatureWithValue() { @@ -215,86 +195,6 @@ public void setIdentifier(java.util.UUID identifier) { - // @info.archinnov.achilles.annotations.Column("isComposite") - private Boolean isComposite; - - @JsonGetter - @javax.persistence.Column(name = "isComposite", table = "FeatureValue") - public Boolean getIsComposite() { - return isComposite; - } - - @JsonSetter - public void setIsComposite(Boolean isComposite) { - this.isComposite = isComposite; - } - - - - // @info.archinnov.achilles.annotations.Column("isDerived") - private Boolean isDerived; - - @JsonGetter - @javax.persistence.Column(name = "isDerived", table = "FeatureValue") - public Boolean getIsDerived() { - return isDerived; - } - - @JsonSetter - public void setIsDerived(Boolean isDerived) { - this.isDerived = isDerived; - } - - - - // @info.archinnov.achilles.annotations.Column("isPort") - private Boolean isPort; - - @JsonGetter - @javax.persistence.Column(name = "isPort", table = "FeatureValue") - public Boolean getIsPort() { - return isPort; - } - - @JsonSetter - public void setIsPort(Boolean isPort) { - this.isPort = isPort; - } - - - - // @info.archinnov.achilles.annotations.Column("isPortion") - private Boolean isPortion; - - @JsonGetter - @javax.persistence.Column(name = "isPortion", table = "FeatureValue") - public Boolean getIsPortion() { - return isPortion; - } - - @JsonSetter - public void setIsPortion(Boolean isPortion) { - this.isPortion = isPortion; - } - - - - // @info.archinnov.achilles.annotations.Column("isReadOnly") - private Boolean isReadOnly; - - @JsonGetter - @javax.persistence.Column(name = "isReadOnly", table = "FeatureValue") - public Boolean getIsReadOnly() { - return isReadOnly; - } - - @JsonSetter - public void setIsReadOnly(Boolean isReadOnly) { - this.isReadOnly = isReadOnly; - } - - - // @info.archinnov.achilles.annotations.Column("memberElement") private Element memberElement; @@ -314,25 +214,6 @@ public void setMemberElement(Element memberElement) { - // @info.archinnov.achilles.annotations.Column("memberFeature") - private Feature memberFeature; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "memberFeatureType"), fetch = FetchType.LAZY) - @JoinColumn(name = "memberFeatureId", table = "FeatureValue") - public Feature getMemberFeature() { - return memberFeature; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) - public void setMemberFeature(Feature memberFeature) { - this.memberFeature = memberFeature; - } - - - // @info.archinnov.achilles.annotations.Column("memberName") private String memberName; @@ -459,25 +340,6 @@ public void setOwnedMemberElement(Element ownedMemberElement) { - // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") - private Feature ownedMemberFeature; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeatureType"), fetch = FetchType.LAZY) - @JoinColumn(name = "ownedMemberFeatureId", table = "FeatureValue") - public Feature getOwnedMemberFeature() { - return ownedMemberFeature; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) - public void setOwnedMemberFeature(Feature ownedMemberFeature) { - this.ownedMemberFeature = ownedMemberFeature; - } - - - // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") private List ownedRelatedElement; @@ -651,25 +513,6 @@ public void setOwningRelationship(Relationship owningRelationship) { - // @info.archinnov.achilles.annotations.Column("owningType") - private Type owningType; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "owningTypeType"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningTypeId", table = "FeatureValue") - public Type getOwningType() { - return owningType; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) - public void setOwningType(Type owningType) { - this.owningType = owningType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java b/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java index cf451a36..0bbf2fbd 100644 --- a/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ForkNodeImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ForkNode_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ForkNode_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ForkNode_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/IndividualUsageImpl.java b/app/org/omg/sysml/metamodel/impl/IndividualUsageImpl.java index a1124b24..8a532822 100644 --- a/app/org/omg/sysml/metamodel/impl/IndividualUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/IndividualUsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "IndividualUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1655,27 +1681,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "IndividualUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "IndividualUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1868,32 +1894,6 @@ public void setOwningUsage(Usage owningUsage) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "IndividualUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("snapshotFeature") private Feature snapshotFeature; diff --git a/app/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl.java index 854ddc16..664b5e36 100644 --- a/app/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "InstanceCreationExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1076,27 +1102,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InstanceCreationExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "InstanceCreationExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1273,32 +1299,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InstanceCreationExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/InteractionImpl.java b/app/org/omg/sysml/metamodel/impl/InteractionImpl.java index b894feb7..ef2eb763 100644 --- a/app/org/omg/sysml/metamodel/impl/InteractionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InteractionImpl.java @@ -921,27 +921,6 @@ public void setOwner(Element owner) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningConnector") - private Connector owningConnector; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "ConnectorMetaDef", metaColumn = @javax.persistence.Column(name = "owningConnectorType"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningConnectorId", table = "Interaction") - public Connector getOwningConnector() { - return owningConnector; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = ConnectorImpl.class) - public void setOwningConnector(Connector owningConnector) { - this.owningConnector = owningConnector; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java index d7285036..81d4faa1 100644 --- a/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InterfaceDefinitionImpl.java @@ -1561,27 +1561,6 @@ public void setOwner(Element owner) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("owningConnector") - private Connector owningConnector; - - @JsonGetter - @JsonSerialize(using = MofObjectSerializer.class) - // @javax.persistence.Transient - @Any(metaDef = "ConnectorMetaDef", metaColumn = @javax.persistence.Column(name = "owningConnectorType"), fetch = FetchType.LAZY) - @JoinColumn(name = "owningConnectorId", table = "InterfaceDefinition") - public Connector getOwningConnector() { - return owningConnector; - } - - @JsonSetter - @JsonDeserialize(using = MofObjectDeserializer.class, as = ConnectorImpl.class) - public void setOwningConnector(Connector owningConnector) { - this.owningConnector = owningConnector; - } - - - // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java index fd837885..da988b37 100644 --- a/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InterfaceUsageImpl.java @@ -319,6 +319,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1387,32 +1413,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InterfaceUsage_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1763,27 +1763,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InterfaceUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "InterfaceUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -2021,32 +2021,6 @@ public void setPartDefinition(Collection partDefinition) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InterfaceUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/InvariantImpl.java b/app/org/omg/sysml/metamodel/impl/InvariantImpl.java index a39d178d..61047b2d 100644 --- a/app/org/omg/sysml/metamodel/impl/InvariantImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InvariantImpl.java @@ -288,6 +288,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1052,27 +1078,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Invariant_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Invariant_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1270,32 +1296,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Invariant_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java index c69112ad..0a03e447 100644 --- a/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/InvocationExpressionImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1057,27 +1083,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InvocationExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "InvocationExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1254,32 +1280,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "InvocationExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java index 6df79c3d..6eeb161b 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFeatureImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFeature_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFeature_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFeature_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java index ff1e389d..31fc6cb2 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFlowEndImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlowEnd_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowEnd_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlowEnd_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java index ef015e60..a3c4a127 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlowFeature_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlowFeature_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlowFeature_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java b/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java index d20f6cee..ddaf0115 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemFlowImpl.java @@ -319,6 +319,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -856,32 +882,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlow_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1232,27 +1232,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlow_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemFlow_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1448,32 +1448,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemFlow_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java index 63a77eb4..9d4da229 100644 --- a/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ItemUsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1598,27 +1624,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ItemUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1811,32 +1837,6 @@ public void setOwningUsage(Usage owningUsage) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ItemUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java b/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java index 86f3e935..ab16ba0c 100644 --- a/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/JoinNodeImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "JoinNode_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "JoinNode_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "JoinNode_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java index 1c87df2d..c49de241 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralBooleanImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralBoolean_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralBoolean_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralBoolean_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java index 60f7203f..f404b3fb 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java index 25776359..00016e9d 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralIntegerImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralInteger_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralInteger_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralInteger_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralRealImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralRealImpl.java index 07cc4b50..e12c7407 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralRealImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralRealImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralReal_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralReal_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralReal_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralReal_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java index c089b9e8..35ead22e 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralStringImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralString_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralString_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralString_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl.java b/app/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl.java index e5a7c89f..1155cf16 100644 --- a/app/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl.java +++ b/app/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralUnbounded_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralUnbounded_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "LiteralUnbounded_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "LiteralUnbounded_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java b/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java index c8bfa764..a74ab460 100644 --- a/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MergeNodeImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "MergeNode_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "MergeNode_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "MergeNode_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java b/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java index e36e5d8f..56f9b372 100644 --- a/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MultiplicityImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Multiplicity_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Multiplicity_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Multiplicity_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java b/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java index 9280912e..35f4cf87 100644 --- a/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java +++ b/app/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "MultiplicityRange_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "MultiplicityRange_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1202,32 +1228,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "MultiplicityRange_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java index 082b4057..540d5c4e 100644 --- a/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/NullExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "NullExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "NullExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "NullExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java index 90eea7d1..e52d9b81 100644 --- a/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ObjectiveMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "ObjectiveMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "ObjectiveMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -571,6 +609,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "ObjectiveMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java index 47e654cf..d67d779e 100644 --- a/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/OperatorExpressionImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1099,27 +1125,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "OperatorExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "OperatorExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1296,32 +1322,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "OperatorExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java index 8af5dec8..f77cff62 100644 --- a/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ParameterMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "ParameterMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "ParameterMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -590,6 +628,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "ParameterMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java b/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java index 3e3ff09b..add00668 100644 --- a/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PartUsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1598,27 +1624,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "PartUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "PartUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1837,32 +1863,6 @@ public void setPartDefinition(Collection partDefinition) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "PartUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java index d17b5f03..556832e8 100644 --- a/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PerformActionUsageImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "PerformActionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "PerformActionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1884,32 +1910,6 @@ public void setPerformedAction(ActionUsage performedAction) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "PerformActionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java b/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java index eac1cd3b..4d9aaf17 100644 --- a/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/PortUsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1572,27 +1598,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "PortUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "PortUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1827,32 +1853,6 @@ public void setPortOwningUsage(Usage portOwningUsage) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "PortUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl.java index 5ea55204..b50a8a18 100644 --- a/app/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "QueryPathExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1031,27 +1057,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "QueryPathExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "QueryPathExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1228,32 +1254,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "QueryPathExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("referent") private Feature referent; diff --git a/app/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl.java index 40a4460a..44c10637 100644 --- a/app/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "QueryPathStepExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1099,27 +1125,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "QueryPathStepExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "QueryPathStepExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1296,32 +1322,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "QueryPathStepExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl.java b/app/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl.java index dc4c7979..0d7d71c9 100644 --- a/app/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl.java @@ -293,6 +293,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "QueryQualifierExpression_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("function") private Function function; @@ -1099,27 +1125,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "QueryQualifierExpression_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "QueryQualifierExpression_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1296,32 +1322,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "QueryQualifierExpression_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; diff --git a/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java index f61a8d79..a11734fe 100644 --- a/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ReferenceUsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1572,27 +1598,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ReferenceUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ReferenceUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1811,32 +1837,6 @@ public void setReferenceType(Collection referenceType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ReferenceUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java b/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java index e82a7bc1..97f35e87 100644 --- a/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RenderingUsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1598,27 +1624,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "RenderingUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RenderingUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1837,32 +1863,6 @@ public void setPartDefinition(Collection partDefinition) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "RenderingUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("renderingDefinition") private RenderingDefinition renderingDefinition; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java index 1461501e..fd53305c 100644 --- a/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RequirementConstraintMembershipImpl.java @@ -179,6 +179,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "RequirementConstraintMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "RequirementConstraintMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -589,6 +627,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "RequirementConstraintMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java index 5f9b3c19..a8f0624e 100644 --- a/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/RequirementUsageImpl.java @@ -314,6 +314,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1666,27 +1692,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "RequirementUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1926,32 +1952,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "RequirementUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Column("reqId") private String reqId; diff --git a/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java new file mode 100644 index 00000000..840aacbc --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl.java @@ -0,0 +1,880 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * + * 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.MofObjectSerializer; +import jackson.MofObjectDeserializer; + +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 = "RequirementVerificationMembershipImpl") +@SecondaryTable(name = "RequirementVerificationMembership") +@org.hibernate.annotations.Table(appliesTo = "RequirementVerificationMembership", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "RequirementVerificationMembership") +@DiscriminatorValue(value = "RequirementVerificationMembership") +@JsonTypeName(value = "RequirementVerificationMembership") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class RequirementVerificationMembershipImpl extends MofObjectImpl implements RequirementVerificationMembership { + // @info.archinnov.achilles.annotations.Column("aliasId") + private Collection aliasId; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "RequirementVerificationMembership_aliasId", + joinColumns = @JoinColumn(name = "RequirementVerificationMembershipId")) + public Collection getAliasId() { + if (aliasId == null) { + aliasId = new ArrayList<>(); + } + return aliasId; + } + + @JsonSetter + public void setAliasId(Collection aliasId) { + this.aliasId = aliasId; + } + + + + // @info.archinnov.achilles.annotations.Column("constraint") + private ConstraintUsage constraint; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "ConstraintUsageMetaDef", metaColumn = @javax.persistence.Column(name = "constraintType"), fetch = FetchType.LAZY) + @JoinColumn(name = "constraintId", table = "RequirementVerificationMembership") + public ConstraintUsage getConstraint() { + return constraint; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ConstraintUsageImpl.class) + public void setConstraint(ConstraintUsage constraint) { + this.constraint = constraint; + } + + + + // @info.archinnov.achilles.annotations.Column("direction") + // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) + private FeatureDirectionKind direction; + + @JsonGetter + @javax.persistence.Enumerated(EnumType.STRING) + @javax.persistence.Column(name = "direction", table = "RequirementVerificationMembership") + public FeatureDirectionKind getDirection() { + return direction; + } + + @JsonSetter + public void setDirection(FeatureDirectionKind direction) { + this.direction = direction; + } + + + + // @info.archinnov.achilles.annotations.Column("documentation") + private Collection documentation; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_documentation", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(Collection documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentationComment") + private Collection documentationComment; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_documentationComment", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getDocumentationComment() { + if (documentationComment == null) { + documentationComment = new ArrayList<>(); + } + return documentationComment; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = CommentImpl.class) + public void setDocumentationComment(Collection documentationComment) { + this.documentationComment = documentationComment; + } + + + + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "RequirementVerificationMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "RequirementVerificationMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + + // @info.archinnov.achilles.annotations.Column("humanId") + private String humanId; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "humanId", table = "RequirementVerificationMembership") + public String getHumanId() { + return humanId; + } + + @JsonSetter + public void setHumanId(String humanId) { + this.humanId = humanId; + } + + + + // @info.archinnov.achilles.annotations.Column("identifier") + private java.util.UUID identifier; + + @JsonGetter + @javax.persistence.Column(name = "identifier", table = "RequirementVerificationMembership") + public java.util.UUID getIdentifier() { + return identifier; + } + + @JsonSetter + public void setIdentifier(java.util.UUID identifier) { + this.identifier = identifier; + } + + + + // @info.archinnov.achilles.annotations.Column("isComposite") + private Boolean isComposite; + + @JsonGetter + @javax.persistence.Column(name = "isComposite", table = "RequirementVerificationMembership") + public Boolean getIsComposite() { + return isComposite; + } + + @JsonSetter + public void setIsComposite(Boolean isComposite) { + this.isComposite = isComposite; + } + + + + // @info.archinnov.achilles.annotations.Column("isDerived") + private Boolean isDerived; + + @JsonGetter + @javax.persistence.Column(name = "isDerived", table = "RequirementVerificationMembership") + public Boolean getIsDerived() { + return isDerived; + } + + @JsonSetter + public void setIsDerived(Boolean isDerived) { + this.isDerived = isDerived; + } + + + + // @info.archinnov.achilles.annotations.Column("isPort") + private Boolean isPort; + + @JsonGetter + @javax.persistence.Column(name = "isPort", table = "RequirementVerificationMembership") + public Boolean getIsPort() { + return isPort; + } + + @JsonSetter + public void setIsPort(Boolean isPort) { + this.isPort = isPort; + } + + + + // @info.archinnov.achilles.annotations.Column("isPortion") + private Boolean isPortion; + + @JsonGetter + @javax.persistence.Column(name = "isPortion", table = "RequirementVerificationMembership") + public Boolean getIsPortion() { + return isPortion; + } + + @JsonSetter + public void setIsPortion(Boolean isPortion) { + this.isPortion = isPortion; + } + + + + // @info.archinnov.achilles.annotations.Column("isReadOnly") + private Boolean isReadOnly; + + @JsonGetter + @javax.persistence.Column(name = "isReadOnly", table = "RequirementVerificationMembership") + public Boolean getIsReadOnly() { + return isReadOnly; + } + + @JsonSetter + public void setIsReadOnly(Boolean isReadOnly) { + this.isReadOnly = isReadOnly; + } + + + + // @info.archinnov.achilles.annotations.Column("kind") + // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) + private RequirementConstraintKind kind; + + @JsonGetter + @javax.persistence.Enumerated(EnumType.STRING) + @javax.persistence.Column(name = "kind", table = "RequirementVerificationMembership") + public RequirementConstraintKind getKind() { + return kind; + } + + @JsonSetter + public void setKind(RequirementConstraintKind kind) { + this.kind = kind; + } + + + + // @info.archinnov.achilles.annotations.Column("memberElement") + private Element memberElement; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "memberElementType"), fetch = FetchType.LAZY) + @JoinColumn(name = "memberElementId", table = "RequirementVerificationMembership") + public Element getMemberElement() { + return memberElement; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) + public void setMemberElement(Element memberElement) { + this.memberElement = memberElement; + } + + + + // @info.archinnov.achilles.annotations.Column("memberFeature") + private Feature memberFeature; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "memberFeatureType"), fetch = FetchType.LAZY) + @JoinColumn(name = "memberFeatureId", table = "RequirementVerificationMembership") + public Feature getMemberFeature() { + return memberFeature; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setMemberFeature(Feature memberFeature) { + this.memberFeature = memberFeature; + } + + + + // @info.archinnov.achilles.annotations.Column("memberName") + private String memberName; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "memberName", table = "RequirementVerificationMembership") + public String getMemberName() { + return memberName; + } + + @JsonSetter + public void setMemberName(String memberName) { + this.memberName = memberName; + } + + + + // @info.archinnov.achilles.annotations.Column("membershipOwningPackage") + private Package membershipOwningPackage; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "membershipOwningPackageType"), fetch = FetchType.LAZY) + @JoinColumn(name = "membershipOwningPackageId", table = "RequirementVerificationMembership") + public Package getMembershipOwningPackage() { + return membershipOwningPackage; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class) + public void setMembershipOwningPackage(Package membershipOwningPackage) { + this.membershipOwningPackage = membershipOwningPackage; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "name", table = "RequirementVerificationMembership") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private Collection ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_ownedAnnotation", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(Collection ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private Collection ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_ownedElement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(Collection ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedMemberElement") + private Element ownedMemberElement; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberElementType"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedMemberElementId", table = "RequirementVerificationMembership") + public Element getOwnedMemberElement() { + return ownedMemberElement; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) + public void setOwnedMemberElement(Element ownedMemberElement) { + this.ownedMemberElement = ownedMemberElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedMemberFeature") + private Feature ownedMemberFeature; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "ownedMemberFeatureType"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedMemberFeatureId", table = "RequirementVerificationMembership") + public Feature getOwnedMemberFeature() { + return ownedMemberFeature; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwnedMemberFeature(Feature ownedMemberFeature) { + this.ownedMemberFeature = ownedMemberFeature; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_ownedRelatedElement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_ownedRelationship", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRequirement") + private RequirementUsage ownedRequirement; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "ownedRequirementType"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownedRequirementId", table = "RequirementVerificationMembership") + public RequirementUsage getOwnedRequirement() { + return ownedRequirement; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = RequirementUsageImpl.class) + public void setOwnedRequirement(RequirementUsage ownedRequirement) { + this.ownedRequirement = ownedRequirement; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedTextualRepresentation") + private Collection ownedTextualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_ownedTextualRepresentation", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getOwnedTextualRepresentation() { + if (ownedTextualRepresentation == null) { + ownedTextualRepresentation = new ArrayList<>(); + } + return ownedTextualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setOwnedTextualRepresentation(Collection ownedTextualRepresentation) { + this.ownedTextualRepresentation = ownedTextualRepresentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownerType"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownerId", table = "RequirementVerificationMembership") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "RequirementVerificationMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("owningMembership") + private Membership owningMembership; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembershipType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembershipId", table = "RequirementVerificationMembership") + public Membership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = MembershipImpl.class) + public void setOwningMembership(Membership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Package owningNamespace; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespaceId", table = "RequirementVerificationMembership") + public Package getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class) + public void setOwningNamespace(Package owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElementType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElementId", table = "RequirementVerificationMembership") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationshipType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationshipId", table = "RequirementVerificationMembership") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Column("owningType") + private Type owningType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "owningTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningTypeId", table = "RequirementVerificationMembership") + public Type getOwningType() { + return owningType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setOwningType(Type owningType) { + this.owningType = owningType; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_relatedElement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_source", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "RequirementVerificationMembership_target", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("verifiedRequirement") + private RequirementUsage verifiedRequirement; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "verifiedRequirementType"), fetch = FetchType.LAZY) + @JoinColumn(name = "verifiedRequirementId", table = "RequirementVerificationMembership") + public RequirementUsage getVerifiedRequirement() { + return verifiedRequirement; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = RequirementUsageImpl.class) + public void setVerifiedRequirement(RequirementUsage verifiedRequirement) { + this.verifiedRequirement = verifiedRequirement; + } + + + + // @info.archinnov.achilles.annotations.Column("visibility") + // @info.archinnov.achilles.annotations.Enumerated(info.archinnov.achilles.annotations.Enumerated.Encoding.NAME) + private VisibilityKind visibility; + + @JsonGetter + @javax.persistence.Enumerated(EnumType.STRING) + @javax.persistence.Column(name = "visibility", table = "RequirementVerificationMembership") + public VisibilityKind getVisibility() { + return visibility; + } + + @JsonSetter + public void setVisibility(VisibilityKind visibility) { + this.visibility = visibility; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java index 484cc5aa..43713ce7 100644 --- a/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ResultExpressionMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "ResultExpressionMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "ResultExpressionMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -571,6 +609,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "ResultExpressionMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java index 93245f59..e2d8418e 100644 --- a/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ReturnParameterMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "ReturnParameterMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "ReturnParameterMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -590,6 +628,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "ReturnParameterMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java index f9d1633d..bb1a61bd 100644 --- a/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl.java @@ -356,6 +356,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1708,27 +1734,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SatisfyRequirementUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SatisfyRequirementUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1968,32 +1994,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SatisfyRequirementUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Column("reqId") private String reqId; diff --git a/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java index 958f06d6..52469b63 100644 --- a/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SendActionUsageImpl.java @@ -314,6 +314,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1645,27 +1671,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SendActionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SendActionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1884,32 +1910,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SendActionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("target") private Expression target; diff --git a/app/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl.java index 7c433931..d8485491 100644 --- a/app/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SnapshotFeature_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SnapshotFeature_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SnapshotFeature_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SnapshotFeature_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java b/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java index 590c59e7..3e46c6b0 100644 --- a/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SourceEndImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SourceEnd_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SourceEnd_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SourceEnd_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java index bbd1cc67..c4adfa05 100644 --- a/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StateSubactionMembershipImpl.java @@ -179,6 +179,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "StateSubactionMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "StateSubactionMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -589,6 +627,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "StateSubactionMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java b/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java index db9660ee..1864ed25 100644 --- a/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StateUsageImpl.java @@ -356,6 +356,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1687,27 +1713,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "StateUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1926,32 +1952,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "StateUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("stateDefinition") private Collection stateDefinition; diff --git a/app/org/omg/sysml/metamodel/impl/StepImpl.java b/app/org/omg/sysml/metamodel/impl/StepImpl.java index 1a755d9b..1da7bd8f 100644 --- a/app/org/omg/sysml/metamodel/impl/StepImpl.java +++ b/app/org/omg/sysml/metamodel/impl/StepImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -1010,27 +1036,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Step_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Step_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1207,32 +1233,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Step_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java index 5f4c12a9..00c94558 100644 --- a/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SubjectMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "SubjectMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "SubjectMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -609,6 +647,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "SubjectMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java b/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java index 161e0daa..b238e52b 100644 --- a/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SuccessionImpl.java @@ -319,6 +319,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("guardExpression") private Collection guardExpression; @@ -778,32 +804,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Succession_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1154,27 +1154,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Succession_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Succession_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1344,32 +1344,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Succession_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java b/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java index a59967b3..cf6e16bf 100644 --- a/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java +++ b/app/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl.java @@ -345,6 +345,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("guardExpression") private Collection guardExpression; @@ -908,32 +934,6 @@ public void setOwnedAnnotation(Collection ownedAnnotation) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedAssociationType") - private Collection ownedAssociationType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "AssociationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionItemFlow_ownedAssociationType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedAssociationType() { - if (ownedAssociationType == null) { - ownedAssociationType = new ArrayList<>(); - } - return ownedAssociationType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AssociationImpl.class) - public void setOwnedAssociationType(Collection ownedAssociationType) { - this.ownedAssociationType = ownedAssociationType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("ownedConjugator") private Conjugation ownedConjugator; @@ -1284,27 +1284,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionItemFlow_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "SuccessionItemFlow_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1500,32 +1500,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "SuccessionItemFlow_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("relatedElement") private List relatedElement; diff --git a/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java b/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java index 96698ea9..8ee8fb69 100644 --- a/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TargetEndImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TargetEnd_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TargetEnd_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TargetEnd_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl.java b/app/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl.java index fd4500a9..549c18b4 100644 --- a/app/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TimeSliceFeature_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -984,27 +1010,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TimeSliceFeature_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TimeSliceFeature_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1155,32 +1181,6 @@ public void setOwningType(Type owningType) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TimeSliceFeature_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/TransferActionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/TransferActionUsageImpl.java index 13c00d09..640b6659 100644 --- a/app/org/omg/sysml/metamodel/impl/TransferActionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TransferActionUsageImpl.java @@ -314,6 +314,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TransferActionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1645,27 +1671,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TransferActionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TransferActionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1884,32 +1910,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TransferActionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java b/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java index 631f4ba9..7b9145e9 100644 --- a/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TransitionFeatureMembershipImpl.java @@ -160,6 +160,44 @@ public void setDocumentationComment(Collection documentationComment) { + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "TransitionFeatureMembership") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "TransitionFeatureMembership") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Column("humanId") private String humanId; @@ -570,6 +608,27 @@ public void setOwner(Element owner) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "TransitionFeatureMembership") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + // @info.archinnov.achilles.annotations.Column("owningMembership") private Membership owningMembership; diff --git a/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java b/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java index de394c7c..b2d8220e 100644 --- a/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/TransitionUsageImpl.java @@ -319,6 +319,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1676,27 +1702,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TransitionUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TransitionUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1915,32 +1941,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "TransitionUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("source") private ActionUsage source; diff --git a/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java b/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java new file mode 100644 index 00000000..b3a3b11a --- /dev/null +++ b/app/org/omg/sysml/metamodel/impl/TypeFeaturingImpl.java @@ -0,0 +1,555 @@ +/* + * SysML v2 REST/HTTP Pilot Implementation + * Copyright (C) 2020 InterCAX LLC + * Copyright (C) 2020 California Institute of Technology ("Caltech") + * + * 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.MofObjectSerializer; +import jackson.MofObjectDeserializer; + +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 = "TypeFeaturingImpl") +@SecondaryTable(name = "TypeFeaturing") +@org.hibernate.annotations.Table(appliesTo = "TypeFeaturing", fetch = FetchMode.SELECT, optional = false) +// @info.archinnov.achilles.annotations.Table(table = "TypeFeaturing") +@DiscriminatorValue(value = "TypeFeaturing") +@JsonTypeName(value = "TypeFeaturing") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME) +public class TypeFeaturingImpl extends MofObjectImpl implements TypeFeaturing { + // @info.archinnov.achilles.annotations.Column("aliasId") + private Collection aliasId; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @ElementCollection(targetClass = String.class) + @CollectionTable(name = "TypeFeaturing_aliasId", + joinColumns = @JoinColumn(name = "TypeFeaturingId")) + public Collection getAliasId() { + if (aliasId == null) { + aliasId = new ArrayList<>(); + } + return aliasId; + } + + @JsonSetter + public void setAliasId(Collection aliasId) { + this.aliasId = aliasId; + } + + + + // @info.archinnov.achilles.annotations.Column("documentation") + private Collection documentation; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "DocumentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_documentation", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getDocumentation() { + if (documentation == null) { + documentation = new ArrayList<>(); + } + return documentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = DocumentationImpl.class) + public void setDocumentation(Collection documentation) { + this.documentation = documentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("documentationComment") + private Collection documentationComment; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "CommentMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_documentationComment", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getDocumentationComment() { + if (documentationComment == null) { + documentationComment = new ArrayList<>(); + } + return documentationComment; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = CommentImpl.class) + public void setDocumentationComment(Collection documentationComment) { + this.documentationComment = documentationComment; + } + + + + // @info.archinnov.achilles.annotations.Column("featureOfType") + private Feature featureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featureOfTypeId", table = "TypeFeaturing") + public Feature getFeatureOfType() { + return featureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setFeatureOfType(Feature featureOfType) { + this.featureOfType = featureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("featuringType") + private Type featuringType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "featuringTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "featuringTypeId", table = "TypeFeaturing") + public Type getFeaturingType() { + return featuringType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = TypeImpl.class) + public void setFeaturingType(Type featuringType) { + this.featuringType = featuringType; + } + + + + // @info.archinnov.achilles.annotations.Column("humanId") + private String humanId; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + @javax.persistence.Column(name = "humanId", table = "TypeFeaturing") + public String getHumanId() { + return humanId; + } + + @JsonSetter + public void setHumanId(String humanId) { + this.humanId = humanId; + } + + + + // @info.archinnov.achilles.annotations.Column("identifier") + private java.util.UUID identifier; + + @JsonGetter + @javax.persistence.Column(name = "identifier", table = "TypeFeaturing") + public java.util.UUID getIdentifier() { + return identifier; + } + + @JsonSetter + public void setIdentifier(java.util.UUID identifier) { + this.identifier = identifier; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("name") + private String name; + + @JsonGetter + @Lob + @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType") + // @javax.persistence.Transient + @javax.persistence.Column(name = "name", table = "TypeFeaturing") + public String getName() { + return name; + } + + @JsonSetter + public void setName(String name) { + this.name = name; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedAnnotation") + private Collection ownedAnnotation; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "AnnotationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_ownedAnnotation", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getOwnedAnnotation() { + if (ownedAnnotation == null) { + ownedAnnotation = new ArrayList<>(); + } + return ownedAnnotation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = AnnotationImpl.class) + public void setOwnedAnnotation(Collection ownedAnnotation) { + this.ownedAnnotation = ownedAnnotation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedElement") + private Collection ownedElement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_ownedElement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getOwnedElement() { + if (ownedElement == null) { + ownedElement = new ArrayList<>(); + } + return ownedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedElement(Collection ownedElement) { + this.ownedElement = ownedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelatedElement") + private List ownedRelatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_ownedRelatedElement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getOwnedRelatedElement() { + if (ownedRelatedElement == null) { + ownedRelatedElement = new ArrayList<>(); + } + return ownedRelatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setOwnedRelatedElement(List ownedRelatedElement) { + this.ownedRelatedElement = ownedRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("ownedRelationship") + private List ownedRelationship; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_ownedRelationship", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getOwnedRelationship() { + if (ownedRelationship == null) { + ownedRelationship = new ArrayList<>(); + } + return ownedRelationship; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RelationshipImpl.class) + public void setOwnedRelationship(List ownedRelationship) { + this.ownedRelationship = ownedRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("ownedTextualRepresentation") + private Collection ownedTextualRepresentation; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TextualRepresentationMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_ownedTextualRepresentation", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getOwnedTextualRepresentation() { + if (ownedTextualRepresentation == null) { + ownedTextualRepresentation = new ArrayList<>(); + } + return ownedTextualRepresentation; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TextualRepresentationImpl.class) + public void setOwnedTextualRepresentation(Collection ownedTextualRepresentation) { + this.ownedTextualRepresentation = ownedTextualRepresentation; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owner") + private Element owner; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "ownerType"), fetch = FetchType.LAZY) + @JoinColumn(name = "ownerId", table = "TypeFeaturing") + public Element getOwner() { + return owner; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) + public void setOwner(Element owner) { + this.owner = owner; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningFeatureOfType") + private Feature owningFeatureOfType; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "owningFeatureOfTypeType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningFeatureOfTypeId", table = "TypeFeaturing") + public Feature getOwningFeatureOfType() { + return owningFeatureOfType; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = FeatureImpl.class) + public void setOwningFeatureOfType(Feature owningFeatureOfType) { + this.owningFeatureOfType = owningFeatureOfType; + } + + + + // @info.archinnov.achilles.annotations.Column("owningMembership") + private Membership owningMembership; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "MembershipMetaDef", metaColumn = @javax.persistence.Column(name = "owningMembershipType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningMembershipId", table = "TypeFeaturing") + public Membership getOwningMembership() { + return owningMembership; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = MembershipImpl.class) + public void setOwningMembership(Membership owningMembership) { + this.owningMembership = owningMembership; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("owningNamespace") + private Package owningNamespace; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + // @javax.persistence.Transient + @Any(metaDef = "PackageMetaDef", metaColumn = @javax.persistence.Column(name = "owningNamespaceType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningNamespaceId", table = "TypeFeaturing") + public Package getOwningNamespace() { + return owningNamespace; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = PackageImpl.class) + public void setOwningNamespace(Package owningNamespace) { + this.owningNamespace = owningNamespace; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelatedElement") + private Element owningRelatedElement; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelatedElementType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelatedElementId", table = "TypeFeaturing") + public Element getOwningRelatedElement() { + return owningRelatedElement; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = ElementImpl.class) + public void setOwningRelatedElement(Element owningRelatedElement) { + this.owningRelatedElement = owningRelatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("owningRelationship") + private Relationship owningRelationship; + + @JsonGetter + @JsonSerialize(using = MofObjectSerializer.class) + @Any(metaDef = "RelationshipMetaDef", metaColumn = @javax.persistence.Column(name = "owningRelationshipType"), fetch = FetchType.LAZY) + @JoinColumn(name = "owningRelationshipId", table = "TypeFeaturing") + public Relationship getOwningRelationship() { + return owningRelationship; + } + + @JsonSetter + @JsonDeserialize(using = MofObjectDeserializer.class, as = RelationshipImpl.class) + public void setOwningRelationship(Relationship owningRelationship) { + this.owningRelationship = owningRelationship; + } + + + + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("relatedElement") + private List relatedElement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_relatedElement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getRelatedElement() { + if (relatedElement == null) { + relatedElement = new ArrayList<>(); + } + return relatedElement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setRelatedElement(List relatedElement) { + this.relatedElement = relatedElement; + } + + + + // @info.archinnov.achilles.annotations.Column("source") + private List source; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_source", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getSource() { + if (source == null) { + source = new ArrayList<>(); + } + return source; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setSource(List source) { + this.source = source; + } + + + + // @info.archinnov.achilles.annotations.Column("target") + private List target; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + @ManyToAny(metaDef = "ElementMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "TypeFeaturing_target", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public List getTarget() { + if (target == null) { + target = new ArrayList<>(); + } + return target; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = ElementImpl.class) + public void setTarget(List target) { + this.target = target; + } + + + +} diff --git a/app/org/omg/sysml/metamodel/impl/UsageImpl.java b/app/org/omg/sysml/metamodel/impl/UsageImpl.java index b043859f..8023b621 100644 --- a/app/org/omg/sysml/metamodel/impl/UsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/UsageImpl.java @@ -241,6 +241,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1572,27 +1598,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Usage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "Usage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1785,32 +1811,6 @@ public void setOwningUsage(Usage owningUsage) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "Usage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("type") private Collection type; diff --git a/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java b/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java index 7caea641..fe6324ac 100644 --- a/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java +++ b/app/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl.java @@ -1787,4 +1787,30 @@ public void setVariantMembership(Collection variantMembership + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("verifiedRequirement") + private Collection verifiedRequirement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseDefinition_verifiedRequirement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getVerifiedRequirement() { + if (verifiedRequirement == null) { + verifiedRequirement = new ArrayList<>(); + } + return verifiedRequirement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RequirementUsageImpl.class) + public void setVerifiedRequirement(Collection verifiedRequirement) { + this.verifiedRequirement = verifiedRequirement; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java b/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java index 6edc5f0b..c63012cb 100644 --- a/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl.java @@ -335,6 +335,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1708,27 +1734,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "VerificationCaseUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1947,32 +1973,6 @@ public void setParameter(Collection parameter) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "VerificationCaseUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("result") private Feature result; @@ -2138,4 +2138,30 @@ public void setVerificationCaseDefinition(VerificationCaseDefinition verificatio + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("verifiedRequirement") + private Collection verifiedRequirement; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "RequirementUsageMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "VerificationCaseUsage_verifiedRequirement", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getVerifiedRequirement() { + if (verifiedRequirement == null) { + verifiedRequirement = new ArrayList<>(); + } + return verifiedRequirement; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = RequirementUsageImpl.class) + public void setVerifiedRequirement(Collection verifiedRequirement) { + this.verifiedRequirement = verifiedRequirement; + } + + + } diff --git a/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java index 46124a5e..dfb55988 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewUsageImpl.java @@ -267,6 +267,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1624,27 +1650,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ViewUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1863,32 +1889,6 @@ public void setPartDefinition(Collection partDefinition) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ViewUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("rendering") private RenderingUsage rendering; diff --git a/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java b/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java index 8c306139..481f2b88 100644 --- a/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java +++ b/app/org/omg/sysml/metamodel/impl/ViewpointUsageImpl.java @@ -314,6 +314,32 @@ public void setFeatureMembership(List featureMembership) { + // @info.archinnov.achilles.annotations.Transient + // @info.archinnov.achilles.annotations.Column("featuringType") + private Collection featuringType; + + @JsonGetter + @JsonSerialize(contentUsing = MofObjectSerializer.class) + // @javax.persistence.Transient + @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_featuringType", + joinColumns = @JoinColumn(name = "classId"), + inverseJoinColumns = @JoinColumn(name = "attributeId")) + public Collection getFeaturingType() { + if (featuringType == null) { + featuringType = new ArrayList<>(); + } + return featuringType; + } + + @JsonSetter + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) + public void setFeaturingType(Collection featuringType) { + this.featuringType = featuringType; + } + + + // @info.archinnov.achilles.annotations.Transient // @info.archinnov.achilles.annotations.Column("flowFeature") private Collection flowFeature; @@ -1666,27 +1692,27 @@ public void setOwnedTextualRepresentation(Collection owne // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("ownedType") - private Collection ownedType; + // @info.archinnov.achilles.annotations.Column("ownedTypeFeaturing") + private Collection ownedTypeFeaturing; @JsonGetter @JsonSerialize(contentUsing = MofObjectSerializer.class) // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ViewpointUsage_ownedType", + @ManyToAny(metaDef = "TypeFeaturingMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) + @JoinTable(name = "ViewpointUsage_ownedTypeFeaturing", joinColumns = @JoinColumn(name = "classId"), inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getOwnedType() { - if (ownedType == null) { - ownedType = new ArrayList<>(); + public Collection getOwnedTypeFeaturing() { + if (ownedTypeFeaturing == null) { + ownedTypeFeaturing = new ArrayList<>(); } - return ownedType; + return ownedTypeFeaturing; } @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setOwnedType(Collection ownedType) { - this.ownedType = ownedType; + @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeFeaturingImpl.class) + public void setOwnedTypeFeaturing(Collection ownedTypeFeaturing) { + this.ownedTypeFeaturing = ownedTypeFeaturing; } @@ -1926,32 +1952,6 @@ public void setPredicate(Predicate predicate) { - // @info.archinnov.achilles.annotations.Transient - // @info.archinnov.achilles.annotations.Column("referencedType") - private Collection referencedType; - - @JsonGetter - @JsonSerialize(contentUsing = MofObjectSerializer.class) - // @javax.persistence.Transient - @ManyToAny(metaDef = "TypeMetaDef", metaColumn = @javax.persistence.Column(name = "attributeType"), fetch = FetchType.LAZY) - @JoinTable(name = "ViewpointUsage_referencedType", - joinColumns = @JoinColumn(name = "classId"), - inverseJoinColumns = @JoinColumn(name = "attributeId")) - public Collection getReferencedType() { - if (referencedType == null) { - referencedType = new ArrayList<>(); - } - return referencedType; - } - - @JsonSetter - @JsonDeserialize(contentUsing = MofObjectDeserializer.class, contentAs = TypeImpl.class) - public void setReferencedType(Collection referencedType) { - this.referencedType = referencedType; - } - - - // @info.archinnov.achilles.annotations.Column("reqId") private String reqId; diff --git a/app/org/omg/sysml/metamodel/impl/package-info.java b/app/org/omg/sysml/metamodel/impl/package-info.java index f2f1acc4..a4c8a97c 100644 --- a/app/org/omg/sysml/metamodel/impl/package-info.java +++ b/app/org/omg/sysml/metamodel/impl/package-info.java @@ -124,6 +124,7 @@ @MetaValue(value = "RequirementConstraintMembership", targetEntity = RequirementConstraintMembershipImpl.class), @MetaValue(value = "RequirementDefinition", targetEntity = RequirementDefinitionImpl.class), @MetaValue(value = "RequirementUsage", targetEntity = RequirementUsageImpl.class), + @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), @MetaValue(value = "ResultExpressionMembership", targetEntity = ResultExpressionMembershipImpl.class), @MetaValue(value = "ReturnParameterMembership", targetEntity = ReturnParameterMembershipImpl.class), @MetaValue(value = "SatisfyRequirementUsage", targetEntity = SatisfyRequirementUsageImpl.class), @@ -146,6 +147,7 @@ @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), @MetaValue(value = "TransitionUsage", targetEntity = TransitionUsageImpl.class), @MetaValue(value = "Type", targetEntity = TypeImpl.class), + @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), @MetaValue(value = "Usage", targetEntity = UsageImpl.class), @MetaValue(value = "VariantMembership", targetEntity = VariantMembershipImpl.class), @MetaValue(value = "VerificationCaseDefinition", targetEntity = VerificationCaseDefinitionImpl.class), @@ -536,6 +538,7 @@ @MetaValue(value = "RequirementConstraintMembership", targetEntity = RequirementConstraintMembershipImpl.class), @MetaValue(value = "RequirementDefinition", targetEntity = RequirementDefinitionImpl.class), @MetaValue(value = "RequirementUsage", targetEntity = RequirementUsageImpl.class), + @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), @MetaValue(value = "ResultExpressionMembership", targetEntity = ResultExpressionMembershipImpl.class), @MetaValue(value = "ReturnParameterMembership", targetEntity = ReturnParameterMembershipImpl.class), @MetaValue(value = "SatisfyRequirementUsage", targetEntity = SatisfyRequirementUsageImpl.class), @@ -558,6 +561,7 @@ @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), @MetaValue(value = "TransitionUsage", targetEntity = TransitionUsageImpl.class), @MetaValue(value = "Type", targetEntity = TypeImpl.class), + @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), @MetaValue(value = "Usage", targetEntity = UsageImpl.class), @MetaValue(value = "VariantMembership", targetEntity = VariantMembershipImpl.class), @MetaValue(value = "VerificationCaseDefinition", targetEntity = VerificationCaseDefinitionImpl.class), @@ -683,10 +687,10 @@ metaValues = { @MetaValue(value = "EndFeatureMembership", targetEntity = EndFeatureMembershipImpl.class), @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.class), - @MetaValue(value = "FeatureValue", targetEntity = FeatureValueImpl.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 = "StateSubactionMembership", targetEntity = StateSubactionMembershipImpl.class), @@ -858,6 +862,7 @@ @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 = "StateSubactionMembership", targetEntity = StateSubactionMembershipImpl.class), @@ -1094,6 +1099,7 @@ @MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class), @MetaValue(value = "Relationship", targetEntity = RelationshipImpl.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 = "StateSubactionMembership", targetEntity = StateSubactionMembershipImpl.class), @@ -1103,6 +1109,7 @@ @MetaValue(value = "SuccessionItemFlow", targetEntity = SuccessionItemFlowImpl.class), @MetaValue(value = "Superclassing", targetEntity = SuperclassingImpl.class), @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), + @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), @MetaValue(value = "VariantMembership", targetEntity = VariantMembershipImpl.class), }), @AnyMetaDef(name = "RenderingDefinitionMetaDef", metaType = "string", idType = "java.util.UUID", @@ -1116,6 +1123,7 @@ @AnyMetaDef(name = "RequirementConstraintMembershipMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "RequirementConstraintMembership", targetEntity = RequirementConstraintMembershipImpl.class), + @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), }), @AnyMetaDef(name = "RequirementDefinitionMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @@ -1128,6 +1136,10 @@ @MetaValue(value = "SatisfyRequirementUsage", targetEntity = SatisfyRequirementUsageImpl.class), @MetaValue(value = "ViewpointUsage", targetEntity = ViewpointUsageImpl.class), }), + @AnyMetaDef(name = "RequirementVerificationMembershipMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "RequirementVerificationMembership", targetEntity = RequirementVerificationMembershipImpl.class), + }), @AnyMetaDef(name = "ResultExpressionMembershipMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "ResultExpressionMembership", targetEntity = ResultExpressionMembershipImpl.class), @@ -1359,6 +1371,21 @@ @MetaValue(value = "ViewpointDefinition", targetEntity = ViewpointDefinitionImpl.class), @MetaValue(value = "ViewpointUsage", targetEntity = ViewpointUsageImpl.class), }), + @AnyMetaDef(name = "TypeFeaturingMetaDef", metaType = "string", idType = "java.util.UUID", + metaValues = { + @MetaValue(value = "EndFeatureMembership", targetEntity = EndFeatureMembershipImpl.class), + @MetaValue(value = "FeatureMembership", targetEntity = FeatureMembershipImpl.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 = "StateSubactionMembership", targetEntity = StateSubactionMembershipImpl.class), + @MetaValue(value = "SubjectMembership", targetEntity = SubjectMembershipImpl.class), + @MetaValue(value = "TransitionFeatureMembership", targetEntity = TransitionFeatureMembershipImpl.class), + @MetaValue(value = "TypeFeaturing", targetEntity = TypeFeaturingImpl.class), + }), @AnyMetaDef(name = "UsageMetaDef", metaType = "string", idType = "java.util.UUID", metaValues = { @MetaValue(value = "AcceptActionUsage", targetEntity = AcceptActionUsageImpl.class), diff --git a/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java index 98932afd..ac246854 100644 --- a/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AcceptActionUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.metamodel.imp public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.metamodel.imp public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.metamodel.imp public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class AcceptActionUsageImpl_ extends org.omg.sysml.metamodel.imp 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java index b9447f1e..68d5bd54 100644 --- a/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ActionUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ActionUsageImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class ActionUsageImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class ActionUsageImpl_ extends org.omg.sysml.metamodel.impl.MofO public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class ActionUsageImpl_ extends org.omg.sysml.metamodel.impl.MofO 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java index c8cd2f9a..d589f45e 100644 --- a/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AnalysisCaseUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.metamodel.imp public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.metamodel.imp public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -123,6 +124,7 @@ public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.metamodel.imp public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -150,14 +152,13 @@ public abstract class AnalysisCaseUsageImpl_ extends org.omg.sysml.metamodel.imp 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java index 6d22a089..b05a399d 100644 --- a/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AssertConstraintUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class AssertConstraintUsageImpl_ extends org.omg.sysml.metamodel public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -77,14 +79,13 @@ public abstract class AssertConstraintUsageImpl_ extends org.omg.sysml.metamodel public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -121,6 +122,7 @@ public abstract class AssertConstraintUsageImpl_ extends org.omg.sysml.metamodel public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -147,14 +149,13 @@ public abstract class AssertConstraintUsageImpl_ extends org.omg.sysml.metamodel 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java index 930bce29..6e32870e 100644 --- a/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/AttributeUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -77,14 +79,13 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -120,6 +121,7 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -146,14 +148,13 @@ public abstract class AttributeUsageImpl_ extends org.omg.sysml.metamodel.impl.M 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java b/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java index 8d0d659a..aeed6cc8 100644 --- a/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BindingConnectorImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(BindingConnectorImpl.class) public abstract class BindingConnectorImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -43,13 +45,11 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.metamodel.impl public static volatile CollectionAttribute ownedFeature; public static volatile CollectionAttribute documentation; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; public static volatile ListAttribute ownedMember; @@ -80,6 +80,7 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.metamodel.impl public static volatile CollectionAttribute aliasId; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -95,13 +96,11 @@ public abstract class BindingConnectorImpl_ extends org.omg.sysml.metamodel.impl public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String END_FEATURE = "endFeature"; - public static final String OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; public static final String OWNED_MEMBER = "ownedMember"; diff --git a/generated/org/omg/sysml/metamodel/impl/BlockExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/BlockExpressionImpl_.java index d97b753b..37b81f31 100644 --- a/generated/org/omg/sysml/metamodel/impl/BlockExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BlockExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(BlockExpressionImpl.class) public abstract class BlockExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class BlockExpressionImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class BlockExpressionImpl_ extends org.omg.sysml.metamodel.impl. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java index 9c518b42..0c749799 100644 --- a/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/BooleanExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(BooleanExpressionImpl.class) public abstract class BooleanExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.metamodel.imp public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class BooleanExpressionImpl_ extends org.omg.sysml.metamodel.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java index 7636d866..ca30b907 100644 --- a/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CalculationUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class CalculationUsageImpl_ extends org.omg.sysml.metamodel.impl public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class CalculationUsageImpl_ extends org.omg.sysml.metamodel.impl public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class CalculationUsageImpl_ extends org.omg.sysml.metamodel.impl public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class CalculationUsageImpl_ extends org.omg.sysml.metamodel.impl 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java index 01f42bbd..4484444b 100644 --- a/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/CaseUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class CaseUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class CaseUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class CaseUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class CaseUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java index ff8b35db..6efbfacb 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConnectionUsageImpl_.java @@ -41,6 +41,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -53,6 +54,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -80,16 +82,14 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; public static volatile CollectionAttribute connectionDefinition; @@ -134,6 +134,7 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -161,16 +162,14 @@ public abstract class ConnectionUsageImpl_ extends org.omg.sysml.metamodel.impl. 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 OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; public static final String CONNECTION_DEFINITION = "connectionDefinition"; diff --git a/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java index 62a5eaf6..93fa2981 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConnectorImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ConnectorImpl.class) public abstract class ConnectorImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -43,13 +45,11 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute ownedFeature; public static volatile CollectionAttribute documentation; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; public static volatile ListAttribute ownedMember; @@ -80,6 +80,7 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute aliasId; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -95,13 +96,11 @@ public abstract class ConnectorImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String END_FEATURE = "endFeature"; - public static final String OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; public static final String OWNED_MEMBER = "ownedMember"; diff --git a/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java index 8cdfbdbe..4787912f 100644 --- a/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ConstraintUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ConstraintUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -77,14 +79,13 @@ public abstract class ConstraintUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -121,6 +122,7 @@ public abstract class ConstraintUsageImpl_ extends org.omg.sysml.metamodel.impl. public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -147,14 +149,13 @@ public abstract class ConstraintUsageImpl_ extends org.omg.sysml.metamodel.impl. 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java index 0ce70c49..047bfda8 100644 --- a/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ControlNodeImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ControlNodeImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class ControlNodeImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class ControlNodeImpl_ extends org.omg.sysml.metamodel.impl.MofO public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class ControlNodeImpl_ extends org.omg.sysml.metamodel.impl.MofO 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; 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 333ff7fc..39b23fb5 100644 --- a/generated/org/omg/sysml/metamodel/impl/DecisionNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/DecisionNodeImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class DecisionNodeImpl_ extends org.omg.sysml.metamodel.impl.Mof public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class DecisionNodeImpl_ extends org.omg.sysml.metamodel.impl.Mof public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class DecisionNodeImpl_ extends org.omg.sysml.metamodel.impl.Mof public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class DecisionNodeImpl_ extends org.omg.sysml.metamodel.impl.Mof 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java index 48f2dad2..ad225bb0 100644 --- a/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ExhibitStateUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.metamodel.imp public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -79,14 +81,13 @@ public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.metamodel.imp public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -123,6 +124,7 @@ public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.metamodel.imp public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -151,14 +153,13 @@ public abstract class ExhibitStateUsageImpl_ extends org.omg.sysml.metamodel.imp 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java index 787cabd7..1333cb8b 100644 --- a/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ExpressionImpl.class) public abstract class ExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class ExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java index 33acfea9..1e295b85 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(FeatureImpl.class) public abstract class FeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class FeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjec public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class FeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjec public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java index 398dab66..dc5060fa 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureReferenceExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(FeatureReferenceExpressionImpl.class) public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.meta public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class FeatureReferenceExpressionImpl_ extends org.omg.sysml.meta public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java b/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java index 38aba364..a3895984 100644 --- a/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/FeatureValueImpl_.java @@ -10,7 +10,6 @@ import org.omg.sysml.metamodel.Comment; import org.omg.sysml.metamodel.Documentation; import org.omg.sysml.metamodel.Element; -import org.omg.sysml.metamodel.FeatureDirectionKind; import org.omg.sysml.metamodel.Relationship; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.VisibilityKind; @@ -20,7 +19,6 @@ public abstract class FeatureValueImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile SingularAttribute identifier; - public static volatile SingularAttribute isDerived; public static volatile CollectionAttribute ownedAnnotation; public static volatile CollectionAttribute ownedElement; public static volatile SingularAttribute visibility; @@ -29,21 +27,15 @@ public abstract class FeatureValueImpl_ extends org.omg.sysml.metamodel.impl.Mof public static volatile SingularAttribute memberName; public static volatile ListAttribute ownedRelatedElement; public static volatile ListAttribute source; - public static volatile SingularAttribute isPort; - public static volatile SingularAttribute isPortion; public static volatile ListAttribute target; public static volatile CollectionAttribute ownedTextualRepresentation; - public static volatile SingularAttribute isComposite; - public static volatile SingularAttribute isReadOnly; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; public static volatile ListAttribute relatedElement; public static volatile SingularAttribute name; public static volatile CollectionAttribute documentationComment; - public static volatile SingularAttribute direction; public static final String IDENTIFIER = "identifier"; - public static final String IS_DERIVED = "isDerived"; public static final String OWNED_ANNOTATION = "ownedAnnotation"; public static final String OWNED_ELEMENT = "ownedElement"; public static final String VISIBILITY = "visibility"; @@ -52,18 +44,13 @@ public abstract class FeatureValueImpl_ extends org.omg.sysml.metamodel.impl.Mof 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 IS_PORT = "isPort"; - public static final String IS_PORTION = "isPortion"; public static final String TARGET = "target"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; - public static final String IS_COMPOSITE = "isComposite"; - public static final String IS_READ_ONLY = "isReadOnly"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; public static final String RELATED_ELEMENT = "relatedElement"; public static final String NAME = "name"; public static final String DOCUMENTATION_COMMENT = "documentationComment"; - public static final String DIRECTION = "direction"; } diff --git a/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java index cf3219a8..7b5a4d27 100644 --- a/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ForkNodeImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ForkNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class ForkNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class ForkNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class ForkNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/IndividualUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/IndividualUsageImpl_.java index 0cde9f05..70052038 100644 --- a/generated/org/omg/sysml/metamodel/impl/IndividualUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/IndividualUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class IndividualUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isTimeSlice; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; @@ -78,14 +80,13 @@ public abstract class IndividualUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile SingularAttribute isSnapshot; public static volatile ListAttribute ownedMember; @@ -122,6 +123,7 @@ public abstract class IndividualUsageImpl_ extends org.omg.sysml.metamodel.impl. public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_TIME_SLICE = "isTimeSlice"; public static final String IS_CONJUGATED = "isConjugated"; public static final String USAGE = "usage"; @@ -149,14 +151,13 @@ public abstract class IndividualUsageImpl_ extends org.omg.sysml.metamodel.impl. 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String IS_SNAPSHOT = "isSnapshot"; public static final String OWNED_MEMBER = "ownedMember"; diff --git a/generated/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl_.java index 26d9e9af..f7f27dd0 100644 --- a/generated/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InstanceCreationExpressionImpl_.java @@ -23,6 +23,7 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(InstanceCreationExpressionImpl.class) @@ -30,6 +31,7 @@ public abstract class InstanceCreationExpressionImpl_ extends org.omg.sysml.meta public static volatile ListAttribute ownedGeneralization; public static volatile ListAttribute argument; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -60,21 +62,21 @@ public abstract class InstanceCreationExpressionImpl_ extends org.omg.sysml.meta public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String ARGUMENT = "argument"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -105,15 +107,14 @@ public abstract class InstanceCreationExpressionImpl_ extends org.omg.sysml.meta public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java index dc583721..9f3dbbfd 100644 --- a/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InterfaceUsageImpl_.java @@ -41,6 +41,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -53,6 +54,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -80,16 +82,14 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; public static volatile CollectionAttribute connectionDefinition; @@ -134,6 +134,7 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -161,16 +162,14 @@ public abstract class InterfaceUsageImpl_ extends org.omg.sysml.metamodel.impl.M 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 OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; public static final String CONNECTION_DEFINITION = "connectionDefinition"; diff --git a/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java b/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java index d66af7fa..486836ee 100644 --- a/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InvariantImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(InvariantImpl.class) public abstract class InvariantImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class InvariantImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class InvariantImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java index ee54d7fa..c605319e 100644 --- a/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/InvocationExpressionImpl_.java @@ -23,6 +23,7 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(InvocationExpressionImpl.class) @@ -30,6 +31,7 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.metamodel. public static volatile ListAttribute ownedGeneralization; public static volatile ListAttribute argument; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -60,21 +62,21 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.metamodel. public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String ARGUMENT = "argument"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -105,15 +107,14 @@ public abstract class InvocationExpressionImpl_ extends org.omg.sysml.metamodel. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java index c740f5f8..fd8e7e70 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFeatureImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFeatureImpl.class) public abstract class ItemFeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class ItemFeatureImpl_ extends org.omg.sysml.metamodel.impl.MofO public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java index 72d9b11f..2b5ef5f6 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFlowEndImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFlowEndImpl.class) public abstract class ItemFlowEndImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class ItemFlowEndImpl_ extends org.omg.sysml.metamodel.impl.MofO public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java index 8894f8bb..f8bf60ab 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFlowFeatureImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFlowFeatureImpl.class) public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class ItemFlowFeatureImpl_ extends org.omg.sysml.metamodel.impl. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java index eb4754e8..bd7e0d89 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemFlowImpl_.java @@ -27,12 +27,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(ItemFlowImpl.class) public abstract class ItemFlowImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -49,15 +51,13 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static volatile CollectionAttribute ownedFeature; public static volatile CollectionAttribute documentation; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile CollectionAttribute itemFeature; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile ListAttribute targetInputFeature; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; public static volatile CollectionAttribute itemFlowEnd; @@ -93,6 +93,7 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static volatile CollectionAttribute aliasId; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -109,15 +110,13 @@ public abstract class ItemFlowImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String END_FEATURE = "endFeature"; - public static final String OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; public static final String ITEM_FLOW_END = "itemFlowEnd"; diff --git a/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java index 470f1023..cfa4dfc1 100644 --- a/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ItemUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -77,14 +79,13 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -120,6 +121,7 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -146,14 +148,13 @@ public abstract class ItemUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java index 06a172fb..788cd311 100644 --- a/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/JoinNodeImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class JoinNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class JoinNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class JoinNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class JoinNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObje 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; 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 3b398d68..74ec5f04 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralBooleanImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralBooleanImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralBooleanImpl.class) public abstract class LiteralBooleanImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -59,20 +61,20 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -104,15 +106,14 @@ public abstract class LiteralBooleanImpl_ extends org.omg.sysml.metamodel.impl.M public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java index 617535ed..190aaa15 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralExpressionImpl.class) public abstract class LiteralExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.metamodel.imp public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class LiteralExpressionImpl_ extends org.omg.sysml.metamodel.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java index 1f34f67d..53d11a70 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralIntegerImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralIntegerImpl.class) public abstract class LiteralIntegerImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -59,20 +61,20 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -104,15 +106,14 @@ public abstract class LiteralIntegerImpl_ extends org.omg.sysml.metamodel.impl.M public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralRealImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralRealImpl_.java index 3eed5683..d9368a59 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralRealImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralRealImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralRealImpl.class) public abstract class LiteralRealImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -59,20 +61,20 @@ public abstract class LiteralRealImpl_ extends org.omg.sysml.metamodel.impl.MofO public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -104,15 +106,14 @@ public abstract class LiteralRealImpl_ extends org.omg.sysml.metamodel.impl.MofO public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java index f1650a07..5cf567a9 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralStringImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralStringImpl.class) public abstract class LiteralStringImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -59,20 +61,20 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.metamodel.impl.Mo public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -104,15 +106,14 @@ public abstract class LiteralStringImpl_ extends org.omg.sysml.metamodel.impl.Mo public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl_.java b/generated/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl_.java index 2df89159..2cada6e6 100644 --- a/generated/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/LiteralUnboundedImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(LiteralUnboundedImpl.class) public abstract class LiteralUnboundedImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class LiteralUnboundedImpl_ extends org.omg.sysml.metamodel.impl public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class LiteralUnboundedImpl_ extends org.omg.sysml.metamodel.impl public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java b/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java index 80cae6cb..1f8eaa6b 100644 --- a/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MergeNodeImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class MergeNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class MergeNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class MergeNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class MergeNodeImpl_ extends org.omg.sysml.metamodel.impl.MofObj 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java b/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java index 5519b3cb..37221ce8 100644 --- a/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MultiplicityImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(MultiplicityImpl.class) public abstract class MultiplicityImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.metamodel.impl.Mof public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class MultiplicityImpl_ extends org.omg.sysml.metamodel.impl.Mof public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java b/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java index 8cd9e1e1..5b786ea8 100644 --- a/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/MultiplicityRangeImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(MultiplicityRangeImpl.class) public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -57,20 +59,20 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.metamodel.imp public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -100,15 +102,14 @@ public abstract class MultiplicityRangeImpl_ extends org.omg.sysml.metamodel.imp public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java index 40ce6e4c..f7c0c4c5 100644 --- a/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/NullExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(NullExpressionImpl.class) public abstract class NullExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class NullExpressionImpl_ extends org.omg.sysml.metamodel.impl.M public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java index 0f05e90c..ea7a7fcd 100644 --- a/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/OperatorExpressionImpl_.java @@ -23,6 +23,7 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(OperatorExpressionImpl.class) @@ -30,6 +31,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.metamodel.im public static volatile ListAttribute ownedGeneralization; public static volatile ListAttribute argument; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -61,15 +63,14 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.metamodel.im public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute operand; @@ -77,6 +78,7 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.metamodel.im public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String ARGUMENT = "argument"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -108,15 +110,14 @@ public abstract class OperatorExpressionImpl_ extends org.omg.sysml.metamodel.im public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OPERAND = "operand"; diff --git a/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java index bff8da8c..58b9dfef 100644 --- a/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PartUsageImpl_.java @@ -40,6 +40,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -52,6 +53,7 @@ public abstract class PartUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class PartUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class PartUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -148,14 +150,13 @@ public abstract class PartUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java index 85b15257..ba3da40e 100644 --- a/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PerformActionUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class PerformActionUsageImpl_ extends org.omg.sysml.metamodel.im public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class PerformActionUsageImpl_ extends org.omg.sysml.metamodel.im public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class PerformActionUsageImpl_ extends org.omg.sysml.metamodel.im public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class PerformActionUsageImpl_ extends org.omg.sysml.metamodel.im 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java index da03a5ea..d280e38b 100644 --- a/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/PortUsageImpl_.java @@ -38,6 +38,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -50,6 +51,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -76,14 +78,13 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -118,6 +119,7 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -144,14 +146,13 @@ public abstract class PortUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl_.java index ed19c217..89221a64 100644 --- a/generated/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/QueryPathExpressionImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(QueryPathExpressionImpl.class) public abstract class QueryPathExpressionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class QueryPathExpressionImpl_ extends org.omg.sysml.metamodel.i public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class QueryPathExpressionImpl_ extends org.omg.sysml.metamodel.i public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl_.java index 1b8f88fe..616acbcd 100644 --- a/generated/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/QueryPathStepExpressionImpl_.java @@ -23,6 +23,7 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(QueryPathStepExpressionImpl.class) @@ -30,6 +31,7 @@ public abstract class QueryPathStepExpressionImpl_ extends org.omg.sysml.metamod public static volatile ListAttribute ownedGeneralization; public static volatile ListAttribute argument; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -61,15 +63,14 @@ public abstract class QueryPathStepExpressionImpl_ extends org.omg.sysml.metamod public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute operand; @@ -77,6 +78,7 @@ public abstract class QueryPathStepExpressionImpl_ extends org.omg.sysml.metamod public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String ARGUMENT = "argument"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -108,15 +110,14 @@ public abstract class QueryPathStepExpressionImpl_ extends org.omg.sysml.metamod public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OPERAND = "operand"; diff --git a/generated/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl_.java b/generated/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl_.java index b9a87bef..b664d5a7 100644 --- a/generated/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/QueryQualifierExpressionImpl_.java @@ -23,6 +23,7 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(QueryQualifierExpressionImpl.class) @@ -30,6 +31,7 @@ public abstract class QueryQualifierExpressionImpl_ extends org.omg.sysml.metamo public static volatile ListAttribute ownedGeneralization; public static volatile ListAttribute argument; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -61,15 +63,14 @@ public abstract class QueryQualifierExpressionImpl_ extends org.omg.sysml.metamo public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute operand; @@ -77,6 +78,7 @@ public abstract class QueryQualifierExpressionImpl_ extends org.omg.sysml.metamo public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String ARGUMENT = "argument"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -108,15 +110,14 @@ public abstract class QueryQualifierExpressionImpl_ extends org.omg.sysml.metamo public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OPERAND = "operand"; diff --git a/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java index 330c4fa5..0ef4069c 100644 --- a/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ReferenceUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -77,14 +79,13 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -120,6 +121,7 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -146,14 +148,13 @@ public abstract class ReferenceUsageImpl_ extends org.omg.sysml.metamodel.impl.M 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java index bd1f7875..559add41 100644 --- a/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RenderingUsageImpl_.java @@ -40,6 +40,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -52,6 +53,7 @@ public abstract class RenderingUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class RenderingUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class RenderingUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -148,14 +150,13 @@ public abstract class RenderingUsageImpl_ extends org.omg.sysml.metamodel.impl.M 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java index 93638432..0ecdfa9f 100644 --- a/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/RequirementUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.metamodel.impl public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute requiredConstraint; public static volatile CollectionAttribute usage; @@ -79,16 +81,15 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.metamodel.impl public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; public static volatile SingularAttribute reqId; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute assumedConstraint; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -125,6 +126,7 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.metamodel.impl public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; public static final String USAGE = "usage"; @@ -153,16 +155,15 @@ public abstract class RequirementUsageImpl_ extends org.omg.sysml.metamodel.impl 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 REFERENCED_TYPE = "referencedType"; public static final String IS_END = "isEnd"; public static final String NESTED_ITEM = "nestedItem"; public static final String REQ_ID = "reqId"; + 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 ASSUMED_CONSTRAINT = "assumedConstraint"; public static final String NESTED_VIEW = "nestedView"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java b/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java new file mode 100644 index 00000000..4ace8d8d --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/RequirementVerificationMembershipImpl_.java @@ -0,0 +1,72 @@ +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.Annotation; +import org.omg.sysml.metamodel.Comment; +import org.omg.sysml.metamodel.Documentation; +import org.omg.sysml.metamodel.Element; +import org.omg.sysml.metamodel.FeatureDirectionKind; +import org.omg.sysml.metamodel.Relationship; +import org.omg.sysml.metamodel.RequirementConstraintKind; +import org.omg.sysml.metamodel.TextualRepresentation; +import org.omg.sysml.metamodel.VisibilityKind; + +@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") +@StaticMetamodel(RequirementVerificationMembershipImpl.class) +public abstract class RequirementVerificationMembershipImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { + + public static volatile SingularAttribute identifier; + public static volatile SingularAttribute isDerived; + public static volatile CollectionAttribute ownedAnnotation; + public static volatile CollectionAttribute ownedElement; + public static volatile SingularAttribute visibility; + public static volatile SingularAttribute kind; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute documentation; + public static volatile SingularAttribute memberName; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile SingularAttribute isPort; + public static volatile SingularAttribute isPortion; + public static volatile ListAttribute target; + public static volatile CollectionAttribute ownedTextualRepresentation; + public static volatile SingularAttribute isComposite; + public static volatile SingularAttribute isReadOnly; + public static volatile SingularAttribute humanId; + public static volatile CollectionAttribute aliasId; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile CollectionAttribute documentationComment; + public static volatile SingularAttribute direction; + + public static final String IDENTIFIER = "identifier"; + public static final String IS_DERIVED = "isDerived"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String VISIBILITY = "visibility"; + public static final String KIND = "kind"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String DOCUMENTATION = "documentation"; + 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 IS_PORT = "isPort"; + public static final String IS_PORTION = "isPortion"; + public static final String TARGET = "target"; + public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; + public static final String IS_COMPOSITE = "isComposite"; + public static final String IS_READ_ONLY = "isReadOnly"; + public static final String HUMAN_ID = "humanId"; + public static final String ALIAS_ID = "aliasId"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String DOCUMENTATION_COMMENT = "documentationComment"; + public static final String DIRECTION = "direction"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java index 9cffc04c..377b51bd 100644 --- a/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SatisfyRequirementUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.metamod public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute requiredConstraint; public static volatile CollectionAttribute usage; @@ -79,16 +81,15 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.metamod public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; public static volatile SingularAttribute reqId; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute assumedConstraint; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -125,6 +126,7 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.metamod public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; public static final String USAGE = "usage"; @@ -153,16 +155,15 @@ public abstract class SatisfyRequirementUsageImpl_ extends org.omg.sysml.metamod 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 REFERENCED_TYPE = "referencedType"; public static final String IS_END = "isEnd"; public static final String NESTED_ITEM = "nestedItem"; public static final String REQ_ID = "reqId"; + 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 ASSUMED_CONSTRAINT = "assumedConstraint"; public static final String NESTED_VIEW = "nestedView"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java index 09ccf8e2..703b0ddc 100644 --- a/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SendActionUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class SendActionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class SendActionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class SendActionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class SendActionUsageImpl_ extends org.omg.sysml.metamodel.impl. 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl_.java index dfdc8f0c..3789fcad 100644 --- a/generated/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SnapshotFeatureImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SnapshotFeatureImpl.class) public abstract class SnapshotFeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class SnapshotFeatureImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class SnapshotFeatureImpl_ extends org.omg.sysml.metamodel.impl. public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java b/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java index 33cd704a..e4dbd39d 100644 --- a/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SourceEndImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SourceEndImpl.class) public abstract class SourceEndImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class SourceEndImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java index 963bdfb3..a37dcb8b 100644 --- a/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StateUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class StateUsageImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -79,14 +81,13 @@ public abstract class StateUsageImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -123,6 +124,7 @@ public abstract class StateUsageImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -151,14 +153,13 @@ public abstract class StateUsageImpl_ extends org.omg.sysml.metamodel.impl.MofOb 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/StepImpl_.java b/generated/org/omg/sysml/metamodel/impl/StepImpl_.java index 03db3441..36265cfa 100644 --- a/generated/org/omg/sysml/metamodel/impl/StepImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/StepImpl_.java @@ -22,12 +22,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(StepImpl.class) public abstract class StepImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -58,20 +60,20 @@ public abstract class StepImpl_ extends org.omg.sysml.metamodel.impl.MofObjectIm public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -102,15 +104,14 @@ public abstract class StepImpl_ extends org.omg.sysml.metamodel.impl.MofObjectIm public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java b/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java index 8c0af6a2..04ceac4a 100644 --- a/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SuccessionImpl_.java @@ -24,12 +24,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SuccessionImpl.class) public abstract class SuccessionImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -46,13 +48,11 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static volatile CollectionAttribute ownedFeature; public static volatile CollectionAttribute documentation; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; - public static volatile CollectionAttribute ownedType; public static volatile CollectionAttribute effectStep; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; @@ -85,6 +85,7 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static volatile CollectionAttribute aliasId; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -101,13 +102,11 @@ public abstract class SuccessionImpl_ extends org.omg.sysml.metamodel.impl.MofOb public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String END_FEATURE = "endFeature"; - public static final String OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String IS_COMPOSITE = "isComposite"; public static final String RELATED_ELEMENT = "relatedElement"; - public static final String OWNED_TYPE = "ownedType"; public static final String EFFECT_STEP = "effectStep"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; diff --git a/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java b/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java index 1e8e3b6a..36c34216 100644 --- a/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/SuccessionItemFlowImpl_.java @@ -29,12 +29,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(SuccessionItemFlowImpl.class) public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -52,15 +54,13 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.metamodel.im public static volatile CollectionAttribute ownedFeature; public static volatile CollectionAttribute documentation; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute ownedAssociationType; - public static volatile CollectionAttribute referencedType; public static volatile CollectionAttribute itemFeature; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile ListAttribute targetInputFeature; public static volatile SingularAttribute isComposite; public static volatile ListAttribute relatedElement; - public static volatile CollectionAttribute ownedType; public static volatile CollectionAttribute effectStep; public static volatile SingularAttribute name; public static volatile CollectionAttribute connectorEnd; @@ -98,6 +98,7 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.metamodel.im public static volatile CollectionAttribute aliasId; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -115,15 +116,13 @@ public abstract class SuccessionItemFlowImpl_ extends org.omg.sysml.metamodel.im public static final String OWNED_FEATURE = "ownedFeature"; public static final String DOCUMENTATION = "documentation"; public static final String END_FEATURE = "endFeature"; - public static final String OWNED_ASSOCIATION_TYPE = "ownedAssociationType"; - public static final String REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String EFFECT_STEP = "effectStep"; public static final String NAME = "name"; public static final String CONNECTOR_END = "connectorEnd"; diff --git a/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java b/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java index 94f289fe..2994de74 100644 --- a/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TargetEndImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(TargetEndImpl.class) public abstract class TargetEndImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class TargetEndImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl_.java b/generated/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl_.java index 723fd5d6..8508954b 100644 --- a/generated/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TimeSliceFeatureImpl_.java @@ -21,12 +21,14 @@ import org.omg.sysml.metamodel.Subsetting; import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; @Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor") @StaticMetamodel(TimeSliceFeatureImpl.class) public abstract class TimeSliceFeatureImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { public static volatile ListAttribute ownedGeneralization; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile SingularAttribute isUnique; public static volatile CollectionAttribute ownedSubsetting; @@ -55,20 +57,20 @@ public abstract class TimeSliceFeatureImpl_ extends org.omg.sysml.metamodel.impl public static volatile ListAttribute featureMembership; public static volatile CollectionAttribute endFeature; public static volatile ListAttribute ownedImport; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isAbstract; public static volatile SingularAttribute isEnd; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute ownedTextualRepresentation; public static volatile SingularAttribute isComposite; public static volatile SingularAttribute humanId; public static volatile CollectionAttribute aliasId; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static final String OWNED_GENERALIZATION = "ownedGeneralization"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String IS_UNIQUE = "isUnique"; public static final String OWNED_SUBSETTING = "ownedSubsetting"; @@ -97,15 +99,14 @@ public abstract class TimeSliceFeatureImpl_ extends org.omg.sysml.metamodel.impl public static final String FEATURE_MEMBERSHIP = "featureMembership"; public static final String END_FEATURE = "endFeature"; public static final String OWNED_IMPORT = "ownedImport"; - public static final String REFERENCED_TYPE = "referencedType"; public static final String IS_ABSTRACT = "isAbstract"; public static final String IS_END = "isEnd"; + public static final String FEATURING_TYPE = "featuringType"; public static final String INPUT = "input"; public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; public static final String IS_COMPOSITE = "isComposite"; public static final String HUMAN_ID = "humanId"; public static final String ALIAS_ID = "aliasId"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/TransferActionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/TransferActionUsageImpl_.java index cbd1d193..4c193371 100644 --- a/generated/org/omg/sysml/metamodel/impl/TransferActionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TransferActionUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class TransferActionUsageImpl_ extends org.omg.sysml.metamodel.i public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,14 +80,13 @@ public abstract class TransferActionUsageImpl_ extends org.omg.sysml.metamodel.i public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -122,6 +123,7 @@ public abstract class TransferActionUsageImpl_ extends org.omg.sysml.metamodel.i public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,14 +151,13 @@ public abstract class TransferActionUsageImpl_ extends org.omg.sysml.metamodel.i 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java index aa071670..331ea198 100644 --- a/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/TransitionUsageImpl_.java @@ -41,6 +41,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -53,6 +54,7 @@ public abstract class TransitionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -81,14 +83,13 @@ public abstract class TransitionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -127,6 +128,7 @@ public abstract class TransitionUsageImpl_ extends org.omg.sysml.metamodel.impl. public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -155,14 +157,13 @@ public abstract class TransitionUsageImpl_ extends org.omg.sysml.metamodel.impl. 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java b/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java new file mode 100644 index 00000000..489d2928 --- /dev/null +++ b/generated/org/omg/sysml/metamodel/impl/TypeFeaturingImpl_.java @@ -0,0 +1,51 @@ +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.Annotation; +import org.omg.sysml.metamodel.Comment; +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(TypeFeaturingImpl.class) +public abstract class TypeFeaturingImpl_ extends org.omg.sysml.metamodel.impl.MofObjectImpl_ { + + public static volatile SingularAttribute identifier; + public static volatile CollectionAttribute ownedAnnotation; + public static volatile CollectionAttribute ownedElement; + public static volatile ListAttribute ownedRelationship; + public static volatile CollectionAttribute documentation; + public static volatile ListAttribute ownedRelatedElement; + public static volatile ListAttribute source; + public static volatile ListAttribute target; + public static volatile CollectionAttribute ownedTextualRepresentation; + public static volatile SingularAttribute humanId; + public static volatile CollectionAttribute aliasId; + public static volatile ListAttribute relatedElement; + public static volatile SingularAttribute name; + public static volatile CollectionAttribute documentationComment; + + public static final String IDENTIFIER = "identifier"; + public static final String OWNED_ANNOTATION = "ownedAnnotation"; + public static final String OWNED_ELEMENT = "ownedElement"; + public static final String OWNED_RELATIONSHIP = "ownedRelationship"; + public static final String DOCUMENTATION = "documentation"; + public static final String OWNED_RELATED_ELEMENT = "ownedRelatedElement"; + public static final String SOURCE = "source"; + public static final String TARGET = "target"; + public static final String OWNED_TEXTUAL_REPRESENTATION = "ownedTextualRepresentation"; + public static final String HUMAN_ID = "humanId"; + public static final String ALIAS_ID = "aliasId"; + public static final String RELATED_ELEMENT = "relatedElement"; + public static final String NAME = "name"; + public static final String DOCUMENTATION_COMMENT = "documentationComment"; + +} + diff --git a/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java index cb7294d1..ca749743 100644 --- a/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/UsageImpl_.java @@ -38,6 +38,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -50,6 +51,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.metamodel.impl.MofObjectI public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -76,14 +78,13 @@ public abstract class UsageImpl_ extends org.omg.sysml.metamodel.impl.MofObjectI public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -118,6 +119,7 @@ public abstract class UsageImpl_ extends org.omg.sysml.metamodel.impl.MofObjectI public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -144,14 +146,13 @@ public abstract class UsageImpl_ extends org.omg.sysml.metamodel.impl.MofObjectI 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java b/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java index 838aaa57..53880cff 100644 --- a/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/VerificationCaseDefinitionImpl_.java @@ -82,6 +82,7 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.meta public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute ownedState; + public static volatile CollectionAttribute verifiedRequirement; public static volatile ListAttribute membership; public static volatile CollectionAttribute ownedSuperclassing; public static volatile SingularAttribute isVariation; @@ -145,6 +146,7 @@ public abstract class VerificationCaseDefinitionImpl_ extends org.omg.sysml.meta public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String OWNED_STATE = "ownedState"; + public static final String VERIFIED_REQUIREMENT = "verifiedRequirement"; public static final String MEMBERSHIP = "membership"; public static final String OWNED_SUPERCLASSING = "ownedSuperclassing"; public static final String IS_VARIATION = "isVariation"; diff --git a/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java index 4d2dc7b9..8638244b 100644 --- a/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/VerificationCaseUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.metamodel public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -78,18 +80,18 @@ public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.metamodel public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; public static volatile CollectionAttribute actionDefinition; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; public static volatile CollectionAttribute nestedCase; + public static volatile CollectionAttribute verifiedRequirement; public static volatile CollectionAttribute nestedIndividual; public static volatile ListAttribute membership; public static volatile SingularAttribute isNonunique; @@ -122,6 +124,7 @@ public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.metamodel public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -149,18 +152,18 @@ public abstract class VerificationCaseUsageImpl_ extends org.omg.sysml.metamodel 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; public static final String NESTED_CASE = "nestedCase"; + public static final String VERIFIED_REQUIREMENT = "verifiedRequirement"; public static final String NESTED_INDIVIDUAL = "nestedIndividual"; public static final String MEMBERSHIP = "membership"; public static final String IS_NONUNIQUE = "isNonunique"; diff --git a/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java index 399fe817..42777b8a 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewUsageImpl_.java @@ -41,6 +41,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -53,6 +54,7 @@ public abstract class ViewUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute usage; public static volatile SingularAttribute isUnique; @@ -79,14 +81,13 @@ public abstract class ViewUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -125,6 +126,7 @@ public abstract class ViewUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + 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"; @@ -151,14 +153,13 @@ public abstract class ViewUsageImpl_ extends org.omg.sysml.metamodel.impl.MofObj 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 REFERENCED_TYPE = "referencedType"; 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 OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java b/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java index 9b0d9e44..cb7b6e3f 100644 --- a/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java +++ b/generated/org/omg/sysml/metamodel/impl/ViewpointUsageImpl_.java @@ -39,6 +39,7 @@ import org.omg.sysml.metamodel.TextualRepresentation; import org.omg.sysml.metamodel.TransitionUsage; import org.omg.sysml.metamodel.Type; +import org.omg.sysml.metamodel.TypeFeaturing; import org.omg.sysml.metamodel.Usage; import org.omg.sysml.metamodel.VariantMembership; import org.omg.sysml.metamodel.VerificationCaseUsage; @@ -51,6 +52,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile ListAttribute ownedGeneralization; public static volatile CollectionAttribute nestedPart; + public static volatile CollectionAttribute ownedTypeFeaturing; public static volatile SingularAttribute isConjugated; public static volatile CollectionAttribute requiredConstraint; public static volatile CollectionAttribute usage; @@ -79,16 +81,15 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static volatile CollectionAttribute nestedAnalysisCase; public static volatile CollectionAttribute nestedVerificationCase; public static volatile CollectionAttribute endFeature; - public static volatile CollectionAttribute referencedType; public static volatile SingularAttribute isEnd; public static volatile CollectionAttribute nestedItem; public static volatile SingularAttribute reqId; + public static volatile CollectionAttribute featuringType; public static volatile CollectionAttribute input; public static volatile CollectionAttribute nestedCalculation; public static volatile SingularAttribute isComposite; public static volatile CollectionAttribute assumedConstraint; public static volatile CollectionAttribute nestedView; - public static volatile CollectionAttribute ownedType; public static volatile SingularAttribute name; public static volatile ListAttribute ownedMember; public static volatile ListAttribute ownedMembership; @@ -125,6 +126,7 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.metamodel.impl.M public static final String OWNED_GENERALIZATION = "ownedGeneralization"; public static final String NESTED_PART = "nestedPart"; + public static final String OWNED_TYPE_FEATURING = "ownedTypeFeaturing"; public static final String IS_CONJUGATED = "isConjugated"; public static final String REQUIRED_CONSTRAINT = "requiredConstraint"; public static final String USAGE = "usage"; @@ -153,16 +155,15 @@ public abstract class ViewpointUsageImpl_ extends org.omg.sysml.metamodel.impl.M 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 REFERENCED_TYPE = "referencedType"; public static final String IS_END = "isEnd"; public static final String NESTED_ITEM = "nestedItem"; public static final String REQ_ID = "reqId"; + 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 ASSUMED_CONSTRAINT = "assumedConstraint"; public static final String NESTED_VIEW = "nestedView"; - public static final String OWNED_TYPE = "ownedType"; public static final String NAME = "name"; public static final String OWNED_MEMBER = "ownedMember"; public static final String OWNED_MEMBERSHIP = "ownedMembership"; diff --git a/public/jsonld/AcceptActionUsage.jsonld b/public/jsonld/AcceptActionUsage.jsonld index 1665c47f..70050161 100644 --- a/public/jsonld/AcceptActionUsage.jsonld +++ b/public/jsonld/AcceptActionUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -71,7 +72,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -82,7 +83,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/ActionUsage.jsonld b/public/jsonld/ActionUsage.jsonld index ec7e019b..0b5521f9 100644 --- a/public/jsonld/ActionUsage.jsonld +++ b/public/jsonld/ActionUsage.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/AnalysisCaseUsage.jsonld b/public/jsonld/AnalysisCaseUsage.jsonld index 6d1753fe..64cd0e0c 100644 --- a/public/jsonld/AnalysisCaseUsage.jsonld +++ b/public/jsonld/AnalysisCaseUsage.jsonld @@ -18,6 +18,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -76,7 +77,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -87,7 +88,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "resultExpression": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, diff --git a/public/jsonld/AssertConstraintUsage.jsonld b/public/jsonld/AssertConstraintUsage.jsonld index 61d4c873..d1797767 100644 --- a/public/jsonld/AssertConstraintUsage.jsonld +++ b/public/jsonld/AssertConstraintUsage.jsonld @@ -16,6 +16,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -73,7 +74,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -85,7 +86,6 @@ "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/Association.jsonld b/public/jsonld/Association.jsonld index 98593976..e4fb4795 100644 --- a/public/jsonld/Association.jsonld +++ b/public/jsonld/Association.jsonld @@ -41,7 +41,6 @@ "ownedSuperclassing": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningConnector": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/AttributeUsage.jsonld b/public/jsonld/AttributeUsage.jsonld index 70aaa930..69d6f9bb 100644 --- a/public/jsonld/AttributeUsage.jsonld +++ b/public/jsonld/AttributeUsage.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -69,7 +70,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -79,7 +80,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/BindingConnector.jsonld b/public/jsonld/BindingConnector.jsonld index c74cf7ed..4d98929f 100644 --- a/public/jsonld/BindingConnector.jsonld +++ b/public/jsonld/BindingConnector.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -35,7 +36,6 @@ "name": {"@type": "xsd:string"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,7 +50,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -59,7 +59,6 @@ "owningRelatedElement": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/BlockExpression.jsonld b/public/jsonld/BlockExpression.jsonld index 6470ee4a..bda0265e 100644 --- a/public/jsonld/BlockExpression.jsonld +++ b/public/jsonld/BlockExpression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/BooleanExpression.jsonld b/public/jsonld/BooleanExpression.jsonld index 7e5a2506..8874a0bf 100644 --- a/public/jsonld/BooleanExpression.jsonld +++ b/public/jsonld/BooleanExpression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -57,7 +58,6 @@ "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/CalculationUsage.jsonld b/public/jsonld/CalculationUsage.jsonld index f3f8777a..1242cc57 100644 --- a/public/jsonld/CalculationUsage.jsonld +++ b/public/jsonld/CalculationUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -72,7 +73,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -83,7 +84,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/CaseUsage.jsonld b/public/jsonld/CaseUsage.jsonld index a0910d84..64b26402 100644 --- a/public/jsonld/CaseUsage.jsonld +++ b/public/jsonld/CaseUsage.jsonld @@ -16,6 +16,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -74,7 +75,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -85,7 +86,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, "type": {"@type": "@id"}, diff --git a/public/jsonld/ConnectionDefinition.jsonld b/public/jsonld/ConnectionDefinition.jsonld index 878aa098..b3933b9a 100644 --- a/public/jsonld/ConnectionDefinition.jsonld +++ b/public/jsonld/ConnectionDefinition.jsonld @@ -65,7 +65,6 @@ "ownedView": {"@type": "@id"}, "ownedViewpoint": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningConnector": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/ConnectionUsage.jsonld b/public/jsonld/ConnectionUsage.jsonld index a7ebba88..6665f5dc 100644 --- a/public/jsonld/ConnectionUsage.jsonld +++ b/public/jsonld/ConnectionUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -60,7 +61,6 @@ "nestedViewpoint": {"@type": "@id"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -75,7 +75,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -87,7 +87,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "partDefinition": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/Connector.jsonld b/public/jsonld/Connector.jsonld index c74cf7ed..4d98929f 100644 --- a/public/jsonld/Connector.jsonld +++ b/public/jsonld/Connector.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -35,7 +36,6 @@ "name": {"@type": "xsd:string"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -50,7 +50,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -59,7 +59,6 @@ "owningRelatedElement": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/ConstraintUsage.jsonld b/public/jsonld/ConstraintUsage.jsonld index f222536d..f6c2fda0 100644 --- a/public/jsonld/ConstraintUsage.jsonld +++ b/public/jsonld/ConstraintUsage.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -71,7 +72,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -83,7 +84,6 @@ "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/ControlNode.jsonld b/public/jsonld/ControlNode.jsonld index ec7e019b..0b5521f9 100644 --- a/public/jsonld/ControlNode.jsonld +++ b/public/jsonld/ControlNode.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/DecisionNode.jsonld b/public/jsonld/DecisionNode.jsonld index ec7e019b..0b5521f9 100644 --- a/public/jsonld/DecisionNode.jsonld +++ b/public/jsonld/DecisionNode.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/EndFeatureMembership.jsonld b/public/jsonld/EndFeatureMembership.jsonld index 2acb8800..07b90dfd 100644 --- a/public/jsonld/EndFeatureMembership.jsonld +++ b/public/jsonld/EndFeatureMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -29,6 +31,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/ExhibitStateUsage.jsonld b/public/jsonld/ExhibitStateUsage.jsonld index 5d274750..3d64f96e 100644 --- a/public/jsonld/ExhibitStateUsage.jsonld +++ b/public/jsonld/ExhibitStateUsage.jsonld @@ -18,6 +18,7 @@ "exitAction": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -74,7 +75,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -85,7 +86,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "stateDefinition": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/Expression.jsonld b/public/jsonld/Expression.jsonld index 6470ee4a..bda0265e 100644 --- a/public/jsonld/Expression.jsonld +++ b/public/jsonld/Expression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/Feature.jsonld b/public/jsonld/Feature.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/Feature.jsonld +++ b/public/jsonld/Feature.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/FeatureMembership.jsonld b/public/jsonld/FeatureMembership.jsonld index 2acb8800..07b90dfd 100644 --- a/public/jsonld/FeatureMembership.jsonld +++ b/public/jsonld/FeatureMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -29,6 +31,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/FeatureReferenceExpression.jsonld b/public/jsonld/FeatureReferenceExpression.jsonld index f87d8e99..e3ea7ea1 100644 --- a/public/jsonld/FeatureReferenceExpression.jsonld +++ b/public/jsonld/FeatureReferenceExpression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "referent": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/FeatureValue.jsonld b/public/jsonld/FeatureValue.jsonld index fd5f649f..05bdcc87 100644 --- a/public/jsonld/FeatureValue.jsonld +++ b/public/jsonld/FeatureValue.jsonld @@ -6,26 +6,18 @@ "xsd": "http://www.w3.org/2001/XMLSchema#", "aliasId": {"@type": "xsd:string"}, - "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, "featureWithValue": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, - "isComposite": {"@type": "xsd:boolean"}, - "isDerived": {"@type": "xsd:boolean"}, - "isPort": {"@type": "xsd:boolean"}, - "isPortion": {"@type": "xsd:boolean"}, - "isReadOnly": {"@type": "xsd:boolean"}, "memberElement": {"@type": "@id"}, - "memberFeature": {"@type": "@id"}, "memberName": {"@type": "xsd:string"}, "membershipOwningPackage": {"@type": "@id"}, "name": {"@type": "xsd:string"}, "ownedAnnotation": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedMemberElement": {"@type": "@id"}, - "ownedMemberFeature": {"@type": "@id"}, "ownedRelatedElement": {"@type": "@id"}, "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, @@ -34,7 +26,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, - "owningType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "source": {"@type": "@id"}, "target": {"@type": "@id"}, diff --git a/public/jsonld/ForkNode.jsonld b/public/jsonld/ForkNode.jsonld index ec7e019b..0b5521f9 100644 --- a/public/jsonld/ForkNode.jsonld +++ b/public/jsonld/ForkNode.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/IndividualUsage.jsonld b/public/jsonld/IndividualUsage.jsonld index 58958e04..cd7a9ef6 100644 --- a/public/jsonld/IndividualUsage.jsonld +++ b/public/jsonld/IndividualUsage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -72,7 +73,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -82,7 +83,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "snapshotFeature": {"@type": "@id"}, "timeSliceFeature": {"@type": "@id"}, "type": {"@type": "@id"}, diff --git a/public/jsonld/InstanceCreationExpression.jsonld b/public/jsonld/InstanceCreationExpression.jsonld index 34554cbc..9dac2a24 100644 --- a/public/jsonld/InstanceCreationExpression.jsonld +++ b/public/jsonld/InstanceCreationExpression.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -49,7 +50,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -58,7 +59,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/Interaction.jsonld b/public/jsonld/Interaction.jsonld index 6b069a3b..f7e9b563 100644 --- a/public/jsonld/Interaction.jsonld +++ b/public/jsonld/Interaction.jsonld @@ -41,7 +41,6 @@ "ownedSuperclassing": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningConnector": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/InterfaceDefinition.jsonld b/public/jsonld/InterfaceDefinition.jsonld index b8e0aba0..268f2fe6 100644 --- a/public/jsonld/InterfaceDefinition.jsonld +++ b/public/jsonld/InterfaceDefinition.jsonld @@ -66,7 +66,6 @@ "ownedView": {"@type": "@id"}, "ownedViewpoint": {"@type": "@id"}, "owner": {"@type": "@id"}, - "owningConnector": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/InterfaceUsage.jsonld b/public/jsonld/InterfaceUsage.jsonld index 0996346b..905a5ac2 100644 --- a/public/jsonld/InterfaceUsage.jsonld +++ b/public/jsonld/InterfaceUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -61,7 +62,6 @@ "nestedViewpoint": {"@type": "@id"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -76,7 +76,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -88,7 +88,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "partDefinition": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/Invariant.jsonld b/public/jsonld/Invariant.jsonld index af904220..85b9aad9 100644 --- a/public/jsonld/Invariant.jsonld +++ b/public/jsonld/Invariant.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -48,7 +49,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -58,7 +59,6 @@ "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/InvocationExpression.jsonld b/public/jsonld/InvocationExpression.jsonld index 67d1598d..27db713a 100644 --- a/public/jsonld/InvocationExpression.jsonld +++ b/public/jsonld/InvocationExpression.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -48,7 +49,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -57,7 +58,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/ItemFeature.jsonld b/public/jsonld/ItemFeature.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/ItemFeature.jsonld +++ b/public/jsonld/ItemFeature.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/ItemFlow.jsonld b/public/jsonld/ItemFlow.jsonld index 7c6d6b7d..cdac8a6c 100644 --- a/public/jsonld/ItemFlow.jsonld +++ b/public/jsonld/ItemFlow.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -40,7 +41,6 @@ "name": {"@type": "xsd:string"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -55,7 +55,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -65,7 +65,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/ItemFlowEnd.jsonld b/public/jsonld/ItemFlowEnd.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/ItemFlowEnd.jsonld +++ b/public/jsonld/ItemFlowEnd.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/ItemFlowFeature.jsonld b/public/jsonld/ItemFlowFeature.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/ItemFlowFeature.jsonld +++ b/public/jsonld/ItemFlowFeature.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/ItemUsage.jsonld b/public/jsonld/ItemUsage.jsonld index 7797f94e..5ae26404 100644 --- a/public/jsonld/ItemUsage.jsonld +++ b/public/jsonld/ItemUsage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -69,7 +70,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -79,7 +80,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/JoinNode.jsonld b/public/jsonld/JoinNode.jsonld index ec7e019b..0b5521f9 100644 --- a/public/jsonld/JoinNode.jsonld +++ b/public/jsonld/JoinNode.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/LiteralBoolean.jsonld b/public/jsonld/LiteralBoolean.jsonld index 0148137a..6aa2492f 100644 --- a/public/jsonld/LiteralBoolean.jsonld +++ b/public/jsonld/LiteralBoolean.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "value": {"@type": "xsd:boolean"} diff --git a/public/jsonld/LiteralExpression.jsonld b/public/jsonld/LiteralExpression.jsonld index 6470ee4a..bda0265e 100644 --- a/public/jsonld/LiteralExpression.jsonld +++ b/public/jsonld/LiteralExpression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/LiteralInteger.jsonld b/public/jsonld/LiteralInteger.jsonld index 6bfde7f7..581b5b10 100644 --- a/public/jsonld/LiteralInteger.jsonld +++ b/public/jsonld/LiteralInteger.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "value": {"@type": "xsd:integer"} diff --git a/public/jsonld/LiteralReal.jsonld b/public/jsonld/LiteralReal.jsonld index 729aa6ed..4d81d7ee 100644 --- a/public/jsonld/LiteralReal.jsonld +++ b/public/jsonld/LiteralReal.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "value": {"@type": "xsd:decimal"} diff --git a/public/jsonld/LiteralString.jsonld b/public/jsonld/LiteralString.jsonld index ef410336..a7373034 100644 --- a/public/jsonld/LiteralString.jsonld +++ b/public/jsonld/LiteralString.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"}, "value": {"@type": "xsd:string"} diff --git a/public/jsonld/LiteralUnbounded.jsonld b/public/jsonld/LiteralUnbounded.jsonld index 6470ee4a..bda0265e 100644 --- a/public/jsonld/LiteralUnbounded.jsonld +++ b/public/jsonld/LiteralUnbounded.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/MergeNode.jsonld b/public/jsonld/MergeNode.jsonld index ec7e019b..0b5521f9 100644 --- a/public/jsonld/MergeNode.jsonld +++ b/public/jsonld/MergeNode.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/Multiplicity.jsonld b/public/jsonld/Multiplicity.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/Multiplicity.jsonld +++ b/public/jsonld/Multiplicity.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/MultiplicityRange.jsonld b/public/jsonld/MultiplicityRange.jsonld index 81fbcc22..d3002fc6 100644 --- a/public/jsonld/MultiplicityRange.jsonld +++ b/public/jsonld/MultiplicityRange.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -55,7 +56,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "upperBound": {"@type": "@id"} diff --git a/public/jsonld/NullExpression.jsonld b/public/jsonld/NullExpression.jsonld index 6470ee4a..bda0265e 100644 --- a/public/jsonld/NullExpression.jsonld +++ b/public/jsonld/NullExpression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/ObjectiveMembership.jsonld b/public/jsonld/ObjectiveMembership.jsonld index bad252bd..58d32d33 100644 --- a/public/jsonld/ObjectiveMembership.jsonld +++ b/public/jsonld/ObjectiveMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -30,6 +32,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/OperatorExpression.jsonld b/public/jsonld/OperatorExpression.jsonld index 3d9925be..9326798c 100644 --- a/public/jsonld/OperatorExpression.jsonld +++ b/public/jsonld/OperatorExpression.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -50,7 +51,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -59,7 +60,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/ParameterMembership.jsonld b/public/jsonld/ParameterMembership.jsonld index 1c2ad3b5..dbee2dc9 100644 --- a/public/jsonld/ParameterMembership.jsonld +++ b/public/jsonld/ParameterMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -31,6 +33,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/PartUsage.jsonld b/public/jsonld/PartUsage.jsonld index 1c1adfe1..64da4957 100644 --- a/public/jsonld/PartUsage.jsonld +++ b/public/jsonld/PartUsage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -69,7 +70,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -80,7 +81,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "partDefinition": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/PerformActionUsage.jsonld b/public/jsonld/PerformActionUsage.jsonld index 31ed363c..834dc94b 100644 --- a/public/jsonld/PerformActionUsage.jsonld +++ b/public/jsonld/PerformActionUsage.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -82,7 +83,6 @@ "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, "performedAction": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/PortUsage.jsonld b/public/jsonld/PortUsage.jsonld index 952b8d16..a4ea3599 100644 --- a/public/jsonld/PortUsage.jsonld +++ b/public/jsonld/PortUsage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -68,7 +69,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -80,7 +81,6 @@ "owningUsage": {"@type": "@id"}, "portDefinition": {"@type": "@id"}, "portOwningUsage": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/QueryPathExpression.jsonld b/public/jsonld/QueryPathExpression.jsonld index f87d8e99..e3ea7ea1 100644 --- a/public/jsonld/QueryPathExpression.jsonld +++ b/public/jsonld/QueryPathExpression.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -47,7 +48,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -56,7 +57,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "referent": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/QueryPathStepExpression.jsonld b/public/jsonld/QueryPathStepExpression.jsonld index 3d9925be..9326798c 100644 --- a/public/jsonld/QueryPathStepExpression.jsonld +++ b/public/jsonld/QueryPathStepExpression.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -50,7 +51,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -59,7 +60,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/QueryQualifierExpression.jsonld b/public/jsonld/QueryQualifierExpression.jsonld index 3d9925be..9326798c 100644 --- a/public/jsonld/QueryQualifierExpression.jsonld +++ b/public/jsonld/QueryQualifierExpression.jsonld @@ -14,6 +14,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -50,7 +51,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -59,7 +60,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "type": {"@type": "@id"} diff --git a/public/jsonld/ReferenceUsage.jsonld b/public/jsonld/ReferenceUsage.jsonld index 889e1258..7f3af83f 100644 --- a/public/jsonld/ReferenceUsage.jsonld +++ b/public/jsonld/ReferenceUsage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -68,7 +69,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -79,7 +80,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "referenceType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/RenderingUsage.jsonld b/public/jsonld/RenderingUsage.jsonld index 9c2c5db2..03150e38 100644 --- a/public/jsonld/RenderingUsage.jsonld +++ b/public/jsonld/RenderingUsage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -69,7 +70,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -80,7 +81,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "partDefinition": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "renderingDefinition": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/RequirementConstraintMembership.jsonld b/public/jsonld/RequirementConstraintMembership.jsonld index 7607e9d7..bd9526ef 100644 --- a/public/jsonld/RequirementConstraintMembership.jsonld +++ b/public/jsonld/RequirementConstraintMembership.jsonld @@ -10,6 +10,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -31,6 +33,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/RequirementUsage.jsonld b/public/jsonld/RequirementUsage.jsonld index c7d8b994..50316fc2 100644 --- a/public/jsonld/RequirementUsage.jsonld +++ b/public/jsonld/RequirementUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -72,7 +73,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -84,7 +85,6 @@ "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "reqId": {"@type": "xsd:string"}, "requiredConstraint": {"@type": "@id"}, "requirementDefinition": {"@type": "@id"}, diff --git a/public/jsonld/RequirementVerificationMembership.jsonld b/public/jsonld/RequirementVerificationMembership.jsonld new file mode 100644 index 00000000..fcbf9cec --- /dev/null +++ b/public/jsonld/RequirementVerificationMembership.jsonld @@ -0,0 +1,50 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml#", + "sysml": "http://omg.org/ns/sysml#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "aliasId": {"@type": "xsd:string"}, + "constraint": {"@type": "@id"}, + "direction": {"@type": "@vocab"}, + "documentation": {"@type": "@id"}, + "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, + "humanId": {"@type": "xsd:string"}, + "identifier": {"@type": "dcterms:identifier"}, + "isComposite": {"@type": "xsd:boolean"}, + "isDerived": {"@type": "xsd:boolean"}, + "isPort": {"@type": "xsd:boolean"}, + "isPortion": {"@type": "xsd:boolean"}, + "isReadOnly": {"@type": "xsd:boolean"}, + "kind": {"@type": "@vocab"}, + "memberElement": {"@type": "@id"}, + "memberFeature": {"@type": "@id"}, + "memberName": {"@type": "xsd:string"}, + "membershipOwningPackage": {"@type": "@id"}, + "name": {"@type": "xsd:string"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedMemberElement": {"@type": "@id"}, + "ownedMemberFeature": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "ownedRequirement": {"@type": "@id"}, + "ownedTextualRepresentation": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "owningType": {"@type": "@id"}, + "relatedElement": {"@type": "@id"}, + "source": {"@type": "@id"}, + "target": {"@type": "@id"}, + "verifiedRequirement": {"@type": "@id"}, + "visibility": {"@type": "@vocab"} + + } +} \ No newline at end of file diff --git a/public/jsonld/ResultExpressionMembership.jsonld b/public/jsonld/ResultExpressionMembership.jsonld index 7e9ea0fb..3239c0cc 100644 --- a/public/jsonld/ResultExpressionMembership.jsonld +++ b/public/jsonld/ResultExpressionMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -30,6 +32,7 @@ "ownedResultExpression": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/ReturnParameterMembership.jsonld b/public/jsonld/ReturnParameterMembership.jsonld index 1c2ad3b5..dbee2dc9 100644 --- a/public/jsonld/ReturnParameterMembership.jsonld +++ b/public/jsonld/ReturnParameterMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -31,6 +33,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/SatisfyRequirementUsage.jsonld b/public/jsonld/SatisfyRequirementUsage.jsonld index e81ebefd..188b6153 100644 --- a/public/jsonld/SatisfyRequirementUsage.jsonld +++ b/public/jsonld/SatisfyRequirementUsage.jsonld @@ -17,6 +17,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -74,7 +75,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -86,7 +87,6 @@ "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "reqId": {"@type": "xsd:string"}, "requiredConstraint": {"@type": "@id"}, "requirementDefinition": {"@type": "@id"}, diff --git a/public/jsonld/SendActionUsage.jsonld b/public/jsonld/SendActionUsage.jsonld index 0fc66f96..4ce468a2 100644 --- a/public/jsonld/SendActionUsage.jsonld +++ b/public/jsonld/SendActionUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -71,7 +72,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -82,7 +83,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "target": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/SnapshotFeature.jsonld b/public/jsonld/SnapshotFeature.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/SnapshotFeature.jsonld +++ b/public/jsonld/SnapshotFeature.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/SourceEnd.jsonld b/public/jsonld/SourceEnd.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/SourceEnd.jsonld +++ b/public/jsonld/SourceEnd.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/StateSubactionMembership.jsonld b/public/jsonld/StateSubactionMembership.jsonld index da6b1d37..68756d2a 100644 --- a/public/jsonld/StateSubactionMembership.jsonld +++ b/public/jsonld/StateSubactionMembership.jsonld @@ -10,6 +10,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -31,6 +33,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/StateUsage.jsonld b/public/jsonld/StateUsage.jsonld index 3da4d552..164e5a7c 100644 --- a/public/jsonld/StateUsage.jsonld +++ b/public/jsonld/StateUsage.jsonld @@ -17,6 +17,7 @@ "exitAction": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -73,7 +74,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -84,7 +85,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "stateDefinition": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, diff --git a/public/jsonld/Step.jsonld b/public/jsonld/Step.jsonld index 9d55b09d..77f33c8c 100644 --- a/public/jsonld/Step.jsonld +++ b/public/jsonld/Step.jsonld @@ -13,6 +13,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -46,7 +47,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -55,7 +56,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/SubjectMembership.jsonld b/public/jsonld/SubjectMembership.jsonld index 1ed882b8..b7a2abb0 100644 --- a/public/jsonld/SubjectMembership.jsonld +++ b/public/jsonld/SubjectMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -32,6 +34,7 @@ "ownedSubjectParameter": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/Succession.jsonld b/public/jsonld/Succession.jsonld index 3863eb40..90fa641a 100644 --- a/public/jsonld/Succession.jsonld +++ b/public/jsonld/Succession.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "guardExpression": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -37,7 +38,6 @@ "name": {"@type": "xsd:string"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -52,7 +52,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -61,7 +61,6 @@ "owningRelatedElement": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/SuccessionItemFlow.jsonld b/public/jsonld/SuccessionItemFlow.jsonld index e29c4786..3ab68a6f 100644 --- a/public/jsonld/SuccessionItemFlow.jsonld +++ b/public/jsonld/SuccessionItemFlow.jsonld @@ -16,6 +16,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "guardExpression": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -42,7 +43,6 @@ "name": {"@type": "xsd:string"}, "output": {"@type": "@id"}, "ownedAnnotation": {"@type": "@id"}, - "ownedAssociationType": {"@type": "@id"}, "ownedConjugator": {"@type": "@id"}, "ownedElement": {"@type": "@id"}, "ownedEndFeature": {"@type": "@id"}, @@ -57,7 +57,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -67,7 +67,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "relatedElement": {"@type": "@id"}, "relatedFeature": {"@type": "@id"}, "source": {"@type": "@id"}, diff --git a/public/jsonld/TargetEnd.jsonld b/public/jsonld/TargetEnd.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/TargetEnd.jsonld +++ b/public/jsonld/TargetEnd.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/TimeSliceFeature.jsonld b/public/jsonld/TimeSliceFeature.jsonld index e9081b90..226824f5 100644 --- a/public/jsonld/TimeSliceFeature.jsonld +++ b/public/jsonld/TimeSliceFeature.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "importedMembership": {"@type": "@id"}, @@ -45,7 +46,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningFeatureMembership": {"@type": "@id"}, @@ -53,7 +54,6 @@ "owningNamespace": {"@type": "@id"}, "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"} } diff --git a/public/jsonld/TransferActionUsage.jsonld b/public/jsonld/TransferActionUsage.jsonld index 1665c47f..70050161 100644 --- a/public/jsonld/TransferActionUsage.jsonld +++ b/public/jsonld/TransferActionUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -71,7 +72,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -82,7 +83,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/TransitionFeatureMembership.jsonld b/public/jsonld/TransitionFeatureMembership.jsonld index abf907b3..469861c6 100644 --- a/public/jsonld/TransitionFeatureMembership.jsonld +++ b/public/jsonld/TransitionFeatureMembership.jsonld @@ -9,6 +9,8 @@ "direction": {"@type": "@vocab"}, "documentation": {"@type": "@id"}, "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, "isComposite": {"@type": "xsd:boolean"}, @@ -30,6 +32,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, "owningMembership": {"@type": "@id"}, "owningNamespace": {"@type": "@id"}, "owningRelatedElement": {"@type": "@id"}, diff --git a/public/jsonld/TransitionUsage.jsonld b/public/jsonld/TransitionUsage.jsonld index 586b3e4f..fb123d29 100644 --- a/public/jsonld/TransitionUsage.jsonld +++ b/public/jsonld/TransitionUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "guardExpression": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -72,7 +73,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -83,7 +84,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "source": {"@type": "@id"}, "succession": {"@type": "@id"}, "target": {"@type": "@id"}, diff --git a/public/jsonld/TypeFeaturing.jsonld b/public/jsonld/TypeFeaturing.jsonld new file mode 100644 index 00000000..8aaa6b98 --- /dev/null +++ b/public/jsonld/TypeFeaturing.jsonld @@ -0,0 +1,32 @@ +{ + "@context": { + "@vocab": "http://omg.org/ns/sysml#", + "sysml": "http://omg.org/ns/sysml#", + "dcterms": "http://purl.org/dc/terms/", + "xsd": "http://www.w3.org/2001/XMLSchema#", + + "aliasId": {"@type": "xsd:string"}, + "documentation": {"@type": "@id"}, + "documentationComment": {"@type": "@id"}, + "featureOfType": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, + "humanId": {"@type": "xsd:string"}, + "identifier": {"@type": "dcterms:identifier"}, + "name": {"@type": "xsd:string"}, + "ownedAnnotation": {"@type": "@id"}, + "ownedElement": {"@type": "@id"}, + "ownedRelatedElement": {"@type": "@id"}, + "ownedRelationship": {"@type": "@id"}, + "ownedTextualRepresentation": {"@type": "@id"}, + "owner": {"@type": "@id"}, + "owningFeatureOfType": {"@type": "@id"}, + "owningMembership": {"@type": "@id"}, + "owningNamespace": {"@type": "@id"}, + "owningRelatedElement": {"@type": "@id"}, + "owningRelationship": {"@type": "@id"}, + "relatedElement": {"@type": "@id"}, + "source": {"@type": "@id"}, + "target": {"@type": "@id"} + + } +} \ No newline at end of file diff --git a/public/jsonld/Usage.jsonld b/public/jsonld/Usage.jsonld index 8a440303..e61349d6 100644 --- a/public/jsonld/Usage.jsonld +++ b/public/jsonld/Usage.jsonld @@ -12,6 +12,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -68,7 +69,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -78,7 +79,6 @@ "owningRelationship": {"@type": "@id"}, "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, diff --git a/public/jsonld/VerificationCaseDefinition.jsonld b/public/jsonld/VerificationCaseDefinition.jsonld index 15b73dd0..bca769da 100644 --- a/public/jsonld/VerificationCaseDefinition.jsonld +++ b/public/jsonld/VerificationCaseDefinition.jsonld @@ -75,7 +75,8 @@ "subjectParameter": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, - "variantMembership": {"@type": "@id"} + "variantMembership": {"@type": "@id"}, + "verifiedRequirement": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/VerificationCaseUsage.jsonld b/public/jsonld/VerificationCaseUsage.jsonld index b797ce82..f1658fc0 100644 --- a/public/jsonld/VerificationCaseUsage.jsonld +++ b/public/jsonld/VerificationCaseUsage.jsonld @@ -16,6 +16,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -74,7 +75,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -85,14 +86,14 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "result": {"@type": "@id"}, "subjectParameter": {"@type": "@id"}, "type": {"@type": "@id"}, "usage": {"@type": "@id"}, "variant": {"@type": "@id"}, "variantMembership": {"@type": "@id"}, - "verificationCaseDefinition": {"@type": "@id"} + "verificationCaseDefinition": {"@type": "@id"}, + "verifiedRequirement": {"@type": "@id"} } } \ No newline at end of file diff --git a/public/jsonld/ViewUsage.jsonld b/public/jsonld/ViewUsage.jsonld index f775f34f..258103ec 100644 --- a/public/jsonld/ViewUsage.jsonld +++ b/public/jsonld/ViewUsage.jsonld @@ -13,6 +13,7 @@ "exposedPackage": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, "identifier": {"@type": "dcterms:identifier"}, @@ -70,7 +71,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -81,7 +82,6 @@ "owningType": {"@type": "@id"}, "owningUsage": {"@type": "@id"}, "partDefinition": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "rendering": {"@type": "@id"}, "satisfiedViewpoint": {"@type": "@id"}, "type": {"@type": "@id"}, diff --git a/public/jsonld/ViewpointUsage.jsonld b/public/jsonld/ViewpointUsage.jsonld index 5ed62762..685c11c4 100644 --- a/public/jsonld/ViewpointUsage.jsonld +++ b/public/jsonld/ViewpointUsage.jsonld @@ -15,6 +15,7 @@ "endOwningType": {"@type": "@id"}, "feature": {"@type": "@id"}, "featureMembership": {"@type": "@id"}, + "featuringType": {"@type": "@id"}, "flowFeature": {"@type": "@id"}, "function": {"@type": "@id"}, "humanId": {"@type": "xsd:string"}, @@ -72,7 +73,7 @@ "ownedRelationship": {"@type": "@id"}, "ownedSubsetting": {"@type": "@id"}, "ownedTextualRepresentation": {"@type": "@id"}, - "ownedType": {"@type": "@id"}, + "ownedTypeFeaturing": {"@type": "@id"}, "ownedTyping": {"@type": "@id"}, "owner": {"@type": "@id"}, "owningDefinition": {"@type": "@id"}, @@ -84,7 +85,6 @@ "owningUsage": {"@type": "@id"}, "parameter": {"@type": "@id"}, "predicate": {"@type": "@id"}, - "referencedType": {"@type": "@id"}, "reqId": {"@type": "xsd:string"}, "requiredConstraint": {"@type": "@id"}, "requirementDefinition": {"@type": "@id"}, From 96f038ca0b52f89727da48b8590bd37f4d32475a Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 21 Nov 2020 13:59:21 -0800 Subject: [PATCH 6/6] Update version number to 2020-11-rc1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 67be47ec..c83c4e4a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ name := """SysML-v2-API-Services""" organization := "org.omg" -version := "2020-10" +version := "2020-11-rc1" javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")