[#1346] Remove RO descriptors layer

apply to Agreements domain Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · Apr 30, 2024 · 850dcf3 · 850dcf3
1 parent 1bc71e5
commit 850dcf3
Show file tree

Hide file tree

Showing 43 changed files with 248 additions and 526 deletions.
diff --git a/bundles/org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore b/bundles/org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore
@@ -1,20 +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="agreements" nsURI="http://www.eclipse.org/passage/lic/agreements/0.1.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="agreements" nsURI="http://www.eclipse.org/passage/lic/agreements/3.0.0"
     nsPrefix="agreements">
-  <eClassifiers xsi:type="ecore:EClass" name="AgreementDescriptor" instanceClassName="org.eclipse.passage.lic.agreements.AgreementDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AgreementGroupDescriptor" instanceClassName="org.eclipse.passage.lic.agreements.AgreementGroupDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Agreement" eSuperTypes="#//AgreementDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="Agreement">
     <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="spdx" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="file" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="mime" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AgreementGroup" eSuperTypes="#//AgreementGroupDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="AgreementGroup">
     <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" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

diff --git a/bundles/org.eclipse.passage.lic.agreements.edit/plugin.properties b/bundles/org.eclipse.passage.lic.agreements.edit/plugin.properties
@@ -21,30 +21,27 @@ available under the terms of the Eclipse Public License 2.0\n\
 which is available at https://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 SPDX-License-Identifier: EPL-2.0\n\
+
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
 _UI_CreateChild_text3 = {1}
 _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_Agreement_type = Agreement
-_UI_AgreementDescriptor_type = Agreement Descriptor
-_UI_AgreementGroupDescriptor_type = Agreement Group Descriptor
+
+_UI_Agreement_type = Agreement
 _UI_AgreementGroup_type = Agreement Group
-_UI_Unknown_type = Object
-_UI_Unknown_datatype= Value
-_UI_Agreement_identifier_feature = Identifier
+_UI_Unknown_type = Object
+_UI_Unknown_datatype= Value
+_UI_Agreement_identifier_feature = Identifier
 _UI_Agreement_spdx_feature = Spdx
 _UI_Agreement_name_feature = Name
 _UI_Agreement_file_feature = File
 _UI_Agreement_mime_feature = Mime
-
 _UI_AgreementGroup_identifier_feature = Identifier
 _UI_AgreementGroup_name_feature = Name
 _UI_AgreementGroup_description_feature = Description
 _UI_AgreementGroup_agreements_feature = Agreements
-
 _UI_Unknown_feature = Unspecified
-
-_UI_CreateChild_text = {0}
+

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

diff --git a/bundles/org.eclipse.passage.lic.agreements.model/model/agreements.genmodel b/bundles/org.eclipse.passage.lic.agreements.model/model/agreements.genmodel
@@ -8,7 +8,7 @@
     editorPluginClass="org.eclipse.passage.lic.agreements.editor.AgreementsEditorPlugin"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" testSuiteClass="org.eclipse.passage.lic.agreements.model.tests.AgreementsAllTests"
-    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.agreements.edit" editorPluginID="org.eclipse.passage.lic.agreements.editor"
     language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"
     cleanup="true" oSGiCompatible="true">
@@ -18,8 +18,6 @@
       classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers"
       presentationPackageSuffix="editor" testsPackageSuffix="model.tests" literalsInterface="false"
       ecorePackage="../../org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore#/">
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore#//AgreementDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore#//AgreementGroupDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore#//Agreement">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore#//Agreement/identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.agreements.ecore/model/agreements.ecore#//Agreement/spdx"/>

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

diff --git a/....lic.agreements.model/src-gen/org/eclipse/passage/lic/agreements/model/api/Agreement.java b/....lic.agreements.model/src-gen/org/eclipse/passage/lic/agreements/model/api/Agreement.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.agreements.AgreementDescriptor;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Agreement</b></em>'.
@@ -33,10 +31,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.agreements.model.meta.AgreementsPackage#getAgreement()
- * @model superTypes="org.eclipse.passage.lic.agreements.model.api.AgreementDescriptor"
+ * @model
  * @generated
  */
-public interface Agreement extends EObject, AgreementDescriptor {
+public interface Agreement extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -47,7 +45,6 @@ public interface Agreement extends EObject, AgreementDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getIdentifier();
 
 	/**
@@ -70,7 +67,6 @@ public interface Agreement extends EObject, AgreementDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getSpdx();
 
 	/**
@@ -93,7 +89,6 @@ public interface Agreement extends EObject, AgreementDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -116,7 +111,6 @@ public interface Agreement extends EObject, AgreementDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getFile();
 
 	/**
@@ -139,7 +133,6 @@ public interface Agreement extends EObject, AgreementDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getMime();
 
 	/**

diff --git a/...agreements.model/src-gen/org/eclipse/passage/lic/agreements/model/api/AgreementGroup.java b/...agreements.model/src-gen/org/eclipse/passage/lic/agreements/model/api/AgreementGroup.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,7 +14,6 @@
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.passage.lic.agreements.AgreementGroupDescriptor;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +31,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.agreements.model.meta.AgreementsPackage#getAgreementGroup()
- * @model superTypes="org.eclipse.passage.lic.agreements.model.api.AgreementGroupDescriptor"
+ * @model
  * @generated
  */
-public interface AgreementGroup extends EObject, AgreementGroupDescriptor {
+public interface AgreementGroup extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -46,7 +45,6 @@ public interface AgreementGroup extends EObject, AgreementGroupDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getIdentifier();
 
 	/**
@@ -69,7 +67,6 @@ public interface AgreementGroup extends EObject, AgreementGroupDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -92,7 +89,6 @@ public interface AgreementGroup extends EObject, AgreementGroupDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getDescription();
 
 	/**
@@ -115,7 +111,6 @@ public interface AgreementGroup extends EObject, AgreementGroupDescriptor {
 	 * @model containment="true"
 	 * @generated
 	 */
-	@Override
 	EList<Agreement> getAgreements();
 
 } // AgreementsGroup
diff --git a/...ments.model/src-gen/org/eclipse/passage/lic/agreements/model/impl/AgreementGroupImpl.java b/...ments.model/src-gen/org/eclipse/passage/lic/agreements/model/impl/AgreementGroupImpl.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,21 +17,15 @@
 
 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.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.passage.lic.agreements.model.api.Agreement;
 import org.eclipse.passage.lic.agreements.model.api.AgreementGroup;
-
 import org.eclipse.passage.lic.agreements.model.meta.AgreementsPackage;
 
 /**
@@ -361,4 +355,4 @@ public String toString() {
 		return result.toString();
 	}
 
-} //AgreementsGroupImpl
+} // AgreementsGroupImpl
diff --git a/...agreements.model/src-gen/org/eclipse/passage/lic/agreements/model/impl/AgreementImpl.java b/...agreements.model/src-gen/org/eclipse/passage/lic/agreements/model/impl/AgreementImpl.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
@@ -15,14 +15,10 @@
 import java.util.Objects;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.passage.lic.agreements.model.api.Agreement;
-
 import org.eclipse.passage.lic.agreements.model.meta.AgreementsPackage;
 
 /**
@@ -412,4 +408,4 @@ public String toString() {
 		return result.toString();
 	}
 
-} //AgreementImpl
+} // AgreementImpl
diff --git a/...ts.model/src-gen/org/eclipse/passage/lic/agreements/model/impl/AgreementsFactoryImpl.java b/...ts.model/src-gen/org/eclipse/passage/lic/agreements/model/impl/AgreementsFactoryImpl.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
@@ -15,13 +15,10 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.passage.lic.agreements.model.api.*;
-
+import org.eclipse.passage.lic.agreements.model.api.Agreement;
+import org.eclipse.passage.lic.agreements.model.api.AgreementGroup;
 import org.eclipse.passage.lic.agreements.model.meta.AgreementsFactory;
 import org.eclipse.passage.lic.agreements.model.meta.AgreementsPackage;
 
@@ -121,4 +118,4 @@ public static AgreementsPackage getPackage() {
 		return AgreementsPackage.eINSTANCE;
 	}
 
-} //AgreementsFactoryImpl
+} // AgreementsFactoryImpl