From 0ac75eccaa43438100107bcd30a585a32e845511 Mon Sep 17 00:00:00 2001
From: Achraf <aai@kereval.com>
Date: Wed, 1 Jun 2022 10:29:34 +0200
Subject: [PATCH] Choices initial solution structure
---
common-models/src/main/resources/models/common.uml | 11 +++++++++++
datatypes-model/pom.xml | 6 +-----
infr-model/pom.xml | 6 +-----
pom.xml | 6 +++---
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/common-models/src/main/resources/models/common.uml b/common-models/src/main/resources/models/common.uml
index 5cc4a4c..4fdf16c 100644
--- a/common-models/src/main/resources/models/common.uml
+++ b/common-models/src/main/resources/models/common.uml
@@ -291,6 +291,17 @@
</ownedOperation>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_UfOp8B5IEeW5Kph3CWqa0g" name="CommonOperationsStatic">
+ <ownedOperation xmi:id="__PtYnBT28LK_-MgfxjxjMg" name="compareExactType" isStatic="true">
+ <ownedParameter xmi:id="_CUnT8POIEeK_-MgfxjxjMg" name="return" direction="return">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+ </ownedParameter>
+ <ownedParameter xmi:id="_E9xNNLM4EeK_-MgfxjxjMg" name="element1">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EClass"/>
+ </ownedParameter>
+ <ownedParameter xmi:id="_IEHYILM4EeK_-MgfxjxjMg" name="element2">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedParameter>
+ </ownedOperation>
<ownedOperation xmi:id="_UfPRAB5IEeW5Kph3CWqa0g" name="matches" isStatic="true">
<ownedParameter xmi:id="_UfPRAR5IEeW5Kph3CWqa0g" name="return" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
diff --git a/datatypes-model/pom.xml b/datatypes-model/pom.xml
index c3acc1c..b612834 100644
--- a/datatypes-model/pom.xml
+++ b/datatypes-model/pom.xml
@@ -42,10 +42,6 @@
<version>3.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>net.ihe.gazelle.model</groupId>
- <artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
+
</dependencies>
</project>
\ No newline at end of file
diff --git a/infr-model/pom.xml b/infr-model/pom.xml
index e85e561..4217957 100644
--- a/infr-model/pom.xml
+++ b/infr-model/pom.xml
@@ -41,10 +41,6 @@
<version>3.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>net.ihe.gazelle.model</groupId>
- <artifactId>model-resources</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
+
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index cafcaa5..4445e85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,14 +69,14 @@
<modules>
- <module>cda-model</module>
- <module>cdaepsos-model</module>
+ <module>model-resources</module>
<module>common-models</module>
<module>datatypes-model</module>
<module>infr-model</module>
- <module>model-resources</module>
<module>nblock-model</module>
<module>voc-model</module>
+ <module>cda-model</module>
+ <module>cdaepsos-model</module>
</modules>
<profiles>
--
GitLab