left
diff --git a/testGitExtLibrary/extlibrary.ecore b/testGitExtLibrary/extlibrary.ecore index 0cea4a6..30ad08a 100644 --- a/testGitExtLibrary/extlibrary.ecore +++ b/testGitExtLibrary/extlibrary.ecore
@@ -59,30 +59,26 @@ <eLiterals name="Mystery"/> <eLiterals name="ScienceFiction" value="1"/> <eLiterals name="Biography" value="2"/> + <eLiterals name="Encyclopedia" value="3" literal="Encyclopedia"/> + <eLiterals name="Dictionary" value="4"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Item" abstract="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="publicationDate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Lendable" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="Borrowable" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="copies" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> <eStructuralFeatures xsi:type="ecore:EReference" name="borrowers" ordered="false" upperBound="-1" eType="#//Borrower" eOpposite="#//Borrower/borrowed"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="CirculatingItem" abstract="true" eSuperTypes="#//Item #//Lendable"/> - <eClassifiers xsi:type="ecore:EClass" name="Periodical" abstract="true" eSuperTypes="#//Item"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="issuesPerYear" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="CirculatingItem" abstract="true" eSuperTypes="#//Item #//Borrowable"/> <eClassifiers xsi:type="ecore:EClass" name="AudioVisualItem" abstract="true" eSuperTypes="#//CirculatingItem"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="minutesLength" lowerBound="1" + <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="damaged" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="BookOnTape" eSuperTypes="#//AudioVisualItem"> - <eStructuralFeatures xsi:type="ecore:EReference" name="reader" eType="#//Person"/> <eStructuralFeatures xsi:type="ecore:EReference" name="author" eType="#//Writer"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="VideoCassette" eSuperTypes="#//AudioVisualItem"> @@ -90,13 +86,10 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Borrower" eSuperTypes="#//Person"> <eStructuralFeatures xsi:type="ecore:EReference" name="borrowed" upperBound="-1" - eType="#//Lendable" eOpposite="#//Lendable/borrowers"/> + eType="#//Borrowable" eOpposite="#//Borrowable/borrowers"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//Addressable"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Employee" eSuperTypes="#//Person"> <eStructuralFeatures xsi:type="ecore:EReference" name="manager" eType="#//Employee"/> @@ -104,4 +97,8 @@ <eClassifiers xsi:type="ecore:EClass" name="Addressable" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Magazine" eSuperTypes="#//CirculatingItem"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="pages" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> + </eClassifiers> </ecore:EPackage>