← Back to team overview

mlhim-specs-dev team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 242: Properly minimized the demographic module.

 

------------------------------------------------------------
revno: 242
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sun 2012-04-29 20:10:02 -0500
message:
  Properly minimized the demographic module.
modified:
  mlhim-ref-man-2.x.y-enUS.odt
  mlhim2-emf/org.mlhim2/model/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 'mlhim-ref-man-2.x.y-enUS.odt'
Binary files mlhim-ref-man-2.x.y-enUS.odt	2012-04-22 22:33:15 +0000 and mlhim-ref-man-2.x.y-enUS.odt	2012-04-30 01:10:02 +0000 differ
=== modified file 'mlhim2-emf/org.mlhim2/model/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/model/mlhim2.ecore	2012-04-22 21:52:37 +0000
+++ mlhim2-emf/org.mlhim2/model/mlhim2.ecore	2012-04-30 01:10:02 +0000
@@ -142,27 +142,23 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" upperBound="-1"
           eType="#//datatypes/DvIdentifier"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Actor" eSuperTypes="#//demographic/Party">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="languages" upperBound="-1"
-          eType="#//datatypes/DvCodedString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//demographic/Actor">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//demographic/Actor">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//demographic/Actor">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//demographic/Actor">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Agent" eSuperTypes="#//demographic/Actor">
+    <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//demographic/Party">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//demographic/Party">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//demographic/Party">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//demographic/Party">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Agent" eSuperTypes="#//demographic/Party">
       <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
           eType="#//structures/Item"/>
     </eClassifiers>
@@ -173,38 +169,10 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="relationship_type" lowerBound="1"
           eType="#//datatypes/DvString"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Capability" eSuperTypes="#//common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="credentials" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="GeographicLocation" eSuperTypes="#//common/Locatable">
       <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
           eType="#//structures/Item"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="CommunicationsEvent" eSuperTypes="#//common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="case" lowerBound="1"
-          eType="#//demographic/Case"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
-          eType="#//demographic/ContactMechanism"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ContactMechanism" eSuperTypes="#//common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
-          eType="#//datatypes/DvString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="is_primary" lowerBound="1"
-          eType="#//datatypes/DvBoolean"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Case" eSuperTypes="#//common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="GeographicBoundary" eSuperTypes="#//common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
-          eType="#//structures/Item"/>
-    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//common/Locatable">
       <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
           eType="#//datatypes/DvString"/>
@@ -213,8 +181,6 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="is_primary" lowerBound="1"
           eType="#//datatypes/DvBoolean"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Address" eSuperTypes="#//demographic/ContactMechanism"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ElectronicMedia" eSuperTypes="#//demographic/ContactMechanism"/>
     <eClassifiers xsi:type="ecore:EClass" name="PartyProxy" abstract="true" eSuperTypes="#//demographic/Party">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="external_ref" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
     </eClassifiers>