From 252ec18d56a3a4a0e60cd4ca75c96a566dc4a97a Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Tue, 3 Aug 2021 11:41:34 +0300 Subject: [PATCH 1/2] Bug 575160 Attach LAs to FeatureVersion - FeatureVersion is extended with agreements:List collection to contain associated license agreement identifiers - `features` ecore and all related bundles upgraded versions to 2.0.0 --- .../lic/emf/xmi/MigratingResourceHandler.java | 5 - .../META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/bundle.properties | 4 +- .../model/features.ecore | 8 +- .../META-INF/MANIFEST.MF | 4 +- .../plugin.properties | 1 + .../plugin.xml | 2 +- .../providers/FeatureVersionItemProvider.java | 19 ++++ .../META-INF/MANIFEST.MF | 2 +- .../model/features.genmodel | 1 + .../plugin.properties | 4 +- .../plugin.xml | 2 +- .../lic/features/model/api/Feature.java | 30 +----- .../lic/features/model/api/FeatureSet.java | 25 +---- .../features/model/api/FeatureVersion.java | 39 ++++---- .../lic/features/model/impl/FeatureImpl.java | 8 +- .../features/model/impl/FeatureSetImpl.java | 9 +- .../model/impl/FeatureVersionImpl.java | 53 +++++++++- .../model/impl/FeaturesFactoryImpl.java | 22 ++--- .../model/impl/FeaturesPackageImpl.java | 57 ++++------- .../features/model/meta/FeaturesFactory.java | 16 +-- .../features/model/meta/FeaturesPackage.java | 98 +++++++------------ .../model/util/FeaturesAdapterFactory.java | 60 ++++-------- .../util/FeaturesResourceFactoryImpl.java | 2 +- .../model/util/FeaturesResourceImpl.java | 2 +- .../features/model/util/FeaturesSwitch.java | 72 ++++++-------- .../migration/FeaturesResourceHandler.java | 7 ++ .../META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/bundle.properties | 4 +- .../features/FeatureVersionDescriptor.java | 9 +- 30 files changed, 263 insertions(+), 306 deletions(-) diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/xmi/MigratingResourceHandler.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/xmi/MigratingResourceHandler.java index ca573bed0..f36329fb4 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/xmi/MigratingResourceHandler.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/xmi/MigratingResourceHandler.java @@ -57,14 +57,9 @@ public final void postLoad(XMLResource resource, InputStream inputStream, Map entry) throws MigrationException { new RecognizeFeatures(entry.getValue(), attributes()).apply(entry.getKey()); } diff --git a/bundles/org.eclipse.passage.lic.features.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.ecore/META-INF/MANIFEST.MF index fa7bac274..80bfa11d9 100644 --- a/bundles/org.eclipse.passage.lic.features.ecore/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.features.ecore/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.features.ecore Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.features.ecore -Bundle-Version: 0.5.300.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright diff --git a/bundles/org.eclipse.passage.lic.features.ecore/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.features.ecore/OSGI-INF/l10n/bundle.properties index beca6da45..79201590a 100644 --- a/bundles/org.eclipse.passage.lic.features.ecore/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.lic.features.ecore/OSGI-INF/l10n/bundle.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.lic.features.ecore ############################################################################### -# Copyright (c) 2018, 2020 ArSysOp and others +# Copyright (c) 2018, 2021 ArSysOp and others # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC Features Ecore Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore b/bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore index 877c48c48..9e02ac5ca 100644 --- a/bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore +++ b/bundles/org.eclipse.passage.lic.features.ecore/model/features.ecore @@ -1,6 +1,6 @@ @@ -33,5 +33,11 @@ + + +
+ + diff --git a/bundles/org.eclipse.passage.lic.features.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.edit/META-INF/MANIFEST.MF index 2413f09da..7b0ab5af7 100644 --- a/bundles/org.eclipse.passage.lic.features.edit/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.features.edit/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.features.edit Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.features.edit;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, +Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional, org.eclipse.passage.lic.features.model;bundle-version="1.0.0";visibility:=reexport, org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport Import-Package: org.osgi.framework diff --git a/bundles/org.eclipse.passage.lic.features.edit/plugin.properties b/bundles/org.eclipse.passage.lic.features.edit/plugin.properties index ae36410a3..5dad177d4 100644 --- a/bundles/org.eclipse.passage.lic.features.edit/plugin.properties +++ b/bundles/org.eclipse.passage.lic.features.edit/plugin.properties @@ -54,3 +54,4 @@ _UI_Unknown_feature = Unspecified _UI_FeatureSet_text_pattern = {1} ({0}) _UI_FeatureVersion_text_pattern = {0} {1} _UI_Feature_provider_feature = Provider +_UI_FeatureVersion_agreements_feature = Agreements diff --git a/bundles/org.eclipse.passage.lic.features.edit/plugin.xml b/bundles/org.eclipse.passage.lic.features.edit/plugin.xml index 59db73a28..a22e980e0 100644 --- a/bundles/org.eclipse.passage.lic.features.edit/plugin.xml +++ b/bundles/org.eclipse.passage.lic.features.edit/plugin.xml @@ -19,7 +19,7 @@ + diff --git a/bundles/org.eclipse.passage.lic.features.model/plugin.properties b/bundles/org.eclipse.passage.lic.features.model/plugin.properties index c359f6315..129852cc7 100644 --- a/bundles/org.eclipse.passage.lic.features.model/plugin.properties +++ b/bundles/org.eclipse.passage.lic.features.model/plugin.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.lic.features.model ############################################################################### -# Copyright (c) 2018, 2020 ArSysOp and others +# Copyright (c) 2018, 2021 ArSysOp and others # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ pluginName = Passage LIC Features Model providerName=Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.features.model/plugin.xml b/bundles/org.eclipse.passage.lic.features.model/plugin.xml index 63771512e..2cddf85e5 100644 --- a/bundles/org.eclipse.passage.lic.features.model/plugin.xml +++ b/bundles/org.eclipse.passage.lic.features.model/plugin.xml @@ -17,7 +17,7 @@ diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java index 875c057e3..ef01a0944 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/Feature.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -13,14 +13,14 @@ package org.eclipse.passage.lic.features.model.api; import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; + import org.eclipse.passage.lic.features.FeatureDescriptor; /** * - * * A representation of the model object 'Feature'. - * * * *

@@ -43,10 +43,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Returns the value of the 'Identifier' attribute. * - *

- * If the meaning of the 'Identifier' attribute isn't clear, there - * really should be more of a description here... - *

* * @return the value of the 'Identifier' attribute. * @see #setIdentifier(String) @@ -60,7 +56,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.Feature#getIdentifier Identifier}' attribute. * - * * * @param value the new value of the 'Identifier' attribute. * @see #getIdentifier() @@ -94,10 +89,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Returns the value of the 'Name' attribute. * - *

- * If the meaning of the 'Name' attribute isn't clear, there really - * should be more of a description here... - *

* * @return the value of the 'Name' attribute. * @see #setName(String) @@ -111,7 +102,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.Feature#getName Name}' attribute. * - * * * @param value the new value of the 'Name' attribute. * @see #getName() @@ -122,10 +112,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Returns the value of the 'Description' attribute. * - *

- * If the meaning of the 'Description' attribute isn't clear, there - * really should be more of a description here... - *

* * @return the value of the 'Description' attribute. * @see #setDescription(String) @@ -139,7 +125,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.Feature#getDescription Description}' attribute. * - * * * @param value the new value of the 'Description' attribute. * @see #getDescription() @@ -151,10 +136,6 @@ public interface Feature extends EObject, FeatureDescriptor { * Returns the value of the 'Feature Set' container reference. * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getFeatures Features}'. * - *

- * If the meaning of the 'Feature Set' container reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Feature Set' container reference. * @see #setFeatureSet(FeatureSet) @@ -169,7 +150,6 @@ public interface Feature extends EObject, FeatureDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.Feature#getFeatureSet Feature Set}' container reference. * - * * * @param value the new value of the 'Feature Set' container reference. * @see #getFeatureSet() @@ -182,10 +162,6 @@ public interface Feature extends EObject, FeatureDescriptor { * The list contents are of type {@link org.eclipse.passage.lic.features.model.api.FeatureVersion}. * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getFeature Feature}'. * - *

- * If the meaning of the 'Feature Versions' containment reference list - * isn't clear, there really should be more of a description here... - *

* * @return the value of the 'Feature Versions' containment reference list. * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeature_FeatureVersions() diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java index 55002071d..a9e91b59c 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureSet.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -13,14 +13,14 @@ package org.eclipse.passage.lic.features.model.api; import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; + import org.eclipse.passage.lic.features.FeatureSetDescriptor; /** * - * * A representation of the model object 'Feature Set'. - * * * *

@@ -41,10 +41,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { /** * Returns the value of the 'Identifier' attribute. * - *

- * If the meaning of the 'Identifier' attribute isn't clear, there - * really should be more of a description here... - *

* * @return the value of the 'Identifier' attribute. * @see #setIdentifier(String) @@ -58,7 +54,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getIdentifier Identifier}' attribute. * - * * * @param value the new value of the 'Identifier' attribute. * @see #getIdentifier() @@ -69,10 +64,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { /** * Returns the value of the 'Name' attribute. * - *

- * If the meaning of the 'Name' attribute isn't clear, there really - * should be more of a description here... - *

* * @return the value of the 'Name' attribute. * @see #setName(String) @@ -86,7 +77,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getName Name}' attribute. * - * * * @param value the new value of the 'Name' attribute. * @see #getName() @@ -97,10 +87,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { /** * Returns the value of the 'Description' attribute. * - *

- * If the meaning of the 'Description' attribute isn't clear, there - * really should be more of a description here... - *

* * @return the value of the 'Description' attribute. * @see #setDescription(String) @@ -114,7 +100,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getDescription Description}' attribute. * - * * * @param value the new value of the 'Description' attribute. * @see #getDescription() @@ -127,10 +112,6 @@ public interface FeatureSet extends EObject, FeatureSetDescriptor { * The list contents are of type {@link org.eclipse.passage.lic.features.model.api.Feature}. * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.features.model.api.Feature#getFeatureSet Feature Set}'. * - *

- * If the meaning of the 'Features' containment reference list isn't - * clear, there really should be more of a description here... - *

* * @return the value of the 'Features' containment reference list. * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeatureSet_Features() diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureVersion.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureVersion.java index 901bfcf27..f284c23a7 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureVersion.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/api/FeatureVersion.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -12,14 +12,15 @@ *******************************************************************************/ package org.eclipse.passage.lic.features.model.api; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; + import org.eclipse.passage.lic.features.FeatureVersionDescriptor; /** * - * * A representation of the model object 'Feature Version'. - * * * *

@@ -29,6 +30,7 @@ *

  • {@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getVersion Version}
    • *
  • {@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getFeature Feature}
    • *
  • {@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getNews News}
    • + *
  • {@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getAgreements Agreements}
    • * * * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeatureVersion() @@ -39,10 +41,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { /** * Returns the value of the 'Version' attribute. * - *

    - * If the meaning of the 'Version' attribute isn't clear, there really - * should be more of a description here... - *

    * * @return the value of the 'Version' attribute. * @see #setVersion(String) @@ -56,7 +54,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getVersion Version}' attribute. * - * * * @param value the new value of the 'Version' attribute. * @see #getVersion() @@ -68,10 +65,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { * Returns the value of the 'Feature' container reference. * It is bidirectional and its opposite is '{@link org.eclipse.passage.lic.features.model.api.Feature#getFeatureVersions Feature Versions}'. * - *

    - * If the meaning of the 'Feature' container reference isn't clear, - * there really should be more of a description here... - *

    * * @return the value of the 'Feature' container reference. * @see #setFeature(Feature) @@ -86,7 +79,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getFeature Feature}' container reference. * - * * * @param value the new value of the 'Feature' container reference. * @see #getFeature() @@ -97,10 +89,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { /** * Returns the value of the 'News' attribute. * - *

    - * If the meaning of the 'News' attribute isn't clear, there really - * should be more of a description here... - *

    * * @return the value of the 'News' attribute. * @see #setNews(String) @@ -114,7 +102,6 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { /** * Sets the value of the '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getNews News}' attribute. * - * * * @param value the new value of the 'News' attribute. * @see #getNews() @@ -122,4 +109,20 @@ public interface FeatureVersion extends EObject, FeatureVersionDescriptor { */ void setNews(String value); + /** + * Returns the value of the 'Agreements' attribute list. + * The list contents are of type {@link java.lang.String}. + * + * + * + * @since 2.0 + * + * @return the value of the 'Agreements' attribute list. + * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#getFeatureVersion_Agreements() + * @model + * @generated + */ + @Override + EList getAgreements(); + } // FeatureVersion diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureImpl.java index 574fea882..8b5e1a389 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -17,17 +17,23 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + 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.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; + import org.eclipse.passage.lic.features.model.api.Feature; import org.eclipse.passage.lic.features.model.api.FeatureSet; import org.eclipse.passage.lic.features.model.api.FeatureVersion; + import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureSetImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureSetImpl.java index 2da5c5b89..04bf997e5 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureSetImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureSetImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -14,17 +14,24 @@ import java.util.Collection; import java.util.Objects; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.common.util.EList; + 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.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.InternalEList; + import org.eclipse.passage.lic.features.model.api.Feature; import org.eclipse.passage.lic.features.model.api.FeatureSet; + import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java index 0f52dbc08..86a0fd106 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -12,16 +12,26 @@ *******************************************************************************/ package org.eclipse.passage.lic.features.model.impl; +import java.util.Collection; import java.util.Objects; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + 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.emf.ecore.util.EDataTypeUniqueEList; import org.eclipse.emf.ecore.util.EcoreUtil; + import org.eclipse.passage.lic.features.model.api.Feature; import org.eclipse.passage.lic.features.model.api.FeatureVersion; + import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** @@ -35,6 +45,7 @@ *
  • {@link org.eclipse.passage.lic.features.model.impl.FeatureVersionImpl#getVersion Version}
    • *
  • {@link org.eclipse.passage.lic.features.model.impl.FeatureVersionImpl#getFeature Feature}
    • *
  • {@link org.eclipse.passage.lic.features.model.impl.FeatureVersionImpl#getNews News}
    • + *
  • {@link org.eclipse.passage.lic.features.model.impl.FeatureVersionImpl#getAgreements Agreements}
    • * * * @generated @@ -80,6 +91,17 @@ public class FeatureVersionImpl extends MinimalEObjectImpl.Container implements */ private String news = NEWS_EDEFAULT; + /** + * The cached value of the '{@link #getAgreements() Agreements}' attribute list. + * + * + * @see #getAgreements() + * @since 1.1 + * @generated + * @ordered + */ + protected EList agreements; + /** * * @@ -200,6 +222,21 @@ public void setNews(String newNews) { } } + /** + * + * + * @since 1.1 + * @generated + */ + @Override + public EList getAgreements() { + if (agreements == null) { + agreements = new EDataTypeUniqueEList(String.class, this, + FeaturesPackage.FEATURE_VERSION__AGREEMENTS); + } + return agreements; + } + /** * * @@ -263,6 +300,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getFeature(); case FeaturesPackage.FEATURE_VERSION__NEWS: return getNews(); + case FeaturesPackage.FEATURE_VERSION__AGREEMENTS: + return getAgreements(); default: return super.eGet(featureID, resolve, coreType); } @@ -273,6 +312,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { * * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { @@ -285,6 +325,10 @@ public void eSet(int featureID, Object newValue) { case FeaturesPackage.FEATURE_VERSION__NEWS: setNews((String) newValue); return; + case FeaturesPackage.FEATURE_VERSION__AGREEMENTS: + getAgreements().clear(); + getAgreements().addAll((Collection) newValue); + return; default: super.eSet(featureID, newValue); return; @@ -308,6 +352,9 @@ public void eUnset(int featureID) { case FeaturesPackage.FEATURE_VERSION__NEWS: setNews(NEWS_EDEFAULT); return; + case FeaturesPackage.FEATURE_VERSION__AGREEMENTS: + getAgreements().clear(); + return; default: super.eUnset(featureID); return; @@ -328,6 +375,8 @@ public boolean eIsSet(int featureID) { return getFeature() != null; case FeaturesPackage.FEATURE_VERSION__NEWS: return !Objects.equals(NEWS_EDEFAULT, news); + case FeaturesPackage.FEATURE_VERSION__AGREEMENTS: + return agreements != null && !agreements.isEmpty(); default: return super.eIsSet(featureID); } @@ -348,6 +397,8 @@ public String toString() { result.append(version); result.append(", news: "); //$NON-NLS-1$ result.append(news); + result.append(", agreements: "); //$NON-NLS-1$ + result.append(agreements); result.append(')'); return result.toString(); } diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesFactoryImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesFactoryImpl.java index 387f608bf..7148c1a9b 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesFactoryImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesFactoryImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -15,19 +15,19 @@ 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.features.model.api.Feature; -import org.eclipse.passage.lic.features.model.api.FeatureSet; -import org.eclipse.passage.lic.features.model.api.FeatureVersion; + +import org.eclipse.passage.lic.features.model.api.*; + import org.eclipse.passage.lic.features.model.meta.FeaturesFactory; import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** * - * * An implementation of the model Factory. - * * * @generated */ @@ -35,7 +35,6 @@ public class FeaturesFactoryImpl extends EFactoryImpl implements FeaturesFactory /** * Creates the default factory implementation. * - * * * @generated */ @@ -55,7 +54,6 @@ public static FeaturesFactory init() { /** * Creates an instance of the factory. * - * * * @generated */ @@ -65,7 +63,6 @@ public FeaturesFactoryImpl() { /** * - * * * @generated */ @@ -85,7 +82,6 @@ public EObject create(EClass eClass) { /** * - * * * @generated */ @@ -97,7 +93,6 @@ public FeatureSet createFeatureSet() { /** * - * * * @generated */ @@ -109,7 +104,6 @@ public Feature createFeature() { /** * - * * * @generated */ @@ -121,7 +115,6 @@ public FeatureVersion createFeatureVersion() { /** * - * * * @generated */ @@ -132,7 +125,6 @@ public FeaturesPackage getFeaturesPackage() { /** * - * * * @deprecated * @generated @@ -142,4 +134,4 @@ public static FeaturesPackage getPackage() { return FeaturesPackage.eINSTANCE; } -} // FeaturesFactoryImpl +} //FeaturesFactoryImpl diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java index da0d60421..8206586a7 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -16,28 +16,29 @@ 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.features.FeatureDescriptor; import org.eclipse.passage.lic.features.FeatureSetDescriptor; import org.eclipse.passage.lic.features.FeatureVersionDescriptor; + import org.eclipse.passage.lic.features.model.api.Feature; import org.eclipse.passage.lic.features.model.api.FeatureSet; import org.eclipse.passage.lic.features.model.api.FeatureVersion; + import org.eclipse.passage.lic.features.model.meta.FeaturesFactory; import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** * - * * An implementation of the model Package. - * * * @generated */ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage { /** * - * * * @generated */ @@ -45,7 +46,6 @@ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage /** * - * * * @generated */ @@ -53,7 +53,6 @@ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage /** * - * * * @generated */ @@ -61,7 +60,6 @@ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage /** * - * * * @generated */ @@ -69,7 +67,6 @@ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage /** * - * * * @generated */ @@ -77,7 +74,6 @@ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage /** * - * * * @generated */ @@ -92,7 +88,6 @@ public class FeaturesPackageImpl extends EPackageImpl implements FeaturesPackage * initialization of the package, or returns the registered package, * if one already exists. * - * * * @see org.eclipse.emf.ecore.EPackage.Registry * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage#eNS_URI @@ -105,7 +100,6 @@ private FeaturesPackageImpl() { /** * - * * * @generated */ @@ -117,7 +111,6 @@ private FeaturesPackageImpl() { *

    This method is used to initialize {@link FeaturesPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * - * * * @see #eNS_URI * @see #createPackageContents() @@ -152,7 +145,6 @@ public static FeaturesPackage init() { /** * - * * * @generated */ @@ -163,7 +155,6 @@ public EClass getFeatureSetDescriptor() { /** * - * * * @generated */ @@ -174,7 +165,6 @@ public EClass getFeatureDescriptor() { /** * - * * * @generated */ @@ -185,7 +175,6 @@ public EClass getFeatureVersionDescriptor() { /** * - * * * @generated */ @@ -196,7 +185,6 @@ public EClass getFeatureSet() { /** * - * * * @generated */ @@ -207,7 +195,6 @@ public EAttribute getFeatureSet_Identifier() { /** * - * * * @generated */ @@ -218,7 +205,6 @@ public EAttribute getFeatureSet_Name() { /** * - * * * @generated */ @@ -229,7 +215,6 @@ public EAttribute getFeatureSet_Description() { /** * - * * * @generated */ @@ -240,7 +225,6 @@ public EReference getFeatureSet_Features() { /** * - * * * @generated */ @@ -251,7 +235,6 @@ public EClass getFeature() { /** * - * * * @generated */ @@ -272,7 +255,6 @@ public EAttribute getFeature_Provider() { /** * - * * * @generated */ @@ -283,7 +265,6 @@ public EAttribute getFeature_Name() { /** * - * * * @generated */ @@ -294,7 +275,6 @@ public EAttribute getFeature_Description() { /** * - * * * @generated */ @@ -305,7 +285,6 @@ public EReference getFeature_FeatureSet() { /** * - * * * @generated */ @@ -316,7 +295,6 @@ public EReference getFeature_FeatureVersions() { /** * - * * * @generated */ @@ -327,7 +305,6 @@ public EClass getFeatureVersion() { /** * - * * * @generated */ @@ -338,7 +315,6 @@ public EAttribute getFeatureVersion_Version() { /** * - * * * @generated */ @@ -349,7 +325,6 @@ public EReference getFeatureVersion_Feature() { /** * - * * * @generated */ @@ -360,7 +335,17 @@ public EAttribute getFeatureVersion_News() { /** * - * + * + * @since 1.1 + * @generated + */ + @Override + public EAttribute getFeatureVersion_Agreements() { + return (EAttribute) featureVersionEClass.getEStructuralFeatures().get(3); + } + + /** + * * * @generated */ @@ -371,7 +356,6 @@ public FeaturesFactory getFeaturesFactory() { /** * - * * * @generated */ @@ -381,7 +365,6 @@ public FeaturesFactory getFeaturesFactory() { * Creates the meta-model objects for the package. This method is * guarded to have no affect on any invocation but its first. * - * * * @generated */ @@ -415,11 +398,11 @@ public void createPackageContents() { createEAttribute(featureVersionEClass, FEATURE_VERSION__VERSION); createEReference(featureVersionEClass, FEATURE_VERSION__FEATURE); createEAttribute(featureVersionEClass, FEATURE_VERSION__NEWS); + createEAttribute(featureVersionEClass, FEATURE_VERSION__AGREEMENTS); } /** * - * * * @generated */ @@ -429,7 +412,6 @@ public void createPackageContents() { * Complete the initialization of the package and its meta-model. This * method is guarded to have no affect on any invocation but its first. * - * * * @generated */ @@ -502,9 +484,12 @@ public void initializePackageContents() { !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getFeatureVersion_News(), ecorePackage.getEString(), "news", null, 0, 1, FeatureVersion.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFeatureVersion_Agreements(), ecorePackage.getEString(), "agreements", null, 0, -1, //$NON-NLS-1$ + FeatureVersion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); } -} // FeaturesPackageImpl +} //FeaturesPackageImpl diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesFactory.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesFactory.java index 73e57ba03..65f71d340 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesFactory.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -13,16 +13,15 @@ package org.eclipse.passage.lic.features.model.meta; import org.eclipse.emf.ecore.EFactory; + import org.eclipse.passage.lic.features.model.api.Feature; import org.eclipse.passage.lic.features.model.api.FeatureSet; import org.eclipse.passage.lic.features.model.api.FeatureVersion; /** * - * - * The Factory for the model. It provides a create method for each - * non-abstract class of the model. - * + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. * * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage * @generated @@ -31,7 +30,6 @@ public interface FeaturesFactory extends EFactory { /** * The singleton instance of the factory. * - * * * @generated */ @@ -40,7 +38,6 @@ public interface FeaturesFactory extends EFactory { /** * Returns a new object of class 'Feature Set'. * - * * * @return a new object of class 'Feature Set'. * @generated @@ -50,7 +47,6 @@ public interface FeaturesFactory extends EFactory { /** * Returns a new object of class 'Feature'. * - * * * @return a new object of class 'Feature'. * @generated @@ -60,7 +56,6 @@ public interface FeaturesFactory extends EFactory { /** * Returns a new object of class 'Feature Version'. * - * * * @return a new object of class 'Feature Version'. * @generated @@ -70,11 +65,10 @@ public interface FeaturesFactory extends EFactory { /** * Returns the package supported by this factory. * - * * * @return the package supported by this factory. * @generated */ FeaturesPackage getFeaturesPackage(); -} // FeaturesFactory +} //FeaturesFactory diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java index c0c63d1fb..60a049bf3 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -19,15 +19,14 @@ /** * - * - * The Package for the model. It contains accessors for the meta objects - * to represent + * The Package for the model. + * It contains accessors for the meta objects to represent *

      - *
    • each class,
      • - *
    • each feature of each class,
      • - *
    • each operation of each class,
      • - *
    • each enum,
      • - *
    • and each data type
      • + *
    • each class,
      • + *
    • each feature of each class,
      • + *
    • each operation of each class,
      • + *
    • each enum,
      • + *
    • and each data type
      • *
    * * @see org.eclipse.passage.lic.features.model.meta.FeaturesFactory @@ -38,7 +37,6 @@ public interface FeaturesPackage extends EPackage { /** * The package name. * - * * * @generated */ @@ -47,16 +45,14 @@ public interface FeaturesPackage extends EPackage { /** * The package namespace URI. * - * * * @generated */ - String eNS_URI = "http://www.eclipse.org/passage/lic/features/0.5.0"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/passage/lic/features/2.0.0"; //$NON-NLS-1$ /** * The package namespace name. * - * * * @generated */ @@ -65,7 +61,6 @@ public interface FeaturesPackage extends EPackage { /** * The singleton instance of the package. * - * * * @generated */ @@ -74,7 +69,6 @@ public interface FeaturesPackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.passage.lic.features.FeatureSetDescriptor Feature Set Descriptor}' class. * - * * * @see org.eclipse.passage.lic.features.FeatureSetDescriptor * @see org.eclipse.passage.lic.features.model.impl.FeaturesPackageImpl#getFeatureSetDescriptor() @@ -85,7 +79,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of structural features of the 'Feature Set Descriptor' class. * - * * * @generated * @ordered @@ -95,7 +88,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of operations of the 'Feature Set Descriptor' class. * - * * * @generated * @ordered @@ -105,7 +97,6 @@ public interface FeaturesPackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.passage.lic.features.FeatureDescriptor Feature Descriptor}' class. * - * * * @see org.eclipse.passage.lic.features.FeatureDescriptor * @see org.eclipse.passage.lic.features.model.impl.FeaturesPackageImpl#getFeatureDescriptor() @@ -116,7 +107,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of structural features of the 'Feature Descriptor' class. * - * * * @generated * @ordered @@ -126,7 +116,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of operations of the 'Feature Descriptor' class. * - * * * @generated * @ordered @@ -136,7 +125,6 @@ public interface FeaturesPackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.passage.lic.features.FeatureVersionDescriptor Feature Version Descriptor}' class. * - * * * @see org.eclipse.passage.lic.features.FeatureVersionDescriptor * @see org.eclipse.passage.lic.features.model.impl.FeaturesPackageImpl#getFeatureVersionDescriptor() @@ -147,7 +135,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of structural features of the 'Feature Version Descriptor' class. * - * * * @generated * @ordered @@ -157,7 +144,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of operations of the 'Feature Version Descriptor' class. * - * * * @generated * @ordered @@ -167,7 +153,6 @@ public interface FeaturesPackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.passage.lic.features.model.impl.FeatureSetImpl Feature Set}' class. * - * * * @see org.eclipse.passage.lic.features.model.impl.FeatureSetImpl * @see org.eclipse.passage.lic.features.model.impl.FeaturesPackageImpl#getFeatureSet() @@ -178,7 +163,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Identifier' attribute. * - * * * @generated * @ordered @@ -188,7 +172,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Name' attribute. * - * * * @generated * @ordered @@ -198,7 +181,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Description' attribute. * - * * * @generated * @ordered @@ -208,7 +190,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Features' containment reference list. * - * * * @generated * @ordered @@ -218,7 +199,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of structural features of the 'Feature Set' class. * - * * * @generated * @ordered @@ -228,7 +208,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of operations of the 'Feature Set' class. * - * * * @generated * @ordered @@ -238,7 +217,6 @@ public interface FeaturesPackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.passage.lic.features.model.impl.FeatureImpl Feature}' class. * - * * * @see org.eclipse.passage.lic.features.model.impl.FeatureImpl * @see org.eclipse.passage.lic.features.model.impl.FeaturesPackageImpl#getFeature() @@ -249,7 +227,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Identifier' attribute. * - * * * @generated * @ordered @@ -268,7 +245,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Name' attribute. * - * * * @generated * @ordered @@ -278,7 +254,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Description' attribute. * - * * * @generated * @ordered @@ -288,7 +263,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Feature Set' container reference. * - * * * @generated * @ordered @@ -298,7 +272,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Feature Versions' containment reference list. * - * * * @generated * @ordered @@ -308,7 +281,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of structural features of the 'Feature' class. * - * * * @generated * @ordered @@ -318,7 +290,6 @@ public interface FeaturesPackage extends EPackage { /** * The number of operations of the 'Feature' class. * - * * * @generated * @ordered @@ -328,7 +299,6 @@ public interface FeaturesPackage extends EPackage { /** * The meta object id for the '{@link org.eclipse.passage.lic.features.model.impl.FeatureVersionImpl Feature Version}' class. * - * * * @see org.eclipse.passage.lic.features.model.impl.FeatureVersionImpl * @see org.eclipse.passage.lic.features.model.impl.FeaturesPackageImpl#getFeatureVersion() @@ -339,7 +309,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Version' attribute. * - * * * @generated * @ordered @@ -349,7 +318,6 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'Feature' container reference. * - * * * @generated * @ordered @@ -359,27 +327,34 @@ public interface FeaturesPackage extends EPackage { /** * The feature id for the 'News' attribute. * - * * * @generated * @ordered */ int FEATURE_VERSION__NEWS = FEATURE_VERSION_DESCRIPTOR_FEATURE_COUNT + 2; + /** + * The feature id for the 'Agreements' attribute list. + * + * + * @since 1.1 + * @generated + * @ordered + */ + int FEATURE_VERSION__AGREEMENTS = FEATURE_VERSION_DESCRIPTOR_FEATURE_COUNT + 3; + /** * The number of structural features of the 'Feature Version' class. * - * * * @generated * @ordered */ - int FEATURE_VERSION_FEATURE_COUNT = FEATURE_VERSION_DESCRIPTOR_FEATURE_COUNT + 3; + int FEATURE_VERSION_FEATURE_COUNT = FEATURE_VERSION_DESCRIPTOR_FEATURE_COUNT + 4; /** * The number of operations of the 'Feature Version' class. * - * * * @generated * @ordered @@ -389,7 +364,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.passage.lic.features.FeatureSetDescriptor Feature Set Descriptor}'. * - * * * @return the meta object for class 'Feature Set Descriptor'. * @see org.eclipse.passage.lic.features.FeatureSetDescriptor @@ -401,7 +375,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.passage.lic.features.FeatureDescriptor Feature Descriptor}'. * - * * * @return the meta object for class 'Feature Descriptor'. * @see org.eclipse.passage.lic.features.FeatureDescriptor @@ -413,7 +386,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.passage.lic.features.FeatureVersionDescriptor Feature Version Descriptor}'. * - * * * @return the meta object for class 'Feature Version Descriptor'. * @see org.eclipse.passage.lic.features.FeatureVersionDescriptor @@ -425,7 +397,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.passage.lic.features.model.api.FeatureSet Feature Set}'. * - * * * @return the meta object for class 'Feature Set'. * @see org.eclipse.passage.lic.features.model.api.FeatureSet @@ -436,7 +407,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getIdentifier Identifier}'. * - * * * @return the meta object for the attribute 'Identifier'. * @see org.eclipse.passage.lic.features.model.api.FeatureSet#getIdentifier() @@ -448,7 +418,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getName Name}'. * - * * * @return the meta object for the attribute 'Name'. * @see org.eclipse.passage.lic.features.model.api.FeatureSet#getName() @@ -460,7 +429,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getDescription Description}'. * - * * * @return the meta object for the attribute 'Description'. * @see org.eclipse.passage.lic.features.model.api.FeatureSet#getDescription() @@ -472,7 +440,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.features.model.api.FeatureSet#getFeatures Features}'. * - * * * @return the meta object for the containment reference list 'Features'. * @see org.eclipse.passage.lic.features.model.api.FeatureSet#getFeatures() @@ -484,7 +451,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.passage.lic.features.model.api.Feature Feature}'. * - * * * @return the meta object for class 'Feature'. * @see org.eclipse.passage.lic.features.model.api.Feature @@ -495,7 +461,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.Feature#getIdentifier Identifier}'. * - * * * @return the meta object for the attribute 'Identifier'. * @see org.eclipse.passage.lic.features.model.api.Feature#getIdentifier() @@ -518,7 +483,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.Feature#getName Name}'. * - * * * @return the meta object for the attribute 'Name'. * @see org.eclipse.passage.lic.features.model.api.Feature#getName() @@ -530,7 +494,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.Feature#getDescription Description}'. * - * * * @return the meta object for the attribute 'Description'. * @see org.eclipse.passage.lic.features.model.api.Feature#getDescription() @@ -542,7 +505,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.features.model.api.Feature#getFeatureSet Feature Set}'. * - * * * @return the meta object for the container reference 'Feature Set'. * @see org.eclipse.passage.lic.features.model.api.Feature#getFeatureSet() @@ -554,7 +516,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.features.model.api.Feature#getFeatureVersions Feature Versions}'. * - * * * @return the meta object for the containment reference list 'Feature Versions'. * @see org.eclipse.passage.lic.features.model.api.Feature#getFeatureVersions() @@ -566,7 +527,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for class '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion Feature Version}'. * - * * * @return the meta object for class 'Feature Version'. * @see org.eclipse.passage.lic.features.model.api.FeatureVersion @@ -577,7 +537,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getVersion Version}'. * - * * * @return the meta object for the attribute 'Version'. * @see org.eclipse.passage.lic.features.model.api.FeatureVersion#getVersion() @@ -589,7 +548,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the container reference '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getFeature Feature}'. * - * * * @return the meta object for the container reference 'Feature'. * @see org.eclipse.passage.lic.features.model.api.FeatureVersion#getFeature() @@ -601,7 +559,6 @@ public interface FeaturesPackage extends EPackage { /** * Returns the meta object for the attribute '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getNews News}'. * - * * * @return the meta object for the attribute 'News'. * @see org.eclipse.passage.lic.features.model.api.FeatureVersion#getNews() @@ -610,14 +567,25 @@ public interface FeaturesPackage extends EPackage { */ EAttribute getFeatureVersion_News(); + /** + * Returns the meta object for the attribute list '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion#getAgreements Agreements}'. + * + * + * @return the meta object for the attribute list 'Agreements'. + * @see org.eclipse.passage.lic.features.model.api.FeatureVersion#getAgreements() + * @see #getFeatureVersion() + * @since 1.1 + * @generated + */ + EAttribute getFeatureVersion_Agreements(); + /** * Returns the factory that creates the instances of the model. * - * * * @return the factory that creates the instances of the model. * @generated */ FeaturesFactory getFeaturesFactory(); -} // FeaturesPackage +} //FeaturesPackage diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesAdapterFactory.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesAdapterFactory.java index b71d0583f..f606d9526 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesAdapterFactory.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -14,22 +14,23 @@ 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.features.FeatureDescriptor; import org.eclipse.passage.lic.features.FeatureSetDescriptor; import org.eclipse.passage.lic.features.FeatureVersionDescriptor; -import org.eclipse.passage.lic.features.model.api.Feature; -import org.eclipse.passage.lic.features.model.api.FeatureSet; -import org.eclipse.passage.lic.features.model.api.FeatureVersion; + +import org.eclipse.passage.lic.features.model.api.*; + import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** * - * - * The Adapter Factory for the model. It provides an adapter - * createXXX method for each class of the model. - * + * The Adapter Factory for the model. + * It provides an adapter createXXX method for each class of the model. * * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage * @generated @@ -38,7 +39,6 @@ public class FeaturesAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. * - * * * @generated */ @@ -47,7 +47,6 @@ public class FeaturesAdapterFactory extends AdapterFactoryImpl { /** * Creates an instance of the adapter factory. * - * * * @generated */ @@ -60,10 +59,7 @@ public FeaturesAdapterFactory() { /** * Returns whether this factory is applicable for the type of the object. * - * - * This implementation returns true if the object is either the - * model's package or is an instance object of the model. - * + * This implementation returns true if the object is either the model's package or is an instance object of the model. * * @return whether this factory is applicable for the type of the object. * @generated @@ -82,7 +78,6 @@ public boolean isFactoryForType(Object object) { /** * The switch that delegates to the createXXX methods. * - * * * @generated */ @@ -126,7 +121,6 @@ public Adapter defaultCase(EObject object) { /** * Creates an adapter for the target. * - * * * @param target the object to adapt. * @return the adapter for the target. @@ -140,11 +134,8 @@ public Adapter createAdapter(Notifier target) { /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.features.FeatureSetDescriptor Feature Set Descriptor}'. * - * * 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. - * + * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.eclipse.passage.lic.features.FeatureSetDescriptor @@ -157,11 +148,8 @@ public Adapter createFeatureSetDescriptorAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.features.FeatureDescriptor Feature Descriptor}'. * - * * 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. - * + * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.eclipse.passage.lic.features.FeatureDescriptor @@ -174,11 +162,8 @@ public Adapter createFeatureDescriptorAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.features.FeatureVersionDescriptor Feature Version Descriptor}'. * - * * 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. - * + * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.eclipse.passage.lic.features.FeatureVersionDescriptor @@ -191,11 +176,8 @@ public Adapter createFeatureVersionDescriptorAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.features.model.api.FeatureSet Feature Set}'. * - * * 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. - * + * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.eclipse.passage.lic.features.model.api.FeatureSet @@ -208,11 +190,8 @@ public Adapter createFeatureSetAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.features.model.api.Feature Feature}'. * - * * 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. - * + * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.eclipse.passage.lic.features.model.api.Feature @@ -225,11 +204,8 @@ public Adapter createFeatureAdapter() { /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.features.model.api.FeatureVersion Feature Version}'. * - * * 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. - * + * it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. * @see org.eclipse.passage.lic.features.model.api.FeatureVersion @@ -242,9 +218,7 @@ public Adapter createFeatureVersionAdapter() { /** * Creates a new adapter for the default case. * - * * This default implementation returns null. - * * * @return the new adapter. * @generated @@ -253,4 +227,4 @@ public Adapter createEObjectAdapter() { return null; } -} // FeaturesAdapterFactory +} //FeaturesAdapterFactory diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java index d9f832c7c..7fb24ba43 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java @@ -22,7 +22,7 @@ * * @see org.eclipse.passage.lic.features.model.util.FeaturesResourceImpl * @generated - * @since 1.1 + * @since 2.0 */ public class FeaturesResourceFactoryImpl extends ResourceFactoryImpl { /** diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java index d7776c4eb..8ee9e1d34 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java @@ -24,7 +24,7 @@ * * @see org.eclipse.passage.lic.features.model.util.FeaturesResourceFactoryImpl * @generated - * @since 1.1 + * @since 2.0 */ public class FeaturesResourceImpl extends XMIResourceImpl { /** diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesSwitch.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesSwitch.java index f7d2fa829..4ee0b287a 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesSwitch.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesSwitch.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -14,24 +14,26 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; + import org.eclipse.emf.ecore.util.Switch; + import org.eclipse.passage.lic.features.FeatureDescriptor; import org.eclipse.passage.lic.features.FeatureSetDescriptor; import org.eclipse.passage.lic.features.FeatureVersionDescriptor; -import org.eclipse.passage.lic.features.model.api.Feature; -import org.eclipse.passage.lic.features.model.api.FeatureSet; -import org.eclipse.passage.lic.features.model.api.FeatureVersion; + +import org.eclipse.passage.lic.features.model.api.*; + import org.eclipse.passage.lic.features.model.meta.FeaturesPackage; /** * - * - * The Switch for the model's inheritance hierarchy. It supports the call - * {@link #doSwitch(EObject) doSwitch(object)} to invoke the - * caseXXX method for each class of the model, starting with the - * actual class of the object and proceeding up the inheritance hierarchy until - * a non-null result is returned, which is the result of the switch. - * + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the caseXXX method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. * * @see org.eclipse.passage.lic.features.model.meta.FeaturesPackage * @generated @@ -40,7 +42,6 @@ public class FeaturesSwitch extends Switch { /** * The cached model package * - * * * @generated */ @@ -49,7 +50,6 @@ public class FeaturesSwitch extends Switch { /** * Creates an instance of the switch. * - * * * @generated */ @@ -62,7 +62,6 @@ public FeaturesSwitch() { /** * Checks whether this is a switch for the given package. * - * * * @param ePackage the package in question. * @return whether this is a switch for the given package. @@ -76,7 +75,6 @@ protected boolean isSwitchFor(EPackage ePackage) { /** * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. * - * * * @return the first non-null result returned by a caseXXX call. * @generated @@ -140,10 +138,8 @@ protected T doSwitch(int classifierID, EObject theEObject) { /** * Returns the result of interpreting the object as an instance of 'Feature Set Descriptor'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch. - * + * 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 'Feature Set Descriptor'. @@ -157,10 +153,8 @@ public T caseFeatureSetDescriptor(FeatureSetDescriptor object) { /** * Returns the result of interpreting the object as an instance of 'Feature Descriptor'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch. - * + * 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 'Feature Descriptor'. @@ -174,10 +168,8 @@ public T caseFeatureDescriptor(FeatureDescriptor object) { /** * Returns the result of interpreting the object as an instance of 'Feature Version Descriptor'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch. - * + * 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 'Feature Version Descriptor'. @@ -191,10 +183,8 @@ public T caseFeatureVersionDescriptor(FeatureVersionDescriptor object) { /** * Returns the result of interpreting the object as an instance of 'Feature Set'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch. - * + * 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 'Feature Set'. @@ -208,10 +198,8 @@ public T caseFeatureSet(FeatureSet object) { /** * Returns the result of interpreting the object as an instance of 'Feature'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch. - * + * 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 'Feature'. @@ -225,10 +213,8 @@ public T caseFeature(Feature object) { /** * Returns the result of interpreting the object as an instance of 'Feature Version'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch. - * + * 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 'Feature Version'. @@ -242,10 +228,8 @@ public T caseFeatureVersion(FeatureVersion object) { /** * Returns the result of interpreting the object as an instance of 'EObject'. * - * - * This implementation returns null; returning a non-null result will terminate - * the switch, but this is the last case anyway. - * + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. * * @param object the target of the switch. * @return the result of interpreting the object as an instance of 'EObject'. @@ -257,4 +241,4 @@ public T defaultCase(EObject object) { return null; } -} // FeaturesSwitch +} //FeaturesSwitch diff --git a/bundles/org.eclipse.passage.lic.features.model/src/org/eclipse/passage/lic/internal/features/model/migration/FeaturesResourceHandler.java b/bundles/org.eclipse.passage.lic.features.model/src/org/eclipse/passage/lic/internal/features/model/migration/FeaturesResourceHandler.java index 0a17dd02a..66ae73ab7 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src/org/eclipse/passage/lic/internal/features/model/migration/FeaturesResourceHandler.java +++ b/bundles/org.eclipse.passage.lic.features.model/src/org/eclipse/passage/lic/internal/features/model/migration/FeaturesResourceHandler.java @@ -33,6 +33,7 @@ protected void complete(XMLResource resource) { protected void register() { migrate033(); migrate040(); + migrate050(); } @Override @@ -56,4 +57,10 @@ private void migrate040() { EPackage.Registry.INSTANCE.computeIfAbsent(uri, ns -> delegate); } + private void migrate050() { + String uri = "http://www.eclipse.org/passage/lic/features/0.5.0"; //$NON-NLS-1$ + FeaturesPackage delegate = FeaturesPackage.eINSTANCE; + EPackage.Registry.INSTANCE.computeIfAbsent(uri, ns -> delegate); + } + } diff --git a/bundles/org.eclipse.passage.lic.features/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features/META-INF/MANIFEST.MF index 65965f47c..48e22511b 100644 --- a/bundles/org.eclipse.passage.lic.features/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.features/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.features Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.features -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright diff --git a/bundles/org.eclipse.passage.lic.features/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.features/OSGI-INF/l10n/bundle.properties index 7f32329de..2c017b80e 100644 --- a/bundles/org.eclipse.passage.lic.features/OSGI-INF/l10n/bundle.properties +++ b/bundles/org.eclipse.passage.lic.features/OSGI-INF/l10n/bundle.properties @@ -1,6 +1,6 @@ #Properties file for org.eclipse.passage.lic.features ############################################################################### -# Copyright (c) 2018, 2020 ArSysOp and others +# Copyright (c) 2018, 2021 ArSysOp and others # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -14,7 +14,7 @@ Bundle-Name = Passage LIC Features Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 2020 ArSysOp and others.\n\ +Bundle-Copyright = Copyright (c) 2018, 2021 ArSysOp and others.\n\ \n\ This program and the accompanying materials are made\n\ available under the terms of the Eclipse Public License 2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.features/src/org/eclipse/passage/lic/features/FeatureVersionDescriptor.java b/bundles/org.eclipse.passage.lic.features/src/org/eclipse/passage/lic/features/FeatureVersionDescriptor.java index 585e615bc..803ebb865 100644 --- a/bundles/org.eclipse.passage.lic.features/src/org/eclipse/passage/lic/features/FeatureVersionDescriptor.java +++ b/bundles/org.eclipse.passage.lic.features/src/org/eclipse/passage/lic/features/FeatureVersionDescriptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * 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 @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.features; +import java.util.List; + /** *

    * The "Feature Version" is a state of your "Feature" @@ -41,4 +43,9 @@ public interface FeatureVersionDescriptor { FeatureDescriptor getFeature(); + /** + * @since 2.0 + */ + List getAgreements(); + } From 94b0855ee8e86c4d3dd69c84039539b37fd63b9b Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Tue, 3 Aug 2021 12:13:52 +0300 Subject: [PATCH 2/2] Bug 575160 Attach LAs to FeatureVersion - FeatureVersion is extended with agreements:List collection to contain associated license agreement identifiers - `features` ecore and all related bundles upgraded versions to 2.0.0 --- .../.settings/.api_filters | 21 +++++++++++++++++++ .../model/impl/FeatureVersionImpl.java | 4 ++-- .../model/impl/FeaturesPackageImpl.java | 2 +- .../features/model/meta/FeaturesPackage.java | 4 ++-- .../util/FeaturesResourceFactoryImpl.java | 4 ++-- .../model/util/FeaturesResourceImpl.java | 4 ++-- 6 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 bundles/org.eclipse.passage.lic.features.model/.settings/.api_filters diff --git a/bundles/org.eclipse.passage.lic.features.model/.settings/.api_filters b/bundles/org.eclipse.passage.lic.features.model/.settings/.api_filters new file mode 100644 index 000000000..2d5406edb --- /dev/null +++ b/bundles/org.eclipse.passage.lic.features.model/.settings/.api_filters @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java index 86a0fd106..19a9effd6 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeatureVersionImpl.java @@ -96,7 +96,7 @@ public class FeatureVersionImpl extends MinimalEObjectImpl.Container implements * * * @see #getAgreements() - * @since 1.1 + * @since 2.0 * @generated * @ordered */ @@ -225,7 +225,7 @@ public void setNews(String newNews) { /** * * - * @since 1.1 + * @since 2.0 * @generated */ @Override diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java index 8206586a7..9b3d84085 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/impl/FeaturesPackageImpl.java @@ -336,7 +336,7 @@ public EAttribute getFeatureVersion_News() { /** * * - * @since 1.1 + * @since 2.0 * @generated */ @Override diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java index 60a049bf3..44dae59be 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/meta/FeaturesPackage.java @@ -337,7 +337,7 @@ public interface FeaturesPackage extends EPackage { * The feature id for the 'Agreements' attribute list. * * - * @since 1.1 + * @since 2.0 * @generated * @ordered */ @@ -574,7 +574,7 @@ public interface FeaturesPackage extends EPackage { * @return the meta object for the attribute list 'Agreements'. * @see org.eclipse.passage.lic.features.model.api.FeatureVersion#getAgreements() * @see #getFeatureVersion() - * @since 1.1 + * @since 2.0 * @generated */ EAttribute getFeatureVersion_Agreements(); diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java index 7fb24ba43..9d6fb8f3a 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceFactoryImpl.java @@ -21,8 +21,8 @@ * package. * * @see org.eclipse.passage.lic.features.model.util.FeaturesResourceImpl - * @generated - * @since 2.0 + * @generated NOT + * @since 1.1 */ public class FeaturesResourceFactoryImpl extends ResourceFactoryImpl { /** diff --git a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java index 8ee9e1d34..7743576f3 100644 --- a/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java +++ b/bundles/org.eclipse.passage.lic.features.model/src-gen/org/eclipse/passage/lic/features/model/util/FeaturesResourceImpl.java @@ -23,8 +23,8 @@ * * * @see org.eclipse.passage.lic.features.model.util.FeaturesResourceFactoryImpl - * @generated - * @since 2.0 + * @generated NOT + * @since 1.1 */ public class FeaturesResourceImpl extends XMIResourceImpl { /**