← Back to team overview

mlhim-specs-dev team mailing list archive

  1. mlhim-specs-dev team
  2. Mailing list archive
  3. Message #00395

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 192: Working on datatypes attributes.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 192
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Tue 2011-09-27 13:07:40 -0500
message:
  Working on datatypes attributes.
removed:
  mlhim2-emf/org.mlhim2/mlhim2.ecorediag
modified:
  mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs
  mlhim2-emf/org.mlhim2/mlhim2.ecore


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

Your team MLHIM Specifications Developers is subscribed to branch lp:mlhim-specs.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main/+edit-subscription

=== modified file 'mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs'
--- mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs	2011-09-25 13:14:55 +0000
+++ mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs	2011-09-27 18:07:40 +0000
@@ -1,4 +1,3 @@
-#Sat Sep 24 16:17:19 CDT 2011
+#Mon Sep 26 08:25:04 CDT 2011
 eclipse.preferences.version=1
 encoding/mlhim2.ecore=UTF-8
-encoding/mlhim2.ecorediag=UTF-8

=== modified file 'mlhim2-emf/org.mlhim2/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-26 13:18:54 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-27 18:07:40 +0000
@@ -17,9 +17,20 @@
       <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="DvString" eSuperTypes="#//datatypes/DvAny">
-      <eOperations name="validLang" 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="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="language" eType="#//datatypes/DvCodedString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="uuid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumeration">
+        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList";>
+          <eTypeArguments/>
+        </eGenericType>
+      </eStructuralFeatures>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="whitespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEnumerator";
+          defaultValueLiteral="preserve"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="min_length" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="max_length" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvNormalizedString" eSuperTypes="#//datatypes/DvString">
       <eOperations name="normalize"/>
@@ -28,9 +39,8 @@
       <eOperations name="validToken"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvCodedString" eSuperTypes="#//datatypes/DvString">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="terminology_abbrev" eType="#//datatypes/DvNormalizedString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="terminology_name" eType="#//datatypes/DvNormalizedString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="code_string" eType="#//datatypes/DvNormalizedString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="terminology_abbrev" 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"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//datatypes/DvString">
       <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//datatypes/DvNormalizedString"/>
@@ -47,6 +57,20 @@
     <eClassifiers xsi:type="ecore:EClass" name="DvEncapsulated" abstract="true" eSuperTypes="#//datatypes/DvAny"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//datatypes/DvEncapsulated"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvMedia" abstract="true" eSuperTypes="#//datatypes/DvEncapsulated"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//datatypes/DvAny"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//datatypes/DvOrdered"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true" eSuperTypes="#//datatypes/DvOrdered"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvInteger" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvReal" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" abstract="true" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvRate" eSuperTypes="#//datatypes/DvRatio"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//datatypes/DvRatio"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvInterval" eSuperTypes="#//datatypes/DvAny"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange" eSuperTypes="#//datatypes/DvAny"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvQuantified"/>
   </eSubpackages>
   <eSubpackages name="support">
     <eClassifiers xsi:type="ecore:EClass" name="ExceptionalValue" abstract="true"/>
@@ -74,6 +98,9 @@
     <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//entity/Party"/>
     <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//entity/Party"/>
     <eClassifiers xsi:type="ecore:EClass" name="Device" eSuperTypes="#//entity/Party"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Relationship" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Location" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//common/Locatable"/>
   </eSubpackages>
   <eSubpackages name="common">
     <eClassifiers xsi:type="ecore:EClass" name="Locatable" abstract="true"/>

=== removed file 'mlhim2-emf/org.mlhim2/mlhim2.ecorediag'
--- mlhim2-emf/org.mlhim2/mlhim2.ecorediag	2011-09-25 13:14:55 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecorediag	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation"; xmi:id="_le1c8ebyEeCbc_v0SKF8Ag" type="EcoreTools" name="mlhim2.ecorediag" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_lfBqMObyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfC4UObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfDfYObyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfDfYebyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfDfYubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfDfY-byEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfBqMebyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfBqMubyEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//datatypes"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfBqM-byEeCbc_v0SKF8Ag"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfEGcObyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfEtgObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfEtgebyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfEtgubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfEtg-byEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfEthObyEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfEGcebyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfEGcubyEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//support"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfEGc-byEeCbc_v0SKF8Ag" x="172"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfEthebyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfFUkObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfFUkebyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfFUkubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfFUk-byEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfFUlObyEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfEthubyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfEth-byEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//entity"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfEtiObyEeCbc_v0SKF8Ag" x="344"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfF7oObyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfGisObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfGisebyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfGisubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfGis-byEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfGitObyEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfF7oebyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfF7oubyEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//common"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfF7o-byEeCbc_v0SKF8Ag" x="516"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfGitebyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfHJwObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfHJwebyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfHJwubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfHJw-byEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfHJxObyEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfGitubyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfGit-byEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//metadata"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfGiuObyEeCbc_v0SKF8Ag" x="688"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfHw0ObyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfIX4ObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfI-8ObyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfI-8ebyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfI-8ubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfI-8-byEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfHw0ebyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfHw0ubyEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//ccd"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfHw0-byEeCbc_v0SKF8Ag" x="860"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfI-9ObyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfJmAObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfJmAebyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfJmAubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfJmA-byEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfJmBObyEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfI-9ebyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfI-9ubyEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//structures"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfI-9-byEeCbc_v0SKF8Ag" x="1032"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_lfKNEObyEeCbc_v0SKF8Ag" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_lfKNFObyEeCbc_v0SKF8Ag" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_lfK0IObyEeCbc_v0SKF8Ag" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_lfK0IebyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_lfK0IubyEeCbc_v0SKF8Ag"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_lfK0I-byEeCbc_v0SKF8Ag"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_lfKNEebyEeCbc_v0SKF8Ag" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_lfKNEubyEeCbc_v0SKF8Ag"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//content"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lfKNE-byEeCbc_v0SKF8Ag" x="1204"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_le1c8ubyEeCbc_v0SKF8Ag"/>
-  <element xmi:type="ecore:EPackage" href="mlhim2.ecore#/"/>
-</notation:Diagram>
  Thread Previous • Date Previous • • Thread Next