mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 193
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Thu 2011-09-29 20:25:07 -0500
message:
  completed DvString datatypes.
modified:
  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/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-27 18:07:40 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-30 01:25:07 +0000
@@ -10,11 +10,11 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvBoolean" eSuperTypes="#//datatypes/DvAny">
+      <eOperations name="convert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
       <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="DvURI" eSuperTypes="#//datatypes/DvString">
-      <eOperations name="uriValid" 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"/>
+      <eOperations name="validURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvString" eSuperTypes="#//datatypes/DvAny">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -33,19 +33,19 @@
       <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"/>
+      <eOperations name="normalize" eType="#//datatypes/DvString"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DvToken" eSuperTypes="#//datatypes/DvNormalizedString">
-      <eOperations name="validToken"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvToken" eSuperTypes="#//datatypes/DvString">
+      <eOperations name="tokenize" eType="#//datatypes/DvString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvCodedString" eSuperTypes="#//datatypes/DvString">
       <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"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="assignor" eType="#//datatypes/DvNormalizedString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="issuer" eType="#//datatypes/DvNormalizedString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <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"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvParagraph" eSuperTypes="#//datatypes/DvAny">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="items">