Bug 572962 invite 'keys' domain

Fill RO interfaces Signed-off-by: eparovyshnaya <[email protected]>
eclipse-passage · Apr 20, 2021 · 71b512e · 71b512e
1 parent ef50e2c
commit 71b512e
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 162 deletions.
diff --git a/bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore b/bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore
@@ -17,6 +17,8 @@
     <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"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProductRefRO" instanceClassName="org.eclipse.passage.lic.keys.ProductRefRO"/>
+  <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>
diff --git a/...clipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/KeyPair.java b/...clipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/KeyPair.java
@@ -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;
 
 /**
@@ -47,6 +46,7 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
+	@Override
 	ProductRef getProduct();
 
 	/**
@@ -69,6 +69,7 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getAlgorithm();
 
 	/**
@@ -91,6 +92,7 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	int getKey();
 
 	/**
@@ -113,6 +115,7 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getPub();
 
 	/**
@@ -135,6 +138,7 @@ public interface KeyPair extends EObject, KeyPairRO {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getScr();
 
 	/**

diff --git a/...pse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/ProductRef.java b/...pse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/ProductRef.java
@@ -13,7 +13,6 @@
 package org.eclipse.passage.lic.keys.model.api;
 
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.passage.lic.keys.ProductRefRO;
 
 /**
@@ -44,6 +43,7 @@ public interface ProductRef extends EObject, ProductRefRO {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getIdentifier();
 
 	/**
@@ -66,6 +66,7 @@ public interface ProductRef extends EObject, ProductRefRO {
 	 * @model required="true"
 	 * @generated
 	 */
+	@Override
 	String getVersion();
 
 	/**

diff --git a/...e.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairImpl.java b/...e.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairImpl.java
@@ -21,6 +21,7 @@
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.passage.lic.keys.model.api.KeyPair;
 import org.eclipse.passage.lic.keys.model.api.ProductRef;
@@ -44,7 +45,7 @@
  *
  * @generated
  */
-public class KeyPairImpl extends KeyPairROImpl implements KeyPair {
+public class KeyPairImpl extends MinimalEObjectImpl.Container implements KeyPair {
 	/**
 	 * The cached value of the '{@link #getProduct() <em>Product</em>}' containment reference.
 	 * <!-- begin-user-doc -->

diff --git a/...passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairROImpl.java b/...passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairROImpl.java
diff --git a/...ssage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysFactoryImpl.java b/...ssage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysFactoryImpl.java
@@ -20,9 +20,6 @@
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.passage.lic.keys.KeyPairRO;
-import org.eclipse.passage.lic.keys.ProductRefRO;
-
 import org.eclipse.passage.lic.keys.model.api.*;
 
 import org.eclipse.passage.lic.keys.model.meta.KeysFactory;
@@ -75,10 +72,6 @@ public EObject create(EClass eClass) {
 			return createKeyPair();
 		case KeysPackage.PRODUCT_REF:
 			return createProductRef();
-		case KeysPackage.KEY_PAIR_RO:
-			return (EObject) createKeyPairRO();
-		case KeysPackage.PRODUCT_REF_RO:
-			return (EObject) createProductRefRO();
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -106,28 +99,6 @@ public ProductRef createProductRef() {
 		return productRef;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public KeyPairRO createKeyPairRO() {
-		KeyPairROImpl keyPairRO = new KeyPairROImpl();
-		return keyPairRO;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ProductRefRO createProductRefRO() {
-		ProductRefROImpl productRefRO = new ProductRefROImpl();
-		return productRefRO;
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

diff --git a/...ssage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysPackageImpl.java b/...ssage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysPackageImpl.java
@@ -337,10 +337,10 @@ public void initializePackageContents() {
 		initEAttribute(getProductRef_Version(), ecorePackage.getEString(), "version", null, 1, 1, ProductRef.class, //$NON-NLS-1$
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(keyPairROEClass, KeyPairRO.class, "KeyPairRO", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+		initEClass(keyPairROEClass, KeyPairRO.class, "KeyPairRO", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
 				!IS_GENERATED_INSTANCE_CLASS);
 
-		initEClass(productRefROEClass, ProductRefRO.class, "ProductRefRO", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+		initEClass(productRefROEClass, ProductRefRO.class, "ProductRefRO", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
 				!IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource

diff --git a/...assage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefImpl.java b/...assage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefImpl.java
@@ -19,6 +19,7 @@
 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.keys.model.api.ProductRef;
 
@@ -38,7 +39,7 @@
  *
  * @generated
  */
-public class ProductRefImpl extends ProductRefROImpl implements ProductRef {
+public class ProductRefImpl extends MinimalEObjectImpl.Container implements ProductRef {
 	/**
 	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->

diff --git a/...sage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefROImpl.java b/...sage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefROImpl.java
diff --git a/...e.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysFactory.java b/...e.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysFactory.java
@@ -14,9 +14,6 @@
 
 import org.eclipse.emf.ecore.EFactory;
 
-import org.eclipse.passage.lic.keys.KeyPairRO;
-import org.eclipse.passage.lic.keys.ProductRefRO;
-
 import org.eclipse.passage.lic.keys.model.api.KeyPair;
 import org.eclipse.passage.lic.keys.model.api.ProductRef;
 
@@ -55,24 +52,6 @@ public interface KeysFactory extends EFactory {
 	 */
 	ProductRef createProductRef();
 
-	/**
-	 * Returns a new object of class '<em>Key Pair RO</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Key Pair RO</em>'.
-	 * @generated
-	 */
-	KeyPairRO createKeyPairRO();
-
-	/**
-	 * Returns a new object of class '<em>Product Ref RO</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Product Ref RO</em>'.
-	 * @generated
-	 */
-	ProductRefRO createProductRefRO();
-
 	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->

diff --git a/...e.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysPackage.java b/...e.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysPackage.java
@@ -67,10 +67,10 @@ public interface KeysPackage extends EPackage {
 	KeysPackage eINSTANCE = org.eclipse.passage.lic.keys.model.impl.KeysPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.passage.lic.keys.model.impl.KeyPairROImpl <em>Key Pair RO</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.keys.KeyPairRO <em>Key Pair RO</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.passage.lic.keys.model.impl.KeyPairROImpl
+	 * @see org.eclipse.passage.lic.keys.KeyPairRO
 	 * @see org.eclipse.passage.lic.keys.model.impl.KeysPackageImpl#getKeyPairRO()
 	 * @generated
 	 */
@@ -168,10 +168,10 @@ public interface KeysPackage extends EPackage {
 	int KEY_PAIR_OPERATION_COUNT = KEY_PAIR_RO_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.passage.lic.keys.model.impl.ProductRefROImpl <em>Product Ref RO</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.passage.lic.keys.ProductRefRO <em>Product Ref RO</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.passage.lic.keys.model.impl.ProductRefROImpl
+	 * @see org.eclipse.passage.lic.keys.ProductRefRO
 	 * @see org.eclipse.passage.lic.keys.model.impl.KeysPackageImpl#getProductRefRO()
 	 * @generated
 	 */

diff --git a/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/KeyPairRO.java b/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/KeyPairRO.java
@@ -14,4 +14,13 @@
 
 public interface KeyPairRO {
 
+	ProductRefRO getProduct();
+
+	String getAlgorithm();
+
+	int getKey();
+
+	String getPub();
+
+	String getScr();
 }
diff --git a/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/ProductRefRO.java b/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/ProductRefRO.java
@@ -14,4 +14,8 @@
 
 public interface ProductRefRO {
 
+	String getIdentifier();
+
+	String getVersion();
+
 }