[#1346] Remove RO descriptors layer

Apply to Users domain Signed-off-by: Alexander Fedorov <[email protected]>
eclipse-passage · May 1, 2024 · 05d5046 · 05d5046
1 parent ab5293f
commit 05d5046
Show file tree

Hide file tree

Showing 78 changed files with 388 additions and 1,410 deletions.
diff --git a/bundles/org.eclipse.passage.lic.users.ecore/model/users.ecore b/bundles/org.eclipse.passage.lic.users.ecore/model/users.ecore
@@ -1,30 +1,8 @@
 <?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="users" nsURI="http://www.eclipse.org/passage/lic/users/2.0.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="users" nsURI="http://www.eclipse.org/passage/lic/users/3.0.0"
     nsPrefix="org.eclipse.passage.lic">
-  <eClassifiers xsi:type="ecore:EClass" name="ContactDescriptor" instanceClassName="org.eclipse.passage.lic.users.ContactDescriptor"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@since 2.0"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LicenseOwnerDescriptor" instanceClassName="org.eclipse.passage.lic.users.LicenseOwnerDescriptor"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@since 2.0"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UserDescriptor" instanceClassName="org.eclipse.passage.lic.users.UserDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="UserGroupDescriptor" instanceClassName="org.eclipse.passage.lic.users.UserGroupDescriptor"
-      abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="@since 2.0"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UserOriginDescriptor" instanceClassName="org.eclipse.passage.lic.users.UserOriginDescriptor"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Contact" eSuperTypes="#//ContactDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="Contact">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="@since 2.0"/>
     </eAnnotations>
@@ -34,8 +12,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="email" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LicenseOwner" abstract="true" interface="true"
-      eSuperTypes="#//LicenseOwnerDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="LicenseOwner" abstract="true" interface="true">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="@since 2.0"/>
     </eAnnotations>
@@ -53,7 +30,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="User" eSuperTypes="#//UserDescriptor #//LicenseOwner">
+  <eClassifiers xsi:type="ecore:EClass" name="User" eSuperTypes="#//LicenseOwner">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferredEvaluationType"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -73,7 +50,7 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UserGroup" eSuperTypes="#//UserGroupDescriptor #//LicenseOwner">
+  <eClassifiers xsi:type="ecore:EClass" name="UserGroup" eSuperTypes="#//LicenseOwner">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="@since 2.0"/>
     </eAnnotations>
@@ -82,7 +59,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="origin" lowerBound="1"
         eType="#//UserOrigin" eOpposite="#//UserOrigin/groups"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UserOrigin" eSuperTypes="#//UserOriginDescriptor">
+  <eClassifiers xsi:type="ecore:EClass" name="UserOrigin">
     <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"/>

diff --git a/bundles/org.eclipse.passage.lic.users.edit/plugin.properties b/bundles/org.eclipse.passage.lic.users.edit/plugin.properties
@@ -29,9 +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_UserOriginDescriptor_type = User Origin Descriptor
-_UI_UserDescriptor_type = User Descriptor
-_UI_UserOrigin_type = User Origin
+_UI_UserOrigin_type = User Origin
 _UI_User_type = User
 _UI_Unknown_type = Object
 _UI_Unknown_datatype= Value
@@ -49,7 +47,6 @@ _UI_Unknown_feature = Unspecified
 _UI_UserOrigin_text_pattern = {1} ({0})
 _UI_User_preferredConditionType_feature = Preferred Condition Type
 _UI_User_preferredConditionExpression_feature = Preferred Condition Expression
-_UI_UserLicenseDescriptor_type = User License Descriptor
 _UI_UserLicense_type = User License
 _UI_User_userLicenses_feature = User Licenses
 _UI_UserLicense_planIdentifier_feature = Plan Identifier
@@ -63,9 +60,6 @@ _UI_UserLicense_packIdentifier_feature = Pack Identifier
 _UI_UserLicense_issueDate_feature = Issue Date
 _UI_UserLicense_user_feature = User
 _UI_UserLicense_label={0} {1} ({2})
-_UI_ContactDescriptor_type = Contact Descriptor
-_UI_LicenseOwnerDescriptor_type = License Owner Descriptor
-_UI_UserGroupDescriptor_type = User Group Descriptor
 _UI_UserGroup_type = User Group
 _UI_Contact_type = Contact
 _UI_LicenseOwner_type = License Owner

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

diff --git a/...se.passage.lic.users.edit/src-gen/org/eclipse/passage/lic/users/edit/UsersEditPlugin.java b/...se.passage.lic.users.edit/src-gen/org/eclipse/passage/lic/users/edit/UsersEditPlugin.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,9 +13,7 @@
 package org.eclipse.passage.lic.users.edit;
 
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.osgi.framework.BundleActivator;
 
 /**

diff --git a/....users.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/ContactItemProvider.java b/....users.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/ContactItemProvider.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,9 +17,7 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,11 +28,8 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.passage.lic.users.edit.UsersEditPlugin;
-
 import org.eclipse.passage.lic.users.model.api.Contact;
-
 import org.eclipse.passage.lic.users.model.meta.UsersPackage;
 
 /**

diff --git a/...sers.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/UserGroupItemProvider.java b/...sers.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/UserGroupItemProvider.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,11 +17,8 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,11 +29,8 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.passage.lic.users.edit.UsersEditPlugin;
-
 import org.eclipse.passage.lic.users.model.api.UserGroup;
-
 import org.eclipse.passage.lic.users.model.meta.UsersFactory;
 import org.eclipse.passage.lic.users.model.meta.UsersPackage;
 
@@ -199,7 +193,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/...lic.users.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/UserItemProvider.java b/...lic.users.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/UserItemProvider.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
@@ -196,7 +196,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/...ers.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/UserOriginItemProvider.java b/...ers.edit/src-gen/org/eclipse/passage/lic/users/edit/providers/UserOriginItemProvider.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,11 +17,8 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,11 +29,8 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
 import org.eclipse.passage.lic.users.edit.UsersEditPlugin;
-
 import org.eclipse.passage.lic.users.model.api.UserOrigin;
-
 import org.eclipse.passage.lic.users.model.meta.UsersFactory;
 import org.eclipse.passage.lic.users.model.meta.UsersPackage;
 
@@ -165,7 +159,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/...src-gen/org/eclipse/passage/lic/users/edit/providers/UsersItemProviderAdapterFactory.java b/...src-gen/org/eclipse/passage/lic/users/edit/providers/UsersItemProviderAdapterFactory.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
@@ -18,7 +18,6 @@
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
-
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
 import org.eclipse.passage.lic.users.model.util.UsersAdapterFactory;
 
 /**

diff --git a/bundles/org.eclipse.passage.lic.users.model/model/users.genmodel b/bundles/org.eclipse.passage.lic.users.model/model/users.genmodel
@@ -8,7 +8,7 @@
     editorPluginClass="org.eclipse.passage.lic.users.editor.UsersEditorPlugin" nonNLSMarkers="true"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
     testSuiteClass="org.eclipse.passage.lic.users.tests.UsersAllTests" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="8.0" copyrightFields="false" editPluginID="org.eclipse.passage.lic.users.edit"
+    complianceLevel="17.0" copyrightFields="false" editPluginID="org.eclipse.passage.lic.users.edit"
     editorPluginID="org.eclipse.passage.lic.users.editor" language="" operationReflection="true"
     runtimePlatform="RCP" importOrganizing="true" cleanup="true" oSGiCompatible="true">
   <foreignModel>platform:/resource/org.eclipse.passage.lic.users.ecore/model/users.ecore</foreignModel>
@@ -17,11 +17,6 @@
       classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers"
       presentationPackageSuffix="editor" testsPackageSuffix="model.tests" literalsInterface="false"
       ecorePackage="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#/">
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//ContactDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//LicenseOwnerDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//UserDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//UserGroupDescriptor"/>
-    <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//UserOriginDescriptor"/>
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//Contact">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//Contact/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.users.ecore/model/users.ecore#//Contact/title"/>

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

diff --git a/...ipse.passage.lic.users.model/src-gen/org/eclipse/passage/lic/users/model/api/Contact.java b/...ipse.passage.lic.users.model/src-gen/org/eclipse/passage/lic/users/model/api/Contact.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.users.ContactDescriptor;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Contact</b></em>'.
@@ -37,10 +35,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.users.model.meta.UsersPackage#getContact()
- * @model superTypes="org.eclipse.passage.lic.users.model.api.ContactDescriptor"
+ * @model
  * @generated
  */
-public interface Contact extends EObject, ContactDescriptor {
+public interface Contact extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -51,7 +49,6 @@ public interface Contact extends EObject, ContactDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getName();
 
 	/**
@@ -74,7 +71,6 @@ public interface Contact extends EObject, ContactDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getTitle();
 
 	/**
@@ -97,7 +93,6 @@ public interface Contact extends EObject, ContactDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getPosition();
 
 	/**
@@ -120,7 +115,6 @@ public interface Contact extends EObject, ContactDescriptor {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getEmail();
 
 	/**
@@ -143,7 +137,6 @@ public interface Contact extends EObject, ContactDescriptor {
 	 * @model
 	 * @generated
 	 */
-	@Override
 	String getAddress();
 
 	/**