regenerated example library model code

The ecore and the genmodel have been updated so that they respect the generated Java code (which had previsously been refactored through jdt) Change-Id: I52dbc1f10b628d93b3d9e950c8f5c14da7ff0138
eclipse-emf-parsley · Dec 23, 2016 · 2ccb0e0 · 2ccb0e0
1 parent 7a9fe5b
commit 2ccb0e0
Show file tree

Hide file tree

Showing 34 changed files with 4,553 additions and 4,700 deletions.
diff --git a/examples/org.eclipse.emf.parsley.examples.library/model/extlibrary.ecore b/examples/org.eclipse.emf.parsley.examples.library/model/extlibrary.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/parsley/examples/library/extlibrary.ecore/0.1.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="library" nsURI="http:///org/eclipse/emf/parsley/examples/library/extlibrary.ecore/0.1.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"/>

diff --git a/examples/org.eclipse.emf.parsley.examples.library/model/extlibrary.genmodel b/examples/org.eclipse.emf.parsley.examples.library/model/extlibrary.genmodel
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.parsley.examples.library/src"
     editDirectory="/org.eclipse.emf.parsley.examples.library.edit/src" editorDirectory="/org.eclipse.emf.parsley.examples.library.editor/src"
     modelPluginID="org.eclipse.emf.parsley.examples.library" runtimeJar="true" modelName="EXTLibrary"
@@ -10,14 +9,14 @@
     importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="5.0"
     language="en">
   <foreignModel>extlibrary.ecore</foreignModel>
-  <genPackages prefix="EXTLibrary" basePackage="org.eclipse.emf.examples" disposableProviderFactory="true"
-      contentTypeIdentifier="emfParsleyLibrary" ecorePackage="extlibrary.ecore#/">
+  <genPackages prefix="EXTLibrary" basePackage="org.eclipse.emf.parsley.examples"
+      disposableProviderFactory="true" contentTypeIdentifier="emfParsleyLibrary" ecorePackage="extlibrary.ecore#/">
     <genEnums ecoreEnum="extlibrary.ecore#//BookCategory">
       <genEnumLiterals ecoreEnumLiteral="extlibrary.ecore#//BookCategory/Mystery"/>
       <genEnumLiterals ecoreEnumLiteral="extlibrary.ecore#//BookCategory/ScienceFiction"/>
       <genEnumLiterals ecoreEnumLiteral="extlibrary.ecore#//BookCategory/Biography"/>
     </genEnums>
-    <genClasses ecoreClass="extlibrary.ecore#//Book" labelFeature="#//extlibrary/Book/title">
+    <genClasses ecoreClass="extlibrary.ecore#//Book" labelFeature="#//library/Book/title">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Book/title"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Book/pages"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Book/category"/>
@@ -46,30 +45,30 @@
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference extlibrary.ecore#//Lendable/borrowers"/>
     </genClasses>
     <genClasses ecoreClass="extlibrary.ecore#//CirculatingItem"/>
-    <genClasses image="false" ecoreClass="extlibrary.ecore#//Periodical" labelFeature="#//extlibrary/Periodical/title">
+    <genClasses image="false" ecoreClass="extlibrary.ecore#//Periodical" labelFeature="#//library/Periodical/title">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Periodical/title"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Periodical/issuesPerYear"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="extlibrary.ecore#//AudioVisualItem" labelFeature="#//extlibrary/AudioVisualItem/title">
+    <genClasses image="false" ecoreClass="extlibrary.ecore#//AudioVisualItem" labelFeature="#//library/AudioVisualItem/title">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//AudioVisualItem/title"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//AudioVisualItem/minutesLength"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//AudioVisualItem/damaged"/>
     </genClasses>
-    <genClasses ecoreClass="extlibrary.ecore#//BookOnTape" labelFeature="#//extlibrary/AudioVisualItem/title">
+    <genClasses ecoreClass="extlibrary.ecore#//BookOnTape" labelFeature="#//library/AudioVisualItem/title">
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference extlibrary.ecore#//BookOnTape/reader"/>
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference extlibrary.ecore#//BookOnTape/author"/>
     </genClasses>
-    <genClasses ecoreClass="extlibrary.ecore#//VideoCassette" labelFeature="#//extlibrary/AudioVisualItem/title">
+    <genClasses ecoreClass="extlibrary.ecore#//VideoCassette" labelFeature="#//library/AudioVisualItem/title">
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference extlibrary.ecore#//VideoCassette/cast"/>
     </genClasses>
-    <genClasses ecoreClass="extlibrary.ecore#//Borrower" labelFeature="#//extlibrary/Person/lastName">
+    <genClasses ecoreClass="extlibrary.ecore#//Borrower" labelFeature="#//library/Person/lastName">
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference extlibrary.ecore#//Borrower/borrowed"/>
     </genClasses>
-    <genClasses ecoreClass="extlibrary.ecore#//Person" labelFeature="#//extlibrary/Person/lastName">
+    <genClasses ecoreClass="extlibrary.ecore#//Person" labelFeature="#//library/Person/lastName">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Person/firstName"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute extlibrary.ecore#//Person/lastName"/>
     </genClasses>
-    <genClasses ecoreClass="extlibrary.ecore#//Employee" labelFeature="#//extlibrary/Person/lastName">
+    <genClasses ecoreClass="extlibrary.ecore#//Employee" labelFeature="#//library/Person/lastName">
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference extlibrary.ecore#//Employee/manager"/>
     </genClasses>
     <genClasses ecoreClass="extlibrary.ecore#//Addressable">

diff --git a/...mf.parsley.examples.library/src/org/eclipse/emf/parsley/examples/library/Addressable.java b/...mf.parsley.examples.library/src/org/eclipse/emf/parsley/examples/library/Addressable.java
@@ -27,10 +27,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.emf.parsley.examples.library.Addressable#getAddress <em>Address</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAddressable()
  * @model interface="true" abstract="true"
@@ -39,25 +39,25 @@
 public interface Addressable extends EObject
 {
   /**
-   * Returns the value of the '<em><b>Address</b></em>' attribute.
-   * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Address</b></em>' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Address</em>' attribute.
-   * @see #setAddress(String)
-   * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAddressable_Address()
-   * @model
-   * @generated
-   */
+	 * @return the value of the '<em>Address</em>' attribute.
+	 * @see #setAddress(String)
+	 * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAddressable_Address()
+	 * @model
+	 * @generated
+	 */
   String getAddress();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.Addressable#getAddress <em>Address</em>}' attribute.
-   * <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.Addressable#getAddress <em>Address</em>}' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Address</em>' attribute.
-   * @see #getAddress()
-   * @generated
-   */
+	 * @param value the new value of the '<em>Address</em>' attribute.
+	 * @see #getAddress()
+	 * @generated
+	 */
   void setAddress(String value);
 
 } // Addressable
diff --git a/...arsley.examples.library/src/org/eclipse/emf/parsley/examples/library/AudioVisualItem.java b/...arsley.examples.library/src/org/eclipse/emf/parsley/examples/library/AudioVisualItem.java
@@ -24,12 +24,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#getTitle <em>Title</em>}</li>
  *   <li>{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#getMinutesLength <em>Minutes Length</em>}</li>
  *   <li>{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#isDamaged <em>Damaged</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem()
  * @model abstract="true"
@@ -38,69 +38,69 @@
 public interface AudioVisualItem extends CirculatingItem
 {
   /**
-   * Returns the value of the '<em><b>Title</b></em>' attribute.
-   * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Title</em>' attribute.
-   * @see #setTitle(String)
-   * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem_Title()
-   * @model
-   * @generated
-   */
+	 * @return the value of the '<em>Title</em>' attribute.
+	 * @see #setTitle(String)
+	 * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem_Title()
+	 * @model
+	 * @generated
+	 */
   String getTitle();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#getTitle <em>Title</em>}' attribute.
-   * <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#getTitle <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Title</em>' attribute.
-   * @see #getTitle()
-   * @generated
-   */
+	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * @see #getTitle()
+	 * @generated
+	 */
   void setTitle(String value);
 
   /**
-   * Returns the value of the '<em><b>Minutes Length</b></em>' attribute.
-   * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Minutes Length</b></em>' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Minutes Length</em>' attribute.
-   * @see #setMinutesLength(int)
-   * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem_MinutesLength()
-   * @model required="true"
-   * @generated
-   */
+	 * @return the value of the '<em>Minutes Length</em>' attribute.
+	 * @see #setMinutesLength(int)
+	 * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem_MinutesLength()
+	 * @model required="true"
+	 * @generated
+	 */
   int getMinutesLength();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#getMinutesLength <em>Minutes Length</em>}' attribute.
-   * <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#getMinutesLength <em>Minutes Length</em>}' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Minutes Length</em>' attribute.
-   * @see #getMinutesLength()
-   * @generated
-   */
+	 * @param value the new value of the '<em>Minutes Length</em>' attribute.
+	 * @see #getMinutesLength()
+	 * @generated
+	 */
   void setMinutesLength(int value);
 
   /**
-   * Returns the value of the '<em><b>Damaged</b></em>' attribute.
-   * <!-- begin-user-doc -->
+	 * Returns the value of the '<em><b>Damaged</b></em>' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Damaged</em>' attribute.
-   * @see #setDamaged(boolean)
-   * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem_Damaged()
-   * @model
-   * @generated
-   */
+	 * @return the value of the '<em>Damaged</em>' attribute.
+	 * @see #setDamaged(boolean)
+	 * @see org.eclipse.emf.parsley.examples.library.EXTLibraryPackage#getAudioVisualItem_Damaged()
+	 * @model
+	 * @generated
+	 */
   boolean isDamaged();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#isDamaged <em>Damaged</em>}' attribute.
-   * <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.emf.parsley.examples.library.AudioVisualItem#isDamaged <em>Damaged</em>}' attribute.
+	 * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Damaged</em>' attribute.
-   * @see #isDamaged()
-   * @generated
-   */
+	 * @param value the new value of the '<em>Damaged</em>' attribute.
+	 * @see #isDamaged()
+	 * @generated
+	 */
   void setDamaged(boolean value);
 
 } // AudioVisualItem