[#1346] Remove RO descriptors layer

Apply to Keys domain

Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>

bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/BlindResourceFactory.java

@@ -14,6 +14,9 @@
 
 import org.eclipse.emf.ecore.resource.Resource;
 
+/**
+ * @since 3.0
+ */
 public interface BlindResourceFactory {
 
 	Resource createResource();

bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore

@@ -1,8 +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="keys" nsURI="http://www.eclipse.org/passage/lic/keys/2.0.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="keys" nsURI="http://www.eclipse.org/passage/lic/keys/3.0.0"
     nsPrefix="org.eclipse.passage.lic">
-  <eClassifiers xsi:type="ecore:EClass" name="KeyPair" eSuperTypes="#//KeyPairRO">
+  <eClassifiers xsi:type="ecore:EClass" name="KeyPair">
     <eStructuralFeatures xsi:type="ecore:EReference" name="product" lowerBound="1"
         eType="#//ProductRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="algorithm" lowerBound="1"
@@ -11,14 +11,10 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="pub" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="scr" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductRef" eSuperTypes="#//ProductRefRO">
+  <eClassifiers xsi:type="ecore:EClass" name="ProductRef">
     <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="version" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="KeyPairRO" instanceClassName="org.eclipse.passage.lic.keys.KeyPairRO"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductRefRO" instanceClassName="org.eclipse.passage.lic.keys.ProductRefRO"
-      abstract="true" interface="true"/>
 </ecore:EPackage>

bundles/org.eclipse.passage.lic.keys.edit/plugin.properties

@@ -20,20 +20,22 @@ This program and the accompanying materials are made\n\
 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\
+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_KeyPair_type = Key Pair
 _UI_ProductRef_type = Product Ref
-_UI_KeyPairRO_type = Key Pair RO
-_UI_ProductRefRO_type = Product Ref RO
 _UI_Unknown_type = Object
+
 _UI_Unknown_datatype= Value
+
 _UI_KeyPair_product_feature = Product
 _UI_KeyPair_algorithm_feature = Algorithm
 _UI_KeyPair_key_feature = Key
@@ -42,3 +44,5 @@ _UI_KeyPair_scr_feature = Scr
 _UI_ProductRef_identifier_feature = Identifier
 _UI_ProductRef_version_feature = Version
 _UI_Unknown_feature = Unspecified
+
+

bundles/org.eclipse.passage.lic.keys.edit/plugin.xml

@@ -19,7 +19,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated keys -->
       <factory
-            uri="http://www.eclipse.org/passage/lic/keys/2.0.0"
+            uri="http://www.eclipse.org/passage/lic/keys/3.0.0"
             class="org.eclipse.passage.lic.keys.edit.providers.KeysItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/KeysEditPlugin.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,7 +13,6 @@
 package org.eclipse.passage.lic.keys.edit;
 
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
 
 /**

bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/KeyPairItemProvider.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.keys.edit.KeysEditPlugin;
-
 import org.eclipse.passage.lic.keys.model.api.KeyPair;
-
 import org.eclipse.passage.lic.keys.model.meta.KeysFactory;
 import org.eclipse.passage.lic.keys.model.meta.KeysPackage;
 
@@ -168,17 +162,6 @@ protected EStructuralFeature getChildFeature(Object object, Object child) {
 		return super.getChildFeature(object, child);
 	}
 
-	/**
-	 * This returns KeyPair.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/KeyPair")); //$NON-NLS-1$
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/KeysItemProviderAdapterFactory.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.keys.model.util.KeysAdapterFactory;
 
 /**

bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/ProductRefItemProvider.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.keys.edit.KeysEditPlugin;
-
 import org.eclipse.passage.lic.keys.model.api.ProductRef;
-
 import org.eclipse.passage.lic.keys.model.meta.KeysPackage;
 
 /**
@@ -104,17 +99,6 @@ protected void addVersionPropertyDescriptor(Object object) {
 						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
-	/**
-	 * This returns ProductRef.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ProductRef")); //$NON-NLS-1$
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

bundles/org.eclipse.passage.lic.keys.model/.classpath

@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes/"/>
 </classpath>

bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@ Bundle-Copyright: %Bundle-Copyright
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport,
  org.eclipse.passage.lic.emf;bundle-version="0.0.0",
  org.eclipse.passage.lic.keys;bundle-version="0.0.0";visibility:=reexport

bundles/org.eclipse.passage.lic.keys.model/build.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2021 ArSysOp
+# Copyright (c) 2021, 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
@@ -11,7 +11,8 @@
 #     ArSysOp - initial API and implementation
 ###############################################################################
 
-source.. = src-gen/
+source.. = src-gen/,\
+           src/
 output.. = target/classes
 bin.includes = .,\
                model/,\

bundles/org.eclipse.passage.lic.keys.model/model/keys.genmodel

@@ -7,13 +7,14 @@
     editorPluginClass="org.eclipse.passage.lic.keys.editor.KeysEditorPlugin" nonNLSMarkers="true"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
     testSuiteClass="org.eclipse.passage.lic.keys.model.tests.KeysAllTests" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="8.0" copyrightFields="false" language="" operationReflection="true"
-    runtimePlatform="RCP" importOrganizing="true">
+    complianceLevel="17.0" copyrightFields="false" editPluginID="org.eclipse.passage.lic.keys.edit"
+    language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true">
   <foreignModel>platform:/resource/org.eclipse.passage.lic.keys.ecore/model/keys.ecore</foreignModel>
-  <genPackages prefix="Keys" basePackage="org.eclipse.passage.lic" disposableProviderFactory="true"
-      interfacePackageSuffix="model.api" metaDataPackageSuffix="model.meta" classPackageSuffix="model.impl"
-      utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers" presentationPackageSuffix="editor"
-      testsPackageSuffix="model.tests" literalsInterface="false" ecorePackage="../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#/">
+  <genPackages prefix="Keys" basePackage="org.eclipse.passage.lic" resource="XMI"
+      disposableProviderFactory="true" interfacePackageSuffix="model.api" metaDataPackageSuffix="model.meta"
+      classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="edit.providers"
+      presentationPackageSuffix="editor" testsPackageSuffix="model.tests" literalsInterface="false"
+      ecorePackage="../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#/">
     <genClasses image="false" ecoreClass="../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//KeyPair">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//KeyPair/product"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//KeyPair/algorithm"/>
@@ -25,7 +26,5 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//ProductRef/identifier"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//ProductRef/version"/>
     </genClasses>
-    <genClasses ecoreClass="../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//KeyPairRO"/>
-    <genClasses ecoreClass="../../org.eclipse.passage.lic.keys.ecore/model/keys.ecore#//ProductRefRO"/>
   </genPackages>
 </genmodel:GenModel>

bundles/org.eclipse.passage.lic.keys.model/plugin.xml

@@ -19,16 +19,16 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated keys -->
       <package
-            uri="http://www.eclipse.org/passage/lic/keys/2.0.0"
+            uri="http://www.eclipse.org/passage/lic/keys/3.0.0"
             class="org.eclipse.passage.lic.keys.model.meta.KeysPackage"
             genModel="model/keys.genmodel"/>
    </extension>
 
-  <extension point="org.eclipse.emf.ecore.extension_parser">
+   <extension point="org.eclipse.emf.ecore.extension_parser">
       <!-- @generated keys -->
       <parser
             type="keys"
             class="org.eclipse.passage.lic.keys.model.util.KeysResourceFactoryImpl"/>
    </extension>
-   
+
 </plugin>

bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/KeyPair.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,7 +13,6 @@
 package org.eclipse.passage.lic.keys.model.api;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.passage.lic.keys.KeyPairRO;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,10 +31,10 @@
  * </ul>
  *
  * @see org.eclipse.passage.lic.keys.model.meta.KeysPackage#getKeyPair()
- * @model superTypes="org.eclipse.passage.lic.keys.model.api.KeyPairRO"
+ * @model
  * @generated
  */
-public interface KeyPair extends EObject, KeyPairRO {
+public interface KeyPair extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Product</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -46,7 +45,6 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	@Override
 	ProductRef getProduct();
 
 	/**
@@ -69,7 +67,6 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getAlgorithm();
 
 	/**
@@ -92,7 +89,6 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	int getKey();
 
 	/**
@@ -115,7 +111,6 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getPub();
 
 	/**
@@ -138,7 +133,6 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
-	@Override
 	String getScr();
 
 	/**