From 71b512e74c6b0edbf253cd33e65271929ce0b7d4 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Tue, 20 Apr 2021 14:18:18 +0300 Subject: [PATCH] Bug 572962 invite 'keys' domain Fill RO interfaces Signed-off-by: eparovyshnaya --- .../model/keys.ecore | 6 ++- .../passage/lic/keys/model/api/KeyPair.java | 6 ++- .../lic/keys/model/api/ProductRef.java | 3 +- .../lic/keys/model/impl/KeyPairImpl.java | 3 +- .../lic/keys/model/impl/KeyPairROImpl.java | 50 ------------------- .../lic/keys/model/impl/KeysFactoryImpl.java | 29 ----------- .../lic/keys/model/impl/KeysPackageImpl.java | 4 +- .../lic/keys/model/impl/ProductRefImpl.java | 3 +- .../lic/keys/model/impl/ProductRefROImpl.java | 50 ------------------- .../lic/keys/model/meta/KeysFactory.java | 21 -------- .../lic/keys/model/meta/KeysPackage.java | 8 +-- .../eclipse/passage/lic/keys/KeyPairRO.java | 9 ++++ .../passage/lic/keys/ProductRefRO.java | 4 ++ 13 files changed, 34 insertions(+), 162 deletions(-) delete mode 100644 bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairROImpl.java delete mode 100644 bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefROImpl.java diff --git a/bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore b/bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore index b47b7b27a..48cce8bc5 100644 --- 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 @@ - - + + diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/KeyPair.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/KeyPair.java index d23da0c66..5539a484a 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/KeyPair.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/ProductRef.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/ProductRef.java index 0ef3d0eaf..77a5cb411 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/api/ProductRef.java +++ b/bundles/org.eclipse.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/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairImpl.java index 8d0526720..792dda1b2 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairImpl.java +++ b/bundles/org.eclipse.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() Product}' containment reference. * diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairROImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairROImpl.java deleted file mode 100644 index 9e7ab25fd..000000000 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeyPairROImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018, 2021 ArSysOp - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0/. - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * ArSysOp - initial API and implementation - *******************************************************************************/ -package org.eclipse.passage.lic.keys.model.impl; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.passage.lic.keys.KeyPairRO; - -import org.eclipse.passage.lic.keys.model.meta.KeysPackage; - -/** - * - * An implementation of the model object 'Key Pair RO'. - * - * - * @generated - */ -public class KeyPairROImpl extends MinimalEObjectImpl.Container implements KeyPairRO { - /** - * - * - * @generated - */ - protected KeyPairROImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return KeysPackage.eINSTANCE.getKeyPairRO(); - } - -} //KeyPairROImpl diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysFactoryImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysFactoryImpl.java index b0c941cec..3bf741583 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysFactoryImpl.java +++ b/bundles/org.eclipse.passage.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; } - /** - * - * - * @generated - */ - @Override - public KeyPairRO createKeyPairRO() { - KeyPairROImpl keyPairRO = new KeyPairROImpl(); - return keyPairRO; - } - - /** - * - * - * @generated - */ - @Override - public ProductRefRO createProductRefRO() { - ProductRefROImpl productRefRO = new ProductRefROImpl(); - return productRefRO; - } - /** * * diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysPackageImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysPackageImpl.java index e9ffa90a8..bbf4102e6 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/KeysPackageImpl.java +++ b/bundles/org.eclipse.passage.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/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefImpl.java index 583c0cc8b..78d3dd8af 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefImpl.java +++ b/bundles/org.eclipse.passage.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() Identifier}' attribute. * diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefROImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefROImpl.java deleted file mode 100644 index 1e10f0784..000000000 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/impl/ProductRefROImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2018, 2021 ArSysOp - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License 2.0 which is available at - * https://www.eclipse.org/legal/epl-2.0/. - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * ArSysOp - initial API and implementation - *******************************************************************************/ -package org.eclipse.passage.lic.keys.model.impl; - -import org.eclipse.emf.ecore.EClass; - -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.passage.lic.keys.ProductRefRO; - -import org.eclipse.passage.lic.keys.model.meta.KeysPackage; - -/** - * - * An implementation of the model object 'Product Ref RO'. - * - * - * @generated - */ -public class ProductRefROImpl extends MinimalEObjectImpl.Container implements ProductRefRO { - /** - * - * - * @generated - */ - protected ProductRefROImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return KeysPackage.eINSTANCE.getProductRefRO(); - } - -} //ProductRefROImpl diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysFactory.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysFactory.java index 6426dc35f..9f1ee6ec7 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysFactory.java +++ b/bundles/org.eclipse.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 'Key Pair RO'. - * - * - * @return a new object of class 'Key Pair RO'. - * @generated - */ - KeyPairRO createKeyPairRO(); - - /** - * Returns a new object of class 'Product Ref RO'. - * - * - * @return a new object of class 'Product Ref RO'. - * @generated - */ - ProductRefRO createProductRefRO(); - /** * Returns the package supported by this factory. * diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysPackage.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysPackage.java index f219c3308..1c05d1bca 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/meta/KeysPackage.java +++ b/bundles/org.eclipse.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 Key Pair RO}' class. + * The meta object id for the '{@link org.eclipse.passage.lic.keys.KeyPairRO Key Pair RO}' class. * * - * @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 Product Ref RO}' class. + * The meta object id for the '{@link org.eclipse.passage.lic.keys.ProductRefRO Product Ref RO}' class. * * - * @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 index d1d5a1588..631ca8103 100644 --- 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 index 646f953f9..d6bddb9d8 100644 --- 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(); + }