right
diff --git a/testGitExtLibrary/extlibrary.ecore b/testGitExtLibrary/extlibrary.ecore index 0cea4a6..9501ecc 100644 --- a/testGitExtLibrary/extlibrary.ecore +++ b/testGitExtLibrary/extlibrary.ecore
@@ -2,14 +2,14 @@ <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="extlibrary" nsURI="http:///org/eclipse/emf/examples/library/extlibrary.ecore/1.0.0" nsPrefix="extlib"> - <eClassifiers xsi:type="ecore:EClass" name="Book" eSuperTypes="#//CirculatingItem"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eClassifiers xsi:type="ecore:EClass" name="Book" eSuperTypes="#//CirculatingItem #//TitledItem"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="pages" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="100"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="#//BookCategory" unsettable="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="author" lowerBound="1" eType="#//Writer" eOpposite="#//Writer/books"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="subtitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Library" eSuperTypes="#//Addressable"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -59,6 +59,8 @@ <eLiterals name="Mystery"/> <eLiterals name="ScienceFiction" value="1"/> <eLiterals name="Biography" value="2"/> + <eLiterals name="Manga" value="3" literal="Manga"/> + <eLiterals name="Manhwa" value="5"/> </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"/> @@ -70,19 +72,16 @@ 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"/> + <eClassifiers xsi:type="ecore:EClass" name="Periodical" abstract="true" eSuperTypes="#//Item #//TitledItem"> <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="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" + <eClassifiers xsi:type="ecore:EClass" name="AudioVisualItem" abstract="true" eSuperTypes="#//CirculatingItem #//TitledItem"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="minutes" 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"> @@ -95,7 +94,7 @@ <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" + <eStructuralFeatures xsi:type="ecore:EAttribute" name="familyName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Employee" eSuperTypes="#//Person"> @@ -104,4 +103,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="#//Periodical"/> + <eClassifiers xsi:type="ecore:EClass" name="TitledItem"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> </ecore:EPackage>