[#1346] Remove RO descriptors layer

apply to features Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · Apr 30, 2024 · 1026684 · 1026684
1 parent ce85176
commit 1026684
Show file tree

Hide file tree

Showing 44 changed files with 195 additions and 830 deletions.
diff --git a/bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore b/bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore
@@ -1,22 +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="features" nsURI="http://www.eclipse.org/passage/lic/features/2.0.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="features" nsURI="http://www.eclipse.org/passage/lic/features/3.0.0"
     nsPrefix="features">
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureSetDescriptor" instanceClassName="org.eclipse.passage.lic.features.FeatureSetDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureDescriptor" instanceClassName="org.eclipse.passage.lic.features.FeatureDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureVersionDescriptor" instanceClassName="org.eclipse.passage.lic.features.FeatureVersionDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureSet" eSuperTypes="#//FeatureSetDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureSet">
     <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="features" upperBound="-1"
         eType="#//Feature" containment="true" eOpposite="#//Feature/featureSet"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Feature" eSuperTypes="#//FeatureDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="Feature">
     <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="provider" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -27,7 +21,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="featureVersions" upperBound="-1"
         eType="#//FeatureVersion" containment="true" eOpposite="#//FeatureVersion/feature"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureVersion" eSuperTypes="#//FeatureVersionDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="FeatureVersion">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"

diff --git a/bundles/org.eclipse.passage.lic.features.edit/plugin.properties b/bundles/org.eclipse.passage.lic.features.edit/plugin.properties
@@ -29,10 +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_FeatureSetDescriptor_type = Feature Set Descriptor
-_UI_FeatureDescriptor_type = Feature Descriptor
-_UI_FeatureVersionDescriptor_type = Feature Version Descriptor
-_UI_FeatureSet_type = Feature Set
+_UI_FeatureSet_type = Feature Set
 _UI_Feature_type = Feature
 _UI_FeatureVersion_type = Feature Version
 _UI_Unknown_type = Object
@@ -46,12 +43,12 @@ _UI_Feature_name_feature = Name
 _UI_Feature_description_feature = Description
 _UI_Feature_featureSet_feature = Feature Set
 _UI_Feature_featureVersions_feature = Feature Versions
+_UI_Feature_provider_feature = Provider
+_UI_FeatureVersion_agreements_feature = Agreements
 _UI_FeatureVersion_version_feature = Version
 _UI_FeatureVersion_feature_feature = Feature
 _UI_FeatureVersion_news_feature = News
-_UI_Unknown_feature = Unspecified
-_UI_Feature_text_pattern = {1} ({0})
+_UI_Unknown_feature = Unspecified
+_UI_Feature_text_pattern = {1} ({0})
 _UI_FeatureSet_text_pattern = {1} ({0})
 _UI_FeatureVersion_text_pattern = {0} {1}
-_UI_Feature_provider_feature = Provider
-_UI_FeatureVersion_agreements_feature = Agreements

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

diff --git a/...e.lic.features.edit/src-gen/org/eclipse/passage/lic/features/edit/FeaturesEditPlugin.java b/...e.lic.features.edit/src-gen/org/eclipse/passage/lic/features/edit/FeaturesEditPlugin.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/...res.edit/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureItemProvider.java b/...res.edit/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureItemProvider.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
@@ -166,7 +166,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/features/edit/providers/FeatureSetItemProvider.java b/....edit/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureSetItemProvider.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/...t/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureVersionItemProvider.java b/...t/src-gen/org/eclipse/passage/lic/features/edit/providers/FeatureVersionItemProvider.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/...n/org/eclipse/passage/lic/features/edit/providers/FeaturesItemProviderAdapterFactory.java b/...n/org/eclipse/passage/lic/features/edit/providers/FeaturesItemProviderAdapterFactory.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.features.model/model/features.genmodel b/bundles/org.eclipse.passage.lic.features.model/model/features.genmodel
@@ -8,7 +8,7 @@
     editorPluginClass="org.eclipse.passage.lic.features.editor.FeaturesEditorPlugin"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" testSuiteClass="org.eclipse.passage.lic.features.model.tests.FeaturesAllTests"
-    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.features.edit" editorPluginID="org.eclipse.passage.lic.features.editor"
     language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"
     cleanup="true" oSGiCompatible="true">
@@ -18,9 +18,6 @@
       classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers"
       presentationPackageSuffix="editor" testsPackageSuffix="model.tests" literalsInterface="false"
       ecorePackage="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#/">
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSetDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureVersionDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSet">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSet/identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.features.ecore/model/features.ecore#//FeatureSet/name"/>

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

diff --git a/...assage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java b/...assage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2021 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
@@ -13,11 +13,8 @@
 package org.eclipse.passage.lic.features.model.api;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.passage.lic.features.FeatureDescriptor;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Feature</b></em>'.
@@ -36,10 +33,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeature()
- * @model superTypes="org.eclipse.passage.lic.features.model.api.FeatureDescriptor"
+ * @model
  * @generated
  */
-public interface Feature extends EObject, FeatureDescriptor {
+public interface Feature extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -50,7 +47,6 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getIdentifier();
 
 	/**
@@ -73,7 +69,6 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getProvider();
 
 	/**
@@ -96,7 +91,6 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -119,7 +113,6 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getDescription();
 
 	/**
@@ -144,7 +137,6 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * @model opposite="features" required="true" transient="false"
 	 * @generated
 	 */
-	@Override
 	FeatureSet getFeatureSet();
 
 	/**
@@ -169,7 +161,6 @@ public interface Feature extends EObject, FeatureDescriptor {
 	 * @model opposite="feature" containment="true"
 	 * @generated
 	 */
-	@Override
 	EList<FeatureVersion> getFeatureVersions();
 
 } // Feature
diff --git a/...age.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java b/...age.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2021 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
@@ -13,11 +13,8 @@
 package org.eclipse.passage.lic.features.model.api;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.passage.lic.features.FeatureSetDescriptor;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Feature Set</b></em>'.
@@ -34,10 +31,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeatureSet()
- * @model superTypes="org.eclipse.passage.lic.features.model.api.FeatureSetDescriptor"
+ * @model
  * @generated
  */
-public interface FeatureSet extends EObject, FeatureSetDescriptor {
+public interface FeatureSet extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -48,7 +45,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getIdentifier();
 
 	/**
@@ -71,7 +67,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -94,7 +89,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getDescription();
 
 	/**
@@ -119,7 +113,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor {
 	 * @model opposite="featureSet" containment="true"
 	 * @generated
 	 */
-	@Override
 	EList<Feature> getFeatures();
 
 } // FeatureSet
diff --git a/...lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureVersion.java b/...lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureVersion.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2021 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,8 +14,6 @@
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.passage.lic.features.FeatureVersionDescriptor;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Feature Version</b></em>'.
@@ -31,10 +29,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeatureVersion()
- * @model superTypes="org.eclipse.passage.lic.features.model.api.FeatureVersionDescriptor"
+ * @model
  * @generated
  */
-public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
+public interface FeatureVersion extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Version</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -45,7 +43,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getVersion();
 
 	/**
@@ -70,7 +67,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 	 * @model opposite="featureVersions" required="true" transient="false"
 	 * @generated
 	 */
-	@Override
 	Feature getFeature();
 
 	/**
@@ -93,7 +89,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getNews();
 
 	/**

diff --git a/...e.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureImpl.java b/...e.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2021 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
@@ -17,23 +17,17 @@
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.passage.lic.features.model.api.Feature;
 import org.eclipse.passage.lic.features.model.api.FeatureSet;
 import org.eclipse.passage.lic.features.model.api.FeatureVersion;
-
 import org.eclipse.passage.lic.features.model.meta.FeaturesPackage;
 
 /**
@@ -521,4 +515,4 @@ public String toString() {
 		return result.toString();
 	}
 
-} //FeatureImpl
+} // FeatureImpl