[#1346] Remove RO descriptors layer

Apply to Products domain Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · May 1, 2024 · 24df002 · 24df002
1 parent 7a22a40
commit 24df002
Show file tree

Hide file tree

Showing 78 changed files with 394 additions and 1,275 deletions.
diff --git a/bundles/org.eclipse.passage.lic.products.ecore/model/products.ecore b/bundles/org.eclipse.passage.lic.products.ecore/model/products.ecore
@@ -1,24 +1,16 @@
 <?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="products" nsURI="http://www.eclipse.org/passage/lic/products/0.5.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="products" nsURI="http://www.eclipse.org/passage/lic/products/3.0.0"
     nsPrefix="org.eclipse.passage.lic">
-  <eClassifiers xsi:type="ecore:EClass" name="ProductLineDescriptor" instanceClassName="org.eclipse.passage.lic.products.ProductLineDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductDescriptor" instanceClassName="org.eclipse.passage.lic.products.ProductDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionDescriptor" instanceClassName="org.eclipse.passage.lic.products.ProductVersionDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionFeatureDescriptor" instanceClassName="org.eclipse.passage.lic.products.ProductVersionFeatureDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductLine" eSuperTypes="#//ProductLineDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="ProductLine">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="products" upperBound="-1"
         eType="#//Product" containment="true" eOpposite="#//Product/productLine"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Product" eSuperTypes="#//ProductDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="Product">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -28,7 +20,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="productVersions" upperBound="-1"
         eType="#//ProductVersion" containment="true" eOpposite="#//ProductVersion/product"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductVersion" eSuperTypes="#//ProductVersionDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="ProductVersion">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -40,7 +32,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="productVersionFeatures"
         upperBound="-1" eType="#//ProductVersionFeature" containment="true" eOpposite="#//ProductVersionFeature/productVersion"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionFeature" eSuperTypes="#//ProductVersionFeatureDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="ProductVersionFeature">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureIdentifier" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureVersion" lowerBound="1"

diff --git a/bundles/org.eclipse.passage.lic.products.edit/plugin.properties b/bundles/org.eclipse.passage.lic.products.edit/plugin.properties
@@ -29,11 +29,7 @@ _UI_CreateChild_tooltip = Create New {0} Under {1} Feature
 _UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
 _UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
 _UI_PropertyDescriptor_description = The {0} of the {1}
-_UI_ProductLineDescriptor_type = Product Line Descriptor
-_UI_ProductDescriptor_type = Product Descriptor
-_UI_ProductVersionDescriptor_type = Product Version Descriptor
-_UI_ProductVersionFeatureDescriptor_type = Product Version Feature Descriptor
-_UI_ProductLine_type = Product Line
+_UI_ProductLine_type = Product Line
 _UI_Product_type = Product
 _UI_ProductVersion_type = Product Version
 _UI_ProductVersionFeature_type = Product Version Feature

diff --git a/bundles/org.eclipse.passage.lic.products.edit/plugin.xml b/bundles/org.eclipse.passage.lic.products.edit/plugin.xml
@@ -19,7 +19,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated products -->
       <factory
-            uri="http://www.eclipse.org/passage/lic/products/0.5.0"
+            uri="http://www.eclipse.org/passage/lic/products/3.0.0"
             class="org.eclipse.passage.lic.products.edit.providers.ProductsItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

diff --git a/...e.lic.products.edit/src-gen/org/eclipse/passage/lic/products/edit/ProductsEditPlugin.java b/...e.lic.products.edit/src-gen/org/eclipse/passage/lic/products/edit/ProductsEditPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/...cts.edit/src-gen/org/eclipse/passage/lic/products/edit/providers/ProductItemProvider.java b/...cts.edit/src-gen/org/eclipse/passage/lic/products/edit/providers/ProductItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -149,7 +149,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);

diff --git a/...edit/src-gen/org/eclipse/passage/lic/products/edit/providers/ProductLineItemProvider.java b/...edit/src-gen/org/eclipse/passage/lic/products/edit/providers/ProductLineItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -150,7 +150,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);

diff --git a/...en/org/eclipse/passage/lic/products/edit/providers/ProductVersionFeatureItemProvider.java b/...en/org/eclipse/passage/lic/products/edit/providers/ProductVersionFeatureItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/...t/src-gen/org/eclipse/passage/lic/products/edit/providers/ProductVersionItemProvider.java b/...t/src-gen/org/eclipse/passage/lic/products/edit/providers/ProductVersionItemProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -186,7 +186,8 @@ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object objec
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
+		// Check the type of the specified child object and return the proper feature to
+		// use for
 		// adding (see {@link AddCommand}) it as a child.
 
 		return super.getChildFeature(object, child);

diff --git a/...n/org/eclipse/passage/lic/products/edit/providers/ProductsItemProviderAdapterFactory.java b/...n/org/eclipse/passage/lic/products/edit/providers/ProductsItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at

diff --git a/bundles/org.eclipse.passage.lic.products.model/model/products.genmodel b/bundles/org.eclipse.passage.lic.products.model/model/products.genmodel
@@ -8,7 +8,7 @@
     editorPluginClass="org.eclipse.passage.lic.products.editor.ProductsEditorPlugin"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" testSuiteClass="org.eclipse.passage.lic.model.tests.LicAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false"
     editPluginID="org.eclipse.passage.lic.products.edit" editorPluginID="org.eclipse.passage.lic.products.editor"
     language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"
     cleanup="true" oSGiCompatible="true">
@@ -18,10 +18,6 @@
       classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers"
       presentationPackageSuffix="editor" testsPackageSuffix="model.tests" literalsInterface="false"
       ecorePackage="../../org.eclipse.passage.lic.products.ecore/model/products.ecore#/">
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductLineDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductVersionDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductVersionFeatureDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductLine">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductLine/identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.products.ecore/model/products.ecore#//ProductLine/name"/>

diff --git a/bundles/org.eclipse.passage.lic.products.model/plugin.xml b/bundles/org.eclipse.passage.lic.products.model/plugin.xml
@@ -18,7 +18,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated products -->
       <package
-            uri="http://www.eclipse.org/passage/lic/products/0.5.0"
+            uri="http://www.eclipse.org/passage/lic/products/3.0.0"
             class="org.eclipse.passage.lic.products.model.meta.ProductsPackage"
             genModel="model/products.genmodel"/>
    </extension>

diff --git a/...assage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/api/Product.java b/...assage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/api/Product.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -14,7 +14,6 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.passage.lic.products.ProductDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,10 +34,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.products.model.meta.ProductsPackage#getProduct()
- * @model superTypes="org.eclipse.passage.lic.products.model.api.ProductDescriptor"
+ * @model
  * @generated
  */
-public interface Product extends EObject, ProductDescriptor {
+public interface Product extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -53,7 +52,6 @@ public interface Product extends EObject, ProductDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getIdentifier();
 
 	/**
@@ -81,7 +79,6 @@ public interface Product extends EObject, ProductDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -108,7 +105,6 @@ public interface Product extends EObject, ProductDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getDescription();
 
 	/**
@@ -138,7 +134,6 @@ public interface Product extends EObject, ProductDescriptor {
 	 * @model opposite="products" required="true" transient="false"
 	 * @generated
 	 */
-	@Override
 	ProductLine getProductLine();
 
 	/**
@@ -168,7 +163,6 @@ public interface Product extends EObject, ProductDescriptor {
 	 * @model opposite="product" containment="true"
 	 * @generated
 	 */
-	@Override
 	EList<ProductVersion> getProductVersions();
 
 } // Product
diff --git a/...ge.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/api/ProductLine.java b/...ge.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/api/ProductLine.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -14,7 +14,6 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.passage.lic.products.ProductLineDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,10 +33,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.products.model.meta.ProductsPackage#getProductLine()
- * @model superTypes="org.eclipse.passage.lic.products.model.api.ProductLineDescriptor"
+ * @model
  * @generated
  */
-public interface ProductLine extends EObject, ProductLineDescriptor {
+public interface ProductLine extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -52,7 +51,6 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getIdentifier();
 
 	/**
@@ -80,7 +78,6 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -108,7 +105,6 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getDescription();
 
 	/**
@@ -138,7 +134,6 @@ public interface ProductLine extends EObject, ProductLineDescriptor {
 	 * @model opposite="productLine" containment="true"
 	 * @generated
 	 */
-	@Override
 	EList<Product> getProducts();
 
 } // ProductLine
diff --git a/...lic.products.model/src-gen/org/eclipse/passage/lic/products/model/api/ProductVersion.java b/...lic.products.model/src-gen/org/eclipse/passage/lic/products/model/api/ProductVersion.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 ArSysOp
+ * Copyright (c) 2018, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -14,7 +14,6 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.passage.lic.products.ProductVersionDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,10 +36,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.products.model.meta.ProductsPackage#getProductVersion()
- * @model superTypes="org.eclipse.passage.lic.products.model.api.ProductVersionDescriptor"
+ * @model
  * @generated
  */
-public interface ProductVersion extends EObject, ProductVersionDescriptor {
+public interface ProductVersion extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Version</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -55,7 +54,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getVersion();
 
 	/**
@@ -79,7 +77,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -106,7 +103,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getInstallationToken();
 
 	/**
@@ -134,7 +130,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getSecureToken();
 
 	/**
@@ -162,7 +157,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getNews();
 
 	/**
@@ -192,7 +186,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model opposite="productVersions" required="true" transient="false"
 	 * @generated
 	 */
-	@Override
 	Product getProduct();
 
 	/**
@@ -223,7 +216,6 @@ public interface ProductVersion extends EObject, ProductVersionDescriptor {
 	 * @model opposite="productVersion" containment="true"
 	 * @generated
 	 */
-	@Override
 	EList<ProductVersionFeature> getProductVersionFeatures();
 
 } // ProductVersion