eclipse-passage · eparovyshnaya · Apr 14, 2021 · Apr 14, 2021
diff --git a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
@@ -12,6 +12,18 @@
       abstract="true" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="ProductRefDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.ProductRefDescriptor"
       abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="LicenseRequisitesDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor"
+      abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="PersonalLicenseRequisitesDescriptor"
+      instanceClassName="org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor"
+      abstract="true" interface="true" eSuperTypes="#//LicenseRequisitesDescriptor"/>
+  <eClassifiers xsi:type="ecore:EClass" name="FloatingLicenseRequisitesDescriptor"
+      instanceClassName="org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor"
+      abstract="true" interface="true" eSuperTypes="#//LicenseRequisitesDescriptor"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ValidityPeriodDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor"
+      abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ValidityPeriodClosedDescriptor" instanceClassName="org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor"
+      abstract="true" interface="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="LicensePlan" eSuperTypes="#//LicensePlanDescriptor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
         iD="true"/>
@@ -83,7 +95,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="features" lowerBound="1"
         upperBound="-1" eType="#//FeatureGrant" containment="true" eOpposite="#//FeatureGrant/pack"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LicenseRequisites" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="LicenseRequisites" abstract="true" eSuperTypes="#//LicenseRequisitesDescriptor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="issueDate" lowerBound="1"
@@ -94,10 +106,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="valid" lowerBound="1" eType="#//ValidityPeriod"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PersonalLicenseRequisites" eSuperTypes="#//LicenseRequisites">
+  <eClassifiers xsi:type="ecore:EClass" name="PersonalLicenseRequisites" eSuperTypes="#//LicenseRequisites #//PersonalLicenseRequisitesDescriptor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="user" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FloatingLicenseRequisites" eSuperTypes="#//LicenseRequisites">
+  <eClassifiers xsi:type="ecore:EClass" name="FloatingLicenseRequisites" eSuperTypes="#//LicenseRequisites #//FloatingLicenseRequisitesDescriptor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="company" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
@@ -133,8 +145,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="pack" lowerBound="1" eType="#//FloatingLicensePack"
         eOpposite="#//FloatingLicensePack/features"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValidityPeriod" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ValidityPeriodClosed" eSuperTypes="#//ValidityPeriod">
+  <eClassifiers xsi:type="ecore:EClass" name="ValidityPeriod" abstract="true" interface="true"
+      eSuperTypes="#//ValidityPeriodDescriptor"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ValidityPeriodClosed" eSuperTypes="#//ValidityPeriod #//ValidityPeriodClosedDescriptor">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="from" ordered="false" unique="false"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="until" ordered="false"

diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
@@ -140,3 +140,8 @@ _UI_PersonalLicenseRequisites_type = Personal License Requisites
 _UI_FloatingLicenseRequisites_type = Floating License Requisites
 _UI_PersonalLicenseRequisites_user_feature = User
 _UI_FloatingLicenseRequisites_company_feature = Company
+_UI_LicenseRequisitesDescriptor_type = License Requisites Descriptor
+_UI_PersonalLicenseRequisitesDescriptor_type = Personal License Requisites Descriptor
+_UI_FloatingLicenseRequisitesDescriptor_type = Floating License Requisites Descriptor
+_UI_ValidityPeriodDescriptor_type = Validity Period Descriptor
+_UI_ValidityPeriodClosedDescriptor_type = Validity Period Closed Descriptor

diff --git a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Copyright: %Bundle-Copyright
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0",
  org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport,

diff --git a/bundles/org.eclipse.passage.lic.licenses.model/model/licenses..genmodel b/bundles/org.eclipse.passage.lic.licenses.model/model/licenses..genmodel
@@ -22,6 +22,11 @@
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePackDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicenseGrantDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//ProductRefDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicenseRequisitesDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//PersonalLicenseRequisitesDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//FloatingLicenseRequisitesDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//ValidityPeriodDescriptor"/>
+    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//ValidityPeriodClosedDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePlan">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePlan/identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore#//LicensePlan/name"/>

diff --git a/...s.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicenseRequisites.java b/...s.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicenseRequisites.java
@@ -12,6 +12,8 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.licenses.model.api;
 
+import org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Floating License Requisites</b></em>'.
@@ -25,10 +27,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getFloatingLicenseRequisites()
- * @model
+ * @model superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisites org.eclipse.passage.lic.licenses.model.api.FloatingLicenseRequisitesDescriptor"
  * @generated
  */
-public interface FloatingLicenseRequisites extends LicenseRequisites {
+public interface FloatingLicenseRequisites extends LicenseRequisites, FloatingLicenseRequisitesDescriptor {
 	/**
 	 * Returns the value of the '<em><b>Company</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -39,6 +41,7 @@ public interface FloatingLicenseRequisites extends LicenseRequisites {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getCompany();
 
 	/**

diff --git a/....licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseRequisites.java b/....licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseRequisites.java
@@ -15,6 +15,7 @@
 import java.util.Date;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +34,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getLicenseRequisites()
- * @model abstract="true"
+ * @model abstract="true" superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisitesDescriptor"
  * @generated
  */
-public interface LicenseRequisites extends EObject {
+public interface LicenseRequisites extends EObject, LicenseRequisitesDescriptor {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -47,6 +48,7 @@ public interface LicenseRequisites extends EObject {
 	 * @model id="true" required="true"
 	 * @generated
 	 */
+	@Override
 	String getIdentifier();
 
 	/**
@@ -69,6 +71,7 @@ public interface LicenseRequisites extends EObject {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	Date getIssueDate();
 
 	/**
@@ -91,6 +94,7 @@ public interface LicenseRequisites extends EObject {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getPlan();
 
 	/**
@@ -113,6 +117,7 @@ public interface LicenseRequisites extends EObject {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
+	@Override
 	ProductRef getProduct();
 
 	/**
@@ -135,6 +140,7 @@ public interface LicenseRequisites extends EObject {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
+	@Override
 	ValidityPeriod getValid();
 
 	/**

diff --git a/...s.model/src-gen/org/eclipse/passage/lic/licenses/model/api/PersonalLicenseRequisites.java b/...s.model/src-gen/org/eclipse/passage/lic/licenses/model/api/PersonalLicenseRequisites.java
@@ -12,6 +12,8 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.licenses.model.api;
 
+import org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor;
+
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Personal License Requisites</b></em>'.
@@ -25,10 +27,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getPersonalLicenseRequisites()
- * @model
+ * @model superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisites org.eclipse.passage.lic.licenses.model.api.PersonalLicenseRequisitesDescriptor"
  * @generated
  */
-public interface PersonalLicenseRequisites extends LicenseRequisites {
+public interface PersonalLicenseRequisites extends LicenseRequisites, PersonalLicenseRequisitesDescriptor {
 	/**
 	 * Returns the value of the '<em><b>User</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -39,6 +41,7 @@ public interface PersonalLicenseRequisites extends LicenseRequisites {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getUser();
 
 	/**

diff --git a/...lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriod.java b/...lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriod.java
@@ -13,6 +13,7 @@
 package org.eclipse.passage.lic.licenses.model.api;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,8 +22,8 @@
  *
  *
  * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getValidityPeriod()
- * @model interface="true" abstract="true"
+ * @model interface="true" abstract="true" superTypes="org.eclipse.passage.lic.licenses.model.api.ValidityPeriodDescriptor"
  * @generated
  */
-public interface ValidityPeriod extends EObject {
+public interface ValidityPeriod extends EObject, ValidityPeriodDescriptor {
 } // ValidityPeriod
diff --git a/...censes.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriodClosed.java b/...censes.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriodClosed.java
@@ -13,6 +13,7 @@
 package org.eclipse.passage.lic.licenses.model.api;
 
 import java.util.Date;
+import org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,10 +29,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getValidityPeriodClosed()
- * @model
+ * @model superTypes="org.eclipse.passage.lic.licenses.model.api.ValidityPeriod org.eclipse.passage.lic.licenses.model.api.ValidityPeriodClosedDescriptor"
  * @generated
  */
-public interface ValidityPeriodClosed extends ValidityPeriod {
+public interface ValidityPeriodClosed extends ValidityPeriod, ValidityPeriodClosedDescriptor {
 	/**
 	 * Returns the value of the '<em><b>From</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -42,6 +43,7 @@ public interface ValidityPeriodClosed extends ValidityPeriod {
 	 * @model unique="false" required="true" ordered="false"
 	 * @generated
 	 */
+	@Override
 	Date getFrom();
 
 	/**
@@ -64,6 +66,7 @@ public interface ValidityPeriodClosed extends ValidityPeriod {
 	 * @model unique="false" required="true" ordered="false"
 	 * @generated
 	 */
+	@Override
 	Date getUntil();
 
 	/**