Roll back model update
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore
index 6b0ded6..210ef0b 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.ecore
@@ -99,9 +99,16 @@
<eClassifiers xsi:type="ecore:EClass" name="TEL" eSuperTypes="#//URL">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="mixed"/>
- <details key="name" value=""/>
</eAnnotations>
<eOperations name="getText" ordered="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" ordered="false"
+ upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="name" value=""/>
+ <details key="namespace" value=""/>
+ <details key="kind" value="elementWildcard"/>
+ </eAnnotations>
+ </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="useablePeriod" ordered="false"
upperBound="-1" eType="#//SXCM_TS" containment="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -115,14 +122,6 @@
<details key="kind" value="attribute"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" ordered="false"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value=""/>
- <details key="namespace" value=""/>
- <details key="kind" value="elementWildcard"/>
- </eAnnotations>
- </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="URL" abstract="true" eSuperTypes="#//ANY">
<eOperations name="URL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1714,14 +1713,14 @@
<details key="namespace" value="urn:hl7-org:v3"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="width" ordered="false"
- eType="#//PQ" containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="high" ordered="false" eType="#//IVXB_TS"
+ containment="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="namespace" value="urn:hl7-org:v3"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="high" ordered="false" eType="#//IVXB_TS"
- containment="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="width" ordered="false"
+ eType="#//PQ" containment="true">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="namespace" value="urn:hl7-org:v3"/>
</eAnnotations>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.genmodel b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.genmodel
index a43e6d4..510432c 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.genmodel
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.genmodel
@@ -88,11 +88,11 @@
</genClasses>
<genClasses xsi:type="genmodel:GenClass" ecoreClass="datatypes.ecore#//TEL">
<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference datatypes.ecore#//TEL/useablePeriod"/>
- <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute datatypes.ecore#//TEL/use"/>
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
createChild="true" ecoreFeature="ecore:EAttribute datatypes.ecore#//TEL/mixed"
pluralizationException="true"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference datatypes.ecore#//TEL/useablePeriod"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute datatypes.ecore#//TEL/use"/>
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="datatypes.ecore#//TEL/getText"/>
</genClasses>
<genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="datatypes.ecore#//URL">
@@ -536,9 +536,9 @@
<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
createChild="true" ecoreFeature="ecore:EReference datatypes.ecore#//IVL_TS/center"/>
<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
- createChild="true" ecoreFeature="ecore:EReference datatypes.ecore#//IVL_TS/width"/>
- <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
createChild="true" ecoreFeature="ecore:EReference datatypes.ecore#//IVL_TS/high"/>
+ <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+ createChild="true" ecoreFeature="ecore:EReference datatypes.ecore#//IVL_TS/width"/>
<genOperations xsi:type="genmodel:GenOperation" ecoreOperation="datatypes.ecore#//IVL_TS/optionsContainingLow">
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="datatypes.ecore#//IVL_TS/optionsContainingLow/diagnostics"/>
<genParameters xsi:type="genmodel:GenParameter" ecoreParameter="datatypes.ecore#//IVL_TS/optionsContainingLow/context"/>
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.uml b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.uml
index e4cbbfc..c5589fa 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.uml
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/model/datatypes.uml
@@ -1199,14 +1199,14 @@
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sRs1oD6AEd6cla2oXsPtlA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sRs1oT6AEd6cla2oXsPtlA" value="1"/>
</ownedAttribute>
+ <ownedAttribute xmi:id="_jfCGID6AEd6cla2oXsPtlA" name="high" visibility="private" type="_BY5uUD6AEd6cla2oXsPtlA" aggregation="composite">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s9XBwD6AEd6cla2oXsPtlA"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s9XBwT6AEd6cla2oXsPtlA" value="1"/>
+ </ownedAttribute>
<ownedAttribute xmi:id="_kXgmQD6AEd6cla2oXsPtlA" name="width" visibility="private" type="_3mPzYD59Ed6cla2oXsPtlA" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tytVYD6AEd6cla2oXsPtlA"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tytVYT6AEd6cla2oXsPtlA" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_jfCGID6AEd6cla2oXsPtlA" name="high" visibility="private" type="_BY5uUD6AEd6cla2oXsPtlA" aggregation="composite">
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s9XBwD6AEd6cla2oXsPtlA"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s9XBwT6AEd6cla2oXsPtlA" value="1"/>
- </ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_SgOtkD5-Ed6cla2oXsPtlA" name="RTO_QTY_QTY">
<ownedRule xmi:id="_hY1ToDU3EeCMTMnRUBJ_FQ" name="denominator" constrainedElement="_SgOtkD5-Ed6cla2oXsPtlA">
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/DatatypesPackage.java b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/DatatypesPackage.java
index 7f5c56c..a082daa 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/DatatypesPackage.java
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/DatatypesPackage.java
@@ -305,13 +305,22 @@
int TEL__VALUE = URL__VALUE;
/**
+ * The feature id for the '<em><b>Mixed</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TEL__MIXED = URL_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Useable Period</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int TEL__USEABLE_PERIOD = URL_FEATURE_COUNT + 0;
+ int TEL__USEABLE_PERIOD = URL_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Use</b></em>' attribute list.
@@ -320,16 +329,7 @@
* @generated
* @ordered
*/
- int TEL__USE = URL_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Mixed</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TEL__MIXED = URL_FEATURE_COUNT + 2;
+ int TEL__USE = URL_FEATURE_COUNT + 2;
/**
* The number of structural features of the '<em>TEL</em>' class.
@@ -1863,22 +1863,22 @@
int IVL_TS__CENTER = SXCM_TS_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Width</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IVL_TS__WIDTH = SXCM_TS_FEATURE_COUNT + 2;
-
- /**
* The feature id for the '<em><b>High</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int IVL_TS__HIGH = SXCM_TS_FEATURE_COUNT + 3;
+ int IVL_TS__HIGH = SXCM_TS_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Width</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int IVL_TS__WIDTH = SXCM_TS_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>IVL TS</em>' class.
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/IVL_TS.java b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/IVL_TS.java
index 964f400..ffc2ca7 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/IVL_TS.java
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/IVL_TS.java
@@ -25,8 +25,8 @@
* <ul>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.IVL_TS#getLow <em>Low</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.IVL_TS#getCenter <em>Center</em>}</li>
- * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.IVL_TS#getWidth <em>Width</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.IVL_TS#getHigh <em>High</em>}</li>
+ * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.IVL_TS#getWidth <em>Width</em>}</li>
* </ul>
*
* @see org.eclipse.mdht.uml.hl7.datatypes.DatatypesPackage#getIVL_TS()
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/TEL.java b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/TEL.java
index 0c9c6e5..a8b07ab 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/TEL.java
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/TEL.java
@@ -23,13 +23,13 @@
* The following features are supported:
* </p>
* <ul>
+ * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.TEL#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.TEL#getUseablePeriods <em>Useable Period</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.TEL#getUses <em>Use</em>}</li>
- * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.TEL#getMixed <em>Mixed</em>}</li>
* </ul>
*
* @see org.eclipse.mdht.uml.hl7.datatypes.DatatypesPackage#getTEL()
- * @model extendedMetaData="kind='mixed' name=''"
+ * @model extendedMetaData="kind='mixed'"
* @generated
*/
public interface TEL extends URL {
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/DatatypesPackageImpl.java b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/DatatypesPackageImpl.java
index fe3ac02..49e5cea 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/DatatypesPackageImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/DatatypesPackageImpl.java
@@ -630,7 +630,7 @@
*/
@Override
public EReference getTEL_UseablePeriod() {
- return (EReference) telEClass.getEStructuralFeatures().get(0);
+ return (EReference) telEClass.getEStructuralFeatures().get(1);
}
/**
@@ -640,7 +640,7 @@
*/
@Override
public EAttribute getTEL_Use() {
- return (EAttribute) telEClass.getEStructuralFeatures().get(1);
+ return (EAttribute) telEClass.getEStructuralFeatures().get(2);
}
/**
@@ -650,7 +650,7 @@
*/
@Override
public EAttribute getTEL_Mixed() {
- return (EAttribute) telEClass.getEStructuralFeatures().get(2);
+ return (EAttribute) telEClass.getEStructuralFeatures().get(0);
}
/**
@@ -1470,7 +1470,7 @@
*/
@Override
public EReference getIVL_TS_High() {
- return (EReference) ivL_TSEClass.getEStructuralFeatures().get(3);
+ return (EReference) ivL_TSEClass.getEStructuralFeatures().get(2);
}
/**
@@ -1480,7 +1480,7 @@
*/
@Override
public EReference getIVL_TS_Width() {
- return (EReference) ivL_TSEClass.getEStructuralFeatures().get(2);
+ return (EReference) ivL_TSEClass.getEStructuralFeatures().get(3);
}
/**
@@ -2301,9 +2301,9 @@
createEAttribute(edEClass, ED__INTEGRITY_CHECK_ALGORITHM);
telEClass = createEClass(TEL);
+ createEAttribute(telEClass, TEL__MIXED);
createEReference(telEClass, TEL__USEABLE_PERIOD);
createEAttribute(telEClass, TEL__USE);
- createEAttribute(telEClass, TEL__MIXED);
urlEClass = createEClass(URL);
createEAttribute(urlEClass, URL__VALUE);
@@ -2405,8 +2405,8 @@
ivL_TSEClass = createEClass(IVL_TS);
createEReference(ivL_TSEClass, IVL_TS__LOW);
createEReference(ivL_TSEClass, IVL_TS__CENTER);
- createEReference(ivL_TSEClass, IVL_TS__WIDTH);
createEReference(ivL_TSEClass, IVL_TS__HIGH);
+ createEReference(ivL_TSEClass, IVL_TS__WIDTH);
ivxB_TSEClass = createEClass(IVXB_TS);
createEAttribute(ivxB_TSEClass, IVXB_TS__INCLUSIVE);
@@ -2688,16 +2688,18 @@
initEClass(
telEClass, org.eclipse.mdht.uml.hl7.datatypes.TEL.class, "TEL", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(
+ getTEL_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1,
+ org.eclipse.mdht.uml.hl7.datatypes.TEL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(
- getTEL_UseablePeriod(), this.getSXCM_TS(), null, "useablePeriod", null, 0, -1, null, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- !IS_ORDERED);
+ getTEL_UseablePeriod(), this.getSXCM_TS(), null, "useablePeriod", null, 0, -1,
+ org.eclipse.mdht.uml.hl7.datatypes.TEL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEAttribute(
- getTEL_Use(), theVocabPackage.getTelecommunicationAddressUse(), "use", null, 0, -1, null, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEAttribute(
- getTEL_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ getTEL_Use(), theVocabPackage.getTelecommunicationAddressUse(), "use", null, 0, -1,
+ org.eclipse.mdht.uml.hl7.datatypes.TEL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
addEOperation(telEClass, theTypesPackage.getString(), "getText", 1, 1, IS_UNIQUE, !IS_ORDERED);
@@ -3572,13 +3574,13 @@
org.eclipse.mdht.uml.hl7.datatypes.IVL_TS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(
- getIVL_TS_Width(), this.getPQ(), null, "width", null, 0, 1, org.eclipse.mdht.uml.hl7.datatypes.IVL_TS.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, !IS_ORDERED);
- initEReference(
getIVL_TS_High(), this.getIVXB_TS(), null, "high", null, 0, 1,
org.eclipse.mdht.uml.hl7.datatypes.IVL_TS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(
+ getIVL_TS_Width(), this.getPQ(), null, "width", null, 0, 1, org.eclipse.mdht.uml.hl7.datatypes.IVL_TS.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, !IS_ORDERED);
op = addEOperation(
ivL_TSEClass, ecorePackage.getEBoolean(), "validateOptionsContainingLow", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -4222,10 +4224,10 @@
addAnnotation(getED_Mixed(), source, new String[] { "name", "mixed", "kind", "elementWildcard" });
addAnnotation(getED_Reference(), source, new String[] { "namespace", "urn:hl7-org:v3", "kind", "element" });
addAnnotation(getED_Thumbnail(), source, new String[] { "namespace", "urn:hl7-org:v3", "kind", "element" });
- addAnnotation(telEClass, source, new String[] { "kind", "mixed", "name", "" });
+ addAnnotation(telEClass, source, new String[] { "kind", "mixed" });
+ addAnnotation(getTEL_Mixed(), source, new String[] { "name", "", "namespace", "", "kind", "elementWildcard" });
addAnnotation(getTEL_UseablePeriod(), source, new String[] { "namespace", "urn:hl7-org:v3" });
addAnnotation(getTEL_Use(), source, new String[] { "kind", "attribute" });
- addAnnotation(getTEL_Mixed(), source, new String[] { "name", "", "namespace", "", "kind", "elementWildcard" });
addAnnotation(
tsTypeEDataType, source,
new String[] { "pattern", "[0-9]{1,8}|([0-9]{9,14}|[0-9]{14,14}\\.[0-9]+)([+\\-][0-9]{1,4})?" });
@@ -4358,8 +4360,8 @@
addAnnotation(getENXP_Qualifier(), source, new String[] { "kind", "attribute" });
addAnnotation(getIVL_TS_Low(), source, new String[] { "namespace", "urn:hl7-org:v3" });
addAnnotation(getIVL_TS_Center(), source, new String[] { "namespace", "urn:hl7-org:v3" });
- addAnnotation(getIVL_TS_Width(), source, new String[] { "namespace", "urn:hl7-org:v3" });
addAnnotation(getIVL_TS_High(), source, new String[] { "namespace", "urn:hl7-org:v3" });
+ addAnnotation(getIVL_TS_Width(), source, new String[] { "namespace", "urn:hl7-org:v3" });
addAnnotation(getPQ_Translation(), source, new String[] { "namespace", "urn:hl7-org:v3" });
addAnnotation(onEClass, source, new String[] { "kind", "mixed" });
addAnnotation(pnEClass, source, new String[] { "kind", "mixed" });
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/IVL_TSImpl.java b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/IVL_TSImpl.java
index ba865eb..9d1b587 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/IVL_TSImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/IVL_TSImpl.java
@@ -35,8 +35,8 @@
* <ul>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.IVL_TSImpl#getLow <em>Low</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.IVL_TSImpl#getCenter <em>Center</em>}</li>
- * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.IVL_TSImpl#getWidth <em>Width</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.IVL_TSImpl#getHigh <em>High</em>}</li>
+ * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.IVL_TSImpl#getWidth <em>Width</em>}</li>
* </ul>
*
* @generated
@@ -63,16 +63,6 @@
protected TS center;
/**
- * The cached value of the '{@link #getWidth() <em>Width</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWidth()
- * @generated
- * @ordered
- */
- protected PQ width;
-
- /**
* The cached value of the '{@link #getHigh() <em>High</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -83,6 +73,16 @@
protected IVXB_TS high;
/**
+ * The cached value of the '{@link #getWidth() <em>Width</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getWidth()
+ * @generated
+ * @ordered
+ */
+ protected PQ width;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -374,10 +374,10 @@
return basicSetLow(null, msgs);
case DatatypesPackage.IVL_TS__CENTER:
return basicSetCenter(null, msgs);
- case DatatypesPackage.IVL_TS__WIDTH:
- return basicSetWidth(null, msgs);
case DatatypesPackage.IVL_TS__HIGH:
return basicSetHigh(null, msgs);
+ case DatatypesPackage.IVL_TS__WIDTH:
+ return basicSetWidth(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -394,10 +394,10 @@
return getLow();
case DatatypesPackage.IVL_TS__CENTER:
return getCenter();
- case DatatypesPackage.IVL_TS__WIDTH:
- return getWidth();
case DatatypesPackage.IVL_TS__HIGH:
return getHigh();
+ case DatatypesPackage.IVL_TS__WIDTH:
+ return getWidth();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -416,12 +416,12 @@
case DatatypesPackage.IVL_TS__CENTER:
setCenter((TS) newValue);
return;
- case DatatypesPackage.IVL_TS__WIDTH:
- setWidth((PQ) newValue);
- return;
case DatatypesPackage.IVL_TS__HIGH:
setHigh((IVXB_TS) newValue);
return;
+ case DatatypesPackage.IVL_TS__WIDTH:
+ setWidth((PQ) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -440,12 +440,12 @@
case DatatypesPackage.IVL_TS__CENTER:
setCenter((TS) null);
return;
- case DatatypesPackage.IVL_TS__WIDTH:
- setWidth((PQ) null);
- return;
case DatatypesPackage.IVL_TS__HIGH:
setHigh((IVXB_TS) null);
return;
+ case DatatypesPackage.IVL_TS__WIDTH:
+ setWidth((PQ) null);
+ return;
}
super.eUnset(featureID);
}
@@ -462,10 +462,10 @@
return low != null;
case DatatypesPackage.IVL_TS__CENTER:
return center != null;
- case DatatypesPackage.IVL_TS__WIDTH:
- return width != null;
case DatatypesPackage.IVL_TS__HIGH:
return high != null;
+ case DatatypesPackage.IVL_TS__WIDTH:
+ return width != null;
}
return super.eIsSet(featureID);
}
diff --git a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/TELImpl.java b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/TELImpl.java
index 52d4665..763c3a5 100644
--- a/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/TELImpl.java
+++ b/cda/plugins/org.eclipse.mdht.uml.hl7.datatypes/src/org/eclipse/mdht/uml/hl7/datatypes/impl/TELImpl.java
@@ -35,15 +35,25 @@
* The following features are implemented:
* </p>
* <ul>
+ * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.TELImpl#getMixed <em>Mixed</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.TELImpl#getUseablePeriods <em>Useable Period</em>}</li>
* <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.TELImpl#getUses <em>Use</em>}</li>
- * <li>{@link org.eclipse.mdht.uml.hl7.datatypes.impl.TELImpl#getMixed <em>Mixed</em>}</li>
* </ul>
*
* @generated
*/
public class TELImpl extends URLImpl implements TEL {
/**
+ * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMixed()
+ * @generated
+ * @ordered
+ */
+ protected FeatureMap mixed;
+
+ /**
* The cached value of the '{@link #getUseablePeriods() <em>Useable Period</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -64,16 +74,6 @@
protected EList<TelecommunicationAddressUse> uses;
/**
- * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMixed()
- * @generated
- * @ordered
- */
- protected FeatureMap mixed;
-
- /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -172,10 +172,10 @@
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case DatatypesPackage.TEL__USEABLE_PERIOD:
- return ((InternalEList<?>) getUseablePeriods()).basicRemove(otherEnd, msgs);
case DatatypesPackage.TEL__MIXED:
return ((InternalEList<?>) getMixed()).basicRemove(otherEnd, msgs);
+ case DatatypesPackage.TEL__USEABLE_PERIOD:
+ return ((InternalEList<?>) getUseablePeriods()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -188,15 +188,15 @@
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case DatatypesPackage.TEL__USEABLE_PERIOD:
- return getUseablePeriods();
- case DatatypesPackage.TEL__USE:
- return getUses();
case DatatypesPackage.TEL__MIXED:
if (coreType) {
return getMixed();
}
return ((FeatureMap.Internal) getMixed()).getWrapper();
+ case DatatypesPackage.TEL__USEABLE_PERIOD:
+ return getUseablePeriods();
+ case DatatypesPackage.TEL__USE:
+ return getUses();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -210,6 +210,9 @@
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case DatatypesPackage.TEL__MIXED:
+ ((FeatureMap.Internal) getMixed()).set(newValue);
+ return;
case DatatypesPackage.TEL__USEABLE_PERIOD:
getUseablePeriods().clear();
getUseablePeriods().addAll((Collection<? extends SXCM_TS>) newValue);
@@ -218,9 +221,6 @@
getUses().clear();
getUses().addAll((Collection<? extends TelecommunicationAddressUse>) newValue);
return;
- case DatatypesPackage.TEL__MIXED:
- ((FeatureMap.Internal) getMixed()).set(newValue);
- return;
}
super.eSet(featureID, newValue);
}
@@ -233,15 +233,15 @@
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case DatatypesPackage.TEL__MIXED:
+ getMixed().clear();
+ return;
case DatatypesPackage.TEL__USEABLE_PERIOD:
getUseablePeriods().clear();
return;
case DatatypesPackage.TEL__USE:
unsetUses();
return;
- case DatatypesPackage.TEL__MIXED:
- getMixed().clear();
- return;
}
super.eUnset(featureID);
}
@@ -254,12 +254,12 @@
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case DatatypesPackage.TEL__MIXED:
+ return mixed != null && !mixed.isEmpty();
case DatatypesPackage.TEL__USEABLE_PERIOD:
return useablePeriods != null && !useablePeriods.isEmpty();
case DatatypesPackage.TEL__USE:
return isSetUses();
- case DatatypesPackage.TEL__MIXED:
- return mixed != null && !mixed.isEmpty();
}
return super.eIsSet(featureID);
}
@@ -276,10 +276,10 @@
}
StringBuilder result = new StringBuilder(super.toString());
- result.append(" (use: ");
- result.append(uses);
- result.append(", mixed: ");
+ result.append(" (mixed: ");
result.append(mixed);
+ result.append(", use: ");
+ result.append(uses);
result.append(')');
return result.toString();
}
