fix datatypes issue

cdaxehealth-model/src/main/java/net/ihe/gazelle/model/CdaxehealthModelRetriever.java

@@ -23,6 +23,7 @@ public class CdaxehealthModelRetriever extends ModelRetriever {
         modelMap.put("cda.uml", getClass().getResource("/modelxeh/cda.uml"));
         modelMap.put("pharm.uml", getClass().getResource("/modelxeh/pharm.uml"));
         modelMap.put("lab.uml", getClass().getResource("/modelxeh/lab.uml"));
+        //modelMap.put("datatypes-ips.uml", getClass().getResource("/datatypes-ips-model/datatypes-ips.uml"));
 
         VocModelRetriever vocModelRetriever = new VocModelRetriever();
         Map<String, URL> vocModelMap = vocModelRetriever.retrieveModels();
@@ -42,7 +43,7 @@ public class CdaxehealthModelRetriever extends ModelRetriever {
             }
         }
 
-        DatatypesModelRetriever datatypesModelRetriever = new DatatypesIpsModelRetriever();
+        DatatypesModelRetriever datatypesModelRetriever = new DatatypesModelRetriever();
         Map<String, URL> datatypesModelMap = datatypesModelRetriever.retrieveModels();
         for (Map.Entry<String, URL> entry : datatypesModelMap.entrySet()){
             String key = entry.getKey();
@@ -51,6 +52,17 @@ public class CdaxehealthModelRetriever extends ModelRetriever {
             }
         }
 
+
+        DatatypesModelRetriever datatypesIpsModelRetriever = new DatatypesIpsModelRetriever();
+        Map<String, URL> datatypesIpsModelMap = datatypesIpsModelRetriever.retrieveModels();
+        for (Map.Entry<String, URL> entry : datatypesIpsModelMap.entrySet()){
+            String key = entry.getKey();
+            if (modelMap.get(key) == null){
+                modelMap.put(key, entry.getValue());
+            }
+
+        }
+
         InfrModelRetriever infrModelRetriever = new InfrModelRetriever();
         Map<String, URL> infrModelMap = infrModelRetriever.retrieveModels();
         for (Map.Entry<String, URL> entry : infrModelMap.entrySet()){

cdaxehealth-model/src/main/java/net/ihe/gazelle/model/DatatypesIpsModelRetriever.java

@@ -4,6 +4,11 @@ public class DatatypesIpsModelRetriever extends DatatypesModelRetriever{
 
     @Override
     protected String getDatatypeUmlName() {
-        return "/datatypes-ips-model/datatypes.uml";
+        return "/datatypes-ips-model/datatypes-ips.uml";
+    }
+
+    @Override
+    protected String getDatatypeUmlKey() {
+        return "datatypes-ips.uml";
     }
 }

cdaxehealth-model/src/main/resources/cdaxehealth/modelsDefinition.xml

@@ -7,6 +7,12 @@
 		    <relativeXMIPath>../../datatypes-model/models/datatypes.uml</relativeXMIPath>
 		    <templateIdentifierUMLID>_CuEO9q70EeGxJei_o6JmIA</templateIdentifierUMLID>
 		</modelUMLDesc>
+		<modelUMLDesc>
+			<identifier>datatypes-ips</identifier>
+			<path>/path/to/model/datatypes-ips-model/datatypes-ips.uml</path>
+			<relativeXMIPath>../../datatypes-ips-model/datatypes-ips.uml</relativeXMIPath>
+			<templateIdentifierUMLID>_CuEO9q70EbGxJei_o6JmIA</templateIdentifierUMLID>
+		</modelUMLDesc>
 		<modelUMLDesc>
 		    <identifier>cda</identifier>
 		    <path>/path/to/model/cdaxehealth-model/modelad2/cda.uml</path>
@@ -18,7 +24,7 @@
 			<relativeXMIPath>../../cdaxehealth-model/modelad2/pharm.uml</relativeXMIPath>
 		</modelUMLDesc>
 		<modelUMLDesc>
-			<identifier>pharm</identifier>
+			<identifier>lab</identifier>
 			<path>/path/to/model/cdaxehealth-model/modelad2/lab.uml</path>
 			<relativeXMIPath>../../cdaxehealth-model/modelad2/lab.uml</relativeXMIPath>
 		</modelUMLDesc>

cdaxehealth-model/src/main/resources/modelxeh/lab.uml

@@ -109,7 +109,7 @@ The following types are used for structural RIM attributes</body>
 
 
       <ownedAttribute xmi:id="_DAKEpK70EeGxJei_o6JmIA" name="code" isOrdered="true" aggregation="composite" >
-        <type xmi:type="uml:Class" href="../../datatypes-model/models/datatypes.uml#_CuDnsK70EeGxJei_o6JmIA"/>
+        <type xmi:type="uml:Class" href="../../datatypes-ips-model/datatypes-ips.uml#_CuDnsK70EeGxJei_o6JmIA"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DAKEpa70EeGxJei_o6JmIA"/>
       </ownedAttribute>
 

datatypes-model/src/main/java/net/ihe/gazelle/model/DatatypesModelRetriever.java

@@ -12,15 +12,21 @@ public class DatatypesModelRetriever extends ModelRetriever{
         return "/models/datatypes.uml";
     }
 
+    protected String getDatatypeUmlKey(){
+        return "datatypes.uml";
+    }
+
     @Override
     public Map<String, URL> retrieveResources() {
         return null;
     }
 
+
+
     @Override
     public Map<String, URL> retrieveModels(){
         Map<String, URL> modelMap = new HashMap<String, URL>();
-        modelMap.put("datatypes.uml", getClass().getResource(getDatatypeUmlName()));
+        modelMap.put(getDatatypeUmlKey(), getClass().getResource(getDatatypeUmlName()));
         CommonModelRetriever commonModelRetriever = new CommonModelRetriever();
         Map<String, URL> commonModelsMap = commonModelRetriever.retrieveModels();
         for (Map.Entry<String, URL> entry : commonModelsMap.entrySet()){