diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/BlindResourceFactory.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/BlindResourceFactory.java index ea6b36b57..f3874a845 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/resource/BlindResourceFactory.java +++ b/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(); 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 48cce8bc5..890603660 100644 --- a/bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore +++ b/bundles/org.eclipse.passage.lic.keys.ecore/model/keys.ecore @@ -1,8 +1,8 @@ - + - + - - diff --git a/bundles/org.eclipse.passage.lic.keys.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.keys.edit/META-INF/MANIFEST.MF index f56804584..2cd01a57e 100644 --- a/bundles/org.eclipse.passage.lic.keys.edit/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.keys.edit/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.passage.lic.keys.edit +Automatic-Module-Name: org.eclipse.passage.lic.keys.model.edit Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.passage.lic.keys.edit;singleton:=true +Bundle-SymbolicName: org.eclipse.passage.lic.keys.model.edit;singleton:=true Bundle-Version: 3.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName diff --git a/bundles/org.eclipse.passage.lic.keys.edit/plugin.properties b/bundles/org.eclipse.passage.lic.keys.edit/plugin.properties index 3ba1fdc74..df7518a96 100644 --- a/bundles/org.eclipse.passage.lic.keys.edit/plugin.properties +++ b/bundles/org.eclipse.passage.lic.keys.edit/plugin.properties @@ -20,7 +20,8 @@ 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} @@ -28,12 +29,13 @@ _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 + + diff --git a/bundles/org.eclipse.passage.lic.keys.edit/plugin.xml b/bundles/org.eclipse.passage.lic.keys.edit/plugin.xml index d97b4010a..e295334c9 100644 --- a/bundles/org.eclipse.passage.lic.keys.edit/plugin.xml +++ b/bundles/org.eclipse.passage.lic.keys.edit/plugin.xml @@ -19,7 +19,7 @@ * diff --git a/bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/KeysItemProviderAdapterFactory.java b/bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/KeysItemProviderAdapterFactory.java index f7c1ef5c1..64fc2a073 100644 --- a/bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/KeysItemProviderAdapterFactory.java +++ b/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; /** diff --git a/bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/ProductRefItemProvider.java b/bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/ProductRefItemProvider.java index 92d1166be..a1a5514d8 100644 --- a/bundles/org.eclipse.passage.lic.keys.edit/src-gen/org/eclipse/passage/lic/keys/edit/providers/ProductRefItemProvider.java +++ b/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. - * - * - * @generated - */ - @Override - public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ProductRef")); //$NON-NLS-1$ - } - /** * * diff --git a/bundles/org.eclipse.passage.lic.keys.model/.classpath b/bundles/org.eclipse.passage.lic.keys.model/.classpath index 58d3e643c..8ec7c5862 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/.classpath +++ b/bundles/org.eclipse.passage.lic.keys.model/.classpath @@ -3,5 +3,6 @@ + diff --git a/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF index fc60be259..541fd354b 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/META-INF/MANIFEST.MF +++ b/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 diff --git a/bundles/org.eclipse.passage.lic.keys.model/build.properties b/bundles/org.eclipse.passage.lic.keys.model/build.properties index f85c190f3..54e8e9dc1 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/build.properties +++ b/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/,\ diff --git a/bundles/org.eclipse.passage.lic.keys.model/model/keys.genmodel b/bundles/org.eclipse.passage.lic.keys.model/model/keys.genmodel index 65404a294..63b8f4d3b 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/model/keys.genmodel +++ b/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" + complianceLevel="17.0" copyrightFields="false" language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true"> platform:/resource/org.eclipse.passage.lic.keys.ecore/model/keys.ecore - + @@ -25,7 +26,5 @@ - - diff --git a/bundles/org.eclipse.passage.lic.keys.model/plugin.xml b/bundles/org.eclipse.passage.lic.keys.model/plugin.xml index 7db8c92ae..3c37e4061 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/plugin.xml +++ b/bundles/org.eclipse.passage.lic.keys.model/plugin.xml @@ -19,16 +19,16 @@ - + - + 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 5539a484a..b932e5155 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 @@ -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; /** * @@ -32,10 +31,10 @@ * * * @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 'Product' containment reference. * @@ -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(); /** 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 77a5cb411..8ae2c7755 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 @@ -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.ProductRefRO; /** * @@ -29,10 +28,10 @@ * * * @see org.eclipse.passage.lic.keys.model.meta.KeysPackage#getProductRef() - * @model superTypes="org.eclipse.passage.lic.keys.model.api.ProductRefRO" + * @model * @generated */ -public interface ProductRef extends EObject, ProductRefRO { +public interface ProductRef extends EObject { /** * Returns the value of the 'Identifier' attribute. * @@ -43,7 +42,6 @@ public interface ProductRef extends EObject, ProductRefRO { * @model required="true" * @generated */ - @Override String getIdentifier(); /** @@ -66,7 +64,6 @@ 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 792dda1b2..b0d468295 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 @@ -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 @@ -16,16 +16,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - 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.passage.lic.keys.model.api.KeyPair; import org.eclipse.passage.lic.keys.model.api.ProductRef; - import org.eclipse.passage.lic.keys.model.meta.KeysPackage; /** @@ -447,4 +443,4 @@ public String toString() { return result.toString(); } -} //KeyPairImpl +} // KeyPairImpl 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 3bf741583..542400c41 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 @@ -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.keys.model.api.*; - +import org.eclipse.passage.lic.keys.model.api.KeyPair; +import org.eclipse.passage.lic.keys.model.api.ProductRef; import org.eclipse.passage.lic.keys.model.meta.KeysFactory; import org.eclipse.passage.lic.keys.model.meta.KeysPackage; @@ -120,4 +117,4 @@ public static KeysPackage getPackage() { return KeysPackage.eINSTANCE; } -} //KeysFactoryImpl +} // KeysFactoryImpl 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 bbf4102e6..ee9960b5f 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 @@ -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 @@ -16,15 +16,9 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; - import org.eclipse.emf.ecore.impl.EPackageImpl; - -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; - import org.eclipse.passage.lic.keys.model.meta.KeysFactory; import org.eclipse.passage.lic.keys.model.meta.KeysPackage; @@ -49,20 +43,6 @@ public class KeysPackageImpl extends EPackageImpl implements KeysPackage { */ private EClass productRefEClass = null; - /** - * - * - * @generated - */ - private EClass keyPairROEClass = null; - - /** - * - * - * @generated - */ - private EClass productRefROEClass = null; - /** * Creates an instance of the model Package, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package @@ -217,26 +197,6 @@ public EAttribute getProductRef_Version() { return (EAttribute) productRefEClass.getEStructuralFeatures().get(1); } - /** - * - * - * @generated - */ - @Override - public EClass getKeyPairRO() { - return keyPairROEClass; - } - - /** - * - * - * @generated - */ - @Override - public EClass getProductRefRO() { - return productRefROEClass; - } - /** * * @@ -277,10 +237,6 @@ public void createPackageContents() { productRefEClass = createEClass(PRODUCT_REF); createEAttribute(productRefEClass, PRODUCT_REF__IDENTIFIER); createEAttribute(productRefEClass, PRODUCT_REF__VERSION); - - keyPairROEClass = createEClass(KEY_PAIR_RO); - - productRefROEClass = createEClass(PRODUCT_REF_RO); } /** @@ -312,8 +268,6 @@ public void initializePackageContents() { // Set bounds for type parameters // Add supertypes to classes - keyPairEClass.getESuperTypes().add(this.getKeyPairRO()); - productRefEClass.getESuperTypes().add(this.getProductRefRO()); // Initialize classes, features, and operations; add parameters initEClass(keyPairEClass, KeyPair.class, "KeyPair", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -337,14 +291,8 @@ 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$ - !IS_GENERATED_INSTANCE_CLASS); - - initEClass(productRefROEClass, ProductRefRO.class, "ProductRefRO", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$ - !IS_GENERATED_INSTANCE_CLASS); - // Create resource createResource(eNS_URI); } -} //KeysPackageImpl +} // KeysPackageImpl 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 78d3dd8af..8d775b942 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 @@ -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.keys.model.api.ProductRef; - import org.eclipse.passage.lic.keys.model.meta.KeysPackage; /** @@ -242,4 +238,4 @@ public String toString() { return result.toString(); } -} //ProductRefImpl +} // ProductRefImpl 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 9f1ee6ec7..260cd703a 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 @@ -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.meta; import org.eclipse.emf.ecore.EFactory; - import org.eclipse.passage.lic.keys.model.api.KeyPair; import org.eclipse.passage.lic.keys.model.api.ProductRef; @@ -61,4 +60,4 @@ public interface KeysFactory extends EFactory { */ KeysPackage getKeysPackage(); -} //KeysFactory +} // KeysFactory 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 1c05d1bca..349d179ce 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 @@ -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 @@ -48,7 +48,7 @@ public interface KeysPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/passage/lic/keys/2.0.0"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/passage/lic/keys/3.0.0"; //$NON-NLS-1$ /** * The package namespace name. @@ -66,34 +66,6 @@ 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.KeyPairRO Key Pair RO}' class. - * - * - * @see org.eclipse.passage.lic.keys.KeyPairRO - * @see org.eclipse.passage.lic.keys.model.impl.KeysPackageImpl#getKeyPairRO() - * @generated - */ - int KEY_PAIR_RO = 2; - - /** - * The number of structural features of the 'Key Pair RO' class. - * - * - * @generated - * @ordered - */ - int KEY_PAIR_RO_FEATURE_COUNT = 0; - - /** - * The number of operations of the 'Key Pair RO' class. - * - * - * @generated - * @ordered - */ - int KEY_PAIR_RO_OPERATION_COUNT = 0; - /** * The meta object id for the '{@link org.eclipse.passage.lic.keys.model.impl.KeyPairImpl Key Pair}' class. * @@ -111,7 +83,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR__PRODUCT = KEY_PAIR_RO_FEATURE_COUNT + 0; + int KEY_PAIR__PRODUCT = 0; /** * The feature id for the 'Algorithm' attribute. @@ -120,7 +92,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR__ALGORITHM = KEY_PAIR_RO_FEATURE_COUNT + 1; + int KEY_PAIR__ALGORITHM = 1; /** * The feature id for the 'Key' attribute. @@ -129,7 +101,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR__KEY = KEY_PAIR_RO_FEATURE_COUNT + 2; + int KEY_PAIR__KEY = 2; /** * The feature id for the 'Pub' attribute. @@ -138,7 +110,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR__PUB = KEY_PAIR_RO_FEATURE_COUNT + 3; + int KEY_PAIR__PUB = 3; /** * The feature id for the 'Scr' attribute. @@ -147,7 +119,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR__SCR = KEY_PAIR_RO_FEATURE_COUNT + 4; + int KEY_PAIR__SCR = 4; /** * The number of structural features of the 'Key Pair' class. @@ -156,7 +128,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR_FEATURE_COUNT = KEY_PAIR_RO_FEATURE_COUNT + 5; + int KEY_PAIR_FEATURE_COUNT = 5; /** * The number of operations of the 'Key Pair' class. @@ -165,35 +137,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int KEY_PAIR_OPERATION_COUNT = KEY_PAIR_RO_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.passage.lic.keys.ProductRefRO Product Ref RO}' class. - * - * - * @see org.eclipse.passage.lic.keys.ProductRefRO - * @see org.eclipse.passage.lic.keys.model.impl.KeysPackageImpl#getProductRefRO() - * @generated - */ - int PRODUCT_REF_RO = 3; - - /** - * The number of structural features of the 'Product Ref RO' class. - * - * - * @generated - * @ordered - */ - int PRODUCT_REF_RO_FEATURE_COUNT = 0; - - /** - * The number of operations of the 'Product Ref RO' class. - * - * - * @generated - * @ordered - */ - int PRODUCT_REF_RO_OPERATION_COUNT = 0; + int KEY_PAIR_OPERATION_COUNT = 0; /** * The meta object id for the '{@link org.eclipse.passage.lic.keys.model.impl.ProductRefImpl Product Ref}' class. @@ -212,7 +156,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF__IDENTIFIER = PRODUCT_REF_RO_FEATURE_COUNT + 0; + int PRODUCT_REF__IDENTIFIER = 0; /** * The feature id for the 'Version' attribute. @@ -221,7 +165,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF__VERSION = PRODUCT_REF_RO_FEATURE_COUNT + 1; + int PRODUCT_REF__VERSION = 1; /** * The number of structural features of the 'Product Ref' class. @@ -230,7 +174,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF_FEATURE_COUNT = PRODUCT_REF_RO_FEATURE_COUNT + 2; + int PRODUCT_REF_FEATURE_COUNT = 2; /** * The number of operations of the 'Product Ref' class. @@ -239,7 +183,7 @@ public interface KeysPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF_OPERATION_COUNT = PRODUCT_REF_RO_OPERATION_COUNT + 0; + int PRODUCT_REF_OPERATION_COUNT = 0; /** * Returns the meta object for class '{@link org.eclipse.passage.lic.keys.model.api.KeyPair Key Pair}'. @@ -338,28 +282,6 @@ public interface KeysPackage extends EPackage { */ EAttribute getProductRef_Version(); - /** - * Returns the meta object for class '{@link org.eclipse.passage.lic.keys.KeyPairRO Key Pair RO}'. - * - * - * @return the meta object for class 'Key Pair RO'. - * @see org.eclipse.passage.lic.keys.KeyPairRO - * @model instanceClass="org.eclipse.passage.lic.keys.KeyPairRO" - * @generated - */ - EClass getKeyPairRO(); - - /** - * Returns the meta object for class '{@link org.eclipse.passage.lic.keys.ProductRefRO Product Ref RO}'. - * - * - * @return the meta object for class 'Product Ref RO'. - * @see org.eclipse.passage.lic.keys.ProductRefRO - * @model instanceClass="org.eclipse.passage.lic.keys.ProductRefRO" - * @generated - */ - EClass getProductRefRO(); - /** * Returns the factory that creates the instances of the model. * @@ -369,4 +291,4 @@ public interface KeysPackage extends EPackage { */ KeysFactory getKeysFactory(); -} //KeysPackage +} // KeysPackage diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysAdapterFactory.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysAdapterFactory.java index 96e4bec07..8277b5c6f 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysAdapterFactory.java +++ b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysAdapterFactory.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,16 +14,10 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; - import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; - import org.eclipse.emf.ecore.EObject; - -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.api.KeyPair; +import org.eclipse.passage.lic.keys.model.api.ProductRef; import org.eclipse.passage.lic.keys.model.meta.KeysPackage; /** @@ -91,16 +85,6 @@ public Adapter caseProductRef(ProductRef object) { return createProductRefAdapter(); } - @Override - public Adapter caseKeyPairRO(KeyPairRO object) { - return createKeyPairROAdapter(); - } - - @Override - public Adapter caseProductRefRO(ProductRefRO object) { - return createProductRefROAdapter(); - } - @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -148,34 +132,6 @@ public Adapter createProductRefAdapter() { return null; } - /** - * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.keys.KeyPairRO Key Pair RO}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.passage.lic.keys.KeyPairRO - * @generated - */ - public Adapter createKeyPairROAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.keys.ProductRefRO Product Ref RO}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see org.eclipse.passage.lic.keys.ProductRefRO - * @generated - */ - public Adapter createProductRefROAdapter() { - return null; - } - /** * Creates a new adapter for the default case. * @@ -188,4 +144,4 @@ public Adapter createEObjectAdapter() { return null; } -} //KeysAdapterFactory +} // KeysAdapterFactory diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceFactoryImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceFactoryImpl.java index 00b0afa8f..430b7bca2 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceFactoryImpl.java +++ b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceFactoryImpl.java @@ -17,14 +17,28 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; import org.eclipse.passage.lic.emf.resource.BlindResourceFactory; +/** + * @since 3.0 + */ public final class KeysResourceFactoryImpl extends ResourceFactoryImpl implements BlindResourceFactory { + /** + * Creates an instance of the resource factory. + * + * + * @generated + */ + public KeysResourceFactoryImpl() { + super(); + } + /** * @generated */ @Override public Resource createResource(URI uri) { - return new KeysResourceImpl(uri); + Resource result = new KeysResourceImpl(uri); + return result; } /** diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceImpl.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceImpl.java index d8a22c210..f15125b51 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceImpl.java +++ b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysResourceImpl.java @@ -16,9 +16,11 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.eclipse.passage.lic.internal.keys.model.migration.KeysResourceHandler; /** * @generated NOT + * @since 3.0 */ public class KeysResourceImpl extends XMIResourceImpl { /** @@ -44,6 +46,7 @@ protected void init() { super.init(); Map options = getDefaultLoadOptions(); options.put(OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE); + options.put(OPTION_RESOURCE_HANDLER, new KeysResourceHandler()); } } diff --git a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysSwitch.java b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysSwitch.java index ca638fda9..00a313d5f 100644 --- a/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysSwitch.java +++ b/bundles/org.eclipse.passage.lic.keys.model/src-gen/org/eclipse/passage/lic/keys/model/util/KeysSwitch.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,14 +14,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; - import org.eclipse.emf.ecore.util.Switch; - -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.api.KeyPair; +import org.eclipse.passage.lic.keys.model.api.ProductRef; import org.eclipse.passage.lic.keys.model.meta.KeysPackage; /** @@ -84,8 +79,6 @@ protected T doSwitch(int classifierID, EObject theEObject) { case KeysPackage.KEY_PAIR: { KeyPair keyPair = (KeyPair) theEObject; T result = caseKeyPair(keyPair); - if (result == null) - result = caseKeyPairRO(keyPair); if (result == null) result = defaultCase(theEObject); return result; @@ -93,22 +86,6 @@ protected T doSwitch(int classifierID, EObject theEObject) { case KeysPackage.PRODUCT_REF: { ProductRef productRef = (ProductRef) theEObject; T result = caseProductRef(productRef); - if (result == null) - result = caseProductRefRO(productRef); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case KeysPackage.KEY_PAIR_RO: { - KeyPairRO keyPairRO = (KeyPairRO) theEObject; - T result = caseKeyPairRO(keyPairRO); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case KeysPackage.PRODUCT_REF_RO: { - ProductRefRO productRefRO = (ProductRefRO) theEObject; - T result = caseProductRefRO(productRefRO); if (result == null) result = defaultCase(theEObject); return result; @@ -148,36 +125,6 @@ public T caseProductRef(ProductRef object) { return null; } - /** - * Returns the result of interpreting the object as an instance of 'Key Pair RO'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Key Pair RO'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseKeyPairRO(KeyPairRO object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Product Ref RO'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Product Ref RO'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseProductRefRO(ProductRefRO object) { - return null; - } - /** * Returns the result of interpreting the object as an instance of 'EObject'. * @@ -194,4 +141,4 @@ public T defaultCase(EObject object) { return null; } -} //KeysSwitch +} // KeysSwitch diff --git a/bundles/org.eclipse.passage.lic.keys.model/src/org/eclipse/passage/lic/internal/keys/model/migration/KeysResourceHandler.java b/bundles/org.eclipse.passage.lic.keys.model/src/org/eclipse/passage/lic/internal/keys/model/migration/KeysResourceHandler.java new file mode 100644 index 000000000..cf2593a76 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.keys.model/src/org/eclipse/passage/lic/internal/keys/model/migration/KeysResourceHandler.java @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 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 + * 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.internal.keys.model.migration; + +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.xmi.XMLResource; +import org.eclipse.passage.lic.emf.migration.MigrationRoutes; +import org.eclipse.passage.lic.emf.migration.SimpleMigrationRoutes; +import org.eclipse.passage.lic.emf.xmi.MigratingResourceHandler; +import org.eclipse.passage.lic.keys.model.meta.KeysPackage; + +public final class KeysResourceHandler extends MigratingResourceHandler { + + @Override + protected void complete(XMLResource resource) { + // do nothing + } + + @Override + protected void register() { + migrate200(); + } + + @Override + protected MigrationRoutes attributes() { + return new SimpleMigrationRoutes(); + } + + private void migrate200() { + String uri = "http://www.eclipse.org/passage/lic/keys/2.0.0"; //$NON-NLS-1$ + KeysPackage delegate = KeysPackage.eINSTANCE; + EPackage.Registry.INSTANCE.computeIfAbsent(uri, ns -> delegate); + } + +} diff --git a/bundles/org.eclipse.passage.lic.keys/.classpath b/bundles/org.eclipse.passage.lic.keys/.classpath deleted file mode 100644 index 81fe078c2..000000000 --- a/bundles/org.eclipse.passage.lic.keys/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.eclipse.passage.lic.keys/.project b/bundles/org.eclipse.passage.lic.keys/.project index baf7d2db2..80c2c7952 100644 --- a/bundles/org.eclipse.passage.lic.keys/.project +++ b/bundles/org.eclipse.passage.lic.keys/.project @@ -5,11 +5,6 @@ - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.pde.ManifestBuilder @@ -28,7 +23,6 @@ org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/bundles/org.eclipse.passage.lic.keys/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.keys/META-INF/MANIFEST.MF index cf0c6e0ac..ec49f8f37 100644 --- a/bundles/org.eclipse.passage.lic.keys/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.keys/META-INF/MANIFEST.MF @@ -8,4 +8,3 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.passage.lic.api;bundle-version="0.0.0";visibility:=reexport -Export-Package: org.eclipse.passage.lic.keys diff --git a/bundles/org.eclipse.passage.lic.keys/build.properties b/bundles/org.eclipse.passage.lic.keys/build.properties index 6649eb20d..497031022 100644 --- a/bundles/org.eclipse.passage.lic.keys/build.properties +++ b/bundles/org.eclipse.passage.lic.keys/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,8 +11,6 @@ # ArSysOp - initial API and implementation ############################################################################### -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ .,\ OSGI-INF/,\ 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 deleted file mode 100644 index 631ca8103..000000000 --- a/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/KeyPairRO.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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; - -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 deleted file mode 100644 index d6bddb9d8..000000000 --- a/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/ProductRefRO.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 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; - -public interface ProductRefRO { - - String getIdentifier(); - - String getVersion(); - -} diff --git a/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/package-info.java b/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/package-info.java deleted file mode 100644 index 30f1d56a4..000000000 --- a/bundles/org.eclipse.passage.lic.keys/src/org/eclipse/passage/lic/keys/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* ***************************************************************************** - * Copyright (c) 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 - *******************************************************************************/ -/** - * Read only interfaces designed to be implemented by generated EMF entities of - * {@code keys} domain. - */ -package org.eclipse.passage.lic.keys; diff --git a/bundles/org.eclipse.passage.loc.licenses.core/OSGI-INF/org.eclipse.passage.loc.internal.licenses.core.LicenseDomainRegistry.xml b/bundles/org.eclipse.passage.loc.licenses.core/OSGI-INF/org.eclipse.passage.loc.internal.licenses.core.LicenseDomainRegistry.xml index 71e90c075..b64c53ded 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/OSGI-INF/org.eclipse.passage.loc.internal.licenses.core.LicenseDomainRegistry.xml +++ b/bundles/org.eclipse.passage.loc.licenses.core/OSGI-INF/org.eclipse.passage.loc.internal.licenses.core.LicenseDomainRegistry.xml @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductDomainRegistry.xml b/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductDomainRegistry.xml index 1aa05da54..fe5d0a43b 100644 --- a/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductDomainRegistry.xml +++ b/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductDomainRegistry.xml @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductOperatorServiceImpl.xml b/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductOperatorServiceImpl.xml index 06c1608f2..39a46d441 100644 --- a/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductOperatorServiceImpl.xml +++ b/bundles/org.eclipse.passage.loc.products.core/OSGI-INF/org.eclipse.passage.loc.internal.products.core.ProductOperatorServiceImpl.xml @@ -3,7 +3,7 @@ - - + + - \ No newline at end of file + diff --git a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductOperatorServiceImpl.java b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductOperatorServiceImpl.java index 74ed2515b..1fb8478c7 100644 --- a/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductOperatorServiceImpl.java +++ b/bundles/org.eclipse.passage.loc.products.core/src/org/eclipse/passage/loc/internal/products/core/ProductOperatorServiceImpl.java @@ -29,7 +29,9 @@ public class ProductOperatorServiceImpl implements OperatorProductService { private String plugin; + @Reference private EnvironmentInfo environment; + @Reference private EventAdmin events; @Activate @@ -37,28 +39,6 @@ public void activate(BundleContext context) { plugin = context.getBundle().getSymbolicName(); } - @Reference - public void bindEnvironmentInfo(EnvironmentInfo info) { - this.environment = info; - } - - public void unbindEnvironmentInfo(EnvironmentInfo info) { - if (environment == info) { - this.environment = null; - } - } - - @Reference - public void bindEventAdmin(EventAdmin admin) { - this.events = admin; - } - - public void unbindEventAdmin(EventAdmin admin) { - if (this.events == admin) { - this.events = null; - } - } - @Override public String createPassword(ProductVersionDescriptor descriptor) { return new ProductVersionPassword(descriptor).get();