← Back to team overview

mlhim-owners team mailing list archive

  1. mlhim-owners team
  2. Mailing list archive
  3. Message #00099

[Branch ~mlhim-specs-dev/mlhim-specs/mlhim-emf] Rev 30: Completed attributes in Datatypes package.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 30
committer: Tim Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-emf
timestamp: Thu 2011-03-03 21:26:08 -0300
message:
  Completed attributes in Datatypes package.
modified:
  org.mlhim.rm/model/mlhim2.ecore
  org.mlhim.rm/model/mlhim2.ecorediag


--
lp:~mlhim-specs-dev/mlhim-specs/mlhim-emf
https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/mlhim-emf

Your team Multi-level Healthcare Information Modelling Owners is subscribed to branch lp:~mlhim-specs-dev/mlhim-specs/mlhim-emf.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/mlhim-emf/+edit-subscription

=== modified file 'org.mlhim.rm/model/mlhim2.ecore'
--- org.mlhim.rm/model/mlhim2.ecore	2011-03-03 22:18:09 +0000
+++ org.mlhim.rm/model/mlhim2.ecore	2011-03-04 00:26:08 +0000
@@ -24,31 +24,112 @@
     <eClassifiers xsi:type="ecore:EClass" name="NAV" eSuperTypes="#//Support/ASKU"/>
   </eSubpackages>
   <eSubpackages name="Datatypes" nsURI="http://www.mlhim.org/rm/datatypes"; nsPrefix="rm.datatypes">
-    <eClassifiers xsi:type="ecore:EClass" name="DvURI" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvBoolean" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvText" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvEncapsulated" abstract="true" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvParagraph" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//Datatypes/DvText"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvCodedText" eSuperTypes="#//Datatypes/DvText"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//Datatypes/DvEncapsulated"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvMultimedia" eSuperTypes="#//Datatypes/DvEncapsulated"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvInterval" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//Datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//Datatypes/DvOrdered"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvNumeric" abstract="true" eSuperTypes="#//Datatypes/DvOrdered"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvURI" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvBoolean" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvText" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="uuid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvEncapsulated" abstract="true" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="charset" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvParagraph" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
+          eType="#//Datatypes/DvText"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//Datatypes/DvText">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="issuer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="assignor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCodedText" eSuperTypes="#//Datatypes/DvText">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="code_string" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="terminology_name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="terminology_abbrev" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//Datatypes/DvEncapsulated">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="formalism" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvMultimedia" eSuperTypes="#//Datatypes/DvEncapsulated">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="mime_type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="compression_algorithm"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="integrity_check" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="integrity_check_algorithm"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="alt_txt" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="thumbnail" eType="#//Datatypes/DvMultimedia"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvInterval" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="lower" eType="#//Datatypes/DvOrdered"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="upper" eType="#//Datatypes/DvOrdered"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lower_included" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="upper_included" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lower_unbounded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="upper_unbounded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//Datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="normal_status" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="normal_range" eType="#//Datatypes/DvInterval"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="other_reference_ranges"
+          upperBound="-1" eType="#//Datatypes/ReferenceRange"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="definition" eType="#//Datatypes/DvText"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="data_range" eType="#//Datatypes/DvInterval"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//Datatypes/DvOrdered">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigInteger"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvNumeric" abstract="true" eSuperTypes="#//Datatypes/DvOrdered">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvReal" eSuperTypes="#//Datatypes/DvNumeric"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvInt" eSuperTypes="#//Datatypes/DvReal"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true" eSuperTypes="#//Datatypes/DvOrdered"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" abstract="true" eSuperTypes="#//Datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//Datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvQuantity" eSuperTypes="#//Datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvCount" eSuperTypes="#//Datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//Datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvCoefficient" eSuperTypes="#//Datatypes/DvRatio"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//Datatypes/DvRatio"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true" eSuperTypes="#//Datatypes/DvOrdered">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="magnitude" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="magnitude_status" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="accuracy_unknown" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" abstract="true" eSuperTypes="#//Datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="numerator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="denominator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//Datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantity" eSuperTypes="#//Datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="units" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="precision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCount" eSuperTypes="#//Datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="count" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//Datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCoefficient" eSuperTypes="#//Datatypes/DvRatio">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="coefficient_type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//Datatypes/DvRatio">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportion_type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvAny" instanceTypeName="DvAny" abstract="true">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_begin" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//Support/ExceptionalValue"/>
+    </eClassifiers>
   </eSubpackages>
   <eSubpackages name="Structures" nsURI="http://www.mlhim.org/rm/structures"; nsPrefix="rm.structures">
     <eClassifiers xsi:type="ecore:EClass" name="DataStructure" abstract="true" eSuperTypes="#//Common/Locatable"/>

=== modified file 'org.mlhim.rm/model/mlhim2.ecorediag'
--- org.mlhim.rm/model/mlhim2.ecorediag	2011-03-03 22:18:09 +0000
+++ org.mlhim.rm/model/mlhim2.ecorediag	2011-03-04 00:26:08 +0000
@@ -687,6 +687,22 @@
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvProportion"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_46NTskXUEeCTG6Rypkx8FQ" x="955" y="375"/>
       </children>
+      <children xmi:type="notation:Node" xmi:id="_vTb2oUXoEeCtRtgXx1I20g" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_vTdr0EXoEeCtRtgXx1I20g" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_vTeS4EXoEeCtRtgXx1I20g" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_vTeS4UXoEeCtRtgXx1I20g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_vTeS4kXoEeCtRtgXx1I20g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_vTeS40XoEeCtRtgXx1I20g"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_vTe58EXoEeCtRtgXx1I20g" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_vTe58UXoEeCtRtgXx1I20g"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_vTe58kXoEeCtRtgXx1I20g"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_vTe580XoEeCtRtgXx1I20g"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_vTb2okXoEeCtRtgXx1I20g" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvAny"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vTb2o0XoEeCtRtgXx1I20g" x="355" y="15"/>
+      </children>
       <styles xmi:type="notation:DrawerStyle" xmi:id="_u1IQMUXLEeCTG6Rypkx8FQ"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_u1IQMkXLEeCTG6Rypkx8FQ"/>
       <styles xmi:type="notation:FilteringStyle" xmi:id="_u1IQM0XLEeCTG6Rypkx8FQ"/>
@@ -694,7 +710,7 @@
     <styles xmi:type="notation:ShapeStyle" xmi:id="_u1Fz8UXLEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
     <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_u1Fz8kXLEeCTG6Rypkx8FQ"/>
     <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//Datatypes"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u1Fz80XLEeCTG6Rypkx8FQ" x="72" y="144" width="207" height="123"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u1Fz80XLEeCTG6Rypkx8FQ" x="72" y="144" width="771" height="483"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_wToOgEXLEeCTG6Rypkx8FQ" type="1002">
     <children xmi:type="notation:Node" xmi:id="_wTpcoEXLEeCTG6Rypkx8FQ" type="4006"/>
  Thread Previous • Date Previous • • Thread Next