diff --git a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore index 7464810a0..7cb07b088 100644 --- a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore +++ b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore @@ -12,6 +12,18 @@ abstract="true" interface="true"/> + + + + + @@ -83,7 +95,7 @@ - + - + - + @@ -133,8 +145,9 @@ - - + + + + + + + diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicenseRequisites.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicenseRequisites.java index c3a5b6611..e918b5335 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicenseRequisites.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/FloatingLicenseRequisites.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.licenses.model.api; +import org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor; + /** * * A representation of the model object 'Floating License Requisites'. @@ -25,10 +27,10 @@ * * * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getFloatingLicenseRequisites() - * @model + * @model superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisites org.eclipse.passage.lic.licenses.model.api.FloatingLicenseRequisitesDescriptor" * @generated */ -public interface FloatingLicenseRequisites extends LicenseRequisites { +public interface FloatingLicenseRequisites extends LicenseRequisites, FloatingLicenseRequisitesDescriptor { /** * Returns the value of the 'Company' attribute. * @@ -39,6 +41,7 @@ public interface FloatingLicenseRequisites extends LicenseRequisites { * @model required="true" * @generated */ + @Override String getCompany(); /** diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseRequisites.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseRequisites.java index ef29ec5fa..8776287bf 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseRequisites.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicenseRequisites.java @@ -15,6 +15,7 @@ import java.util.Date; import org.eclipse.emf.ecore.EObject; +import org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor; /** * @@ -33,10 +34,10 @@ * * * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getLicenseRequisites() - * @model abstract="true" + * @model abstract="true" superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisitesDescriptor" * @generated */ -public interface LicenseRequisites extends EObject { +public interface LicenseRequisites extends EObject, LicenseRequisitesDescriptor { /** * Returns the value of the 'Identifier' attribute. * @@ -47,6 +48,7 @@ public interface LicenseRequisites extends EObject { * @model id="true" required="true" * @generated */ + @Override String getIdentifier(); /** @@ -69,6 +71,7 @@ public interface LicenseRequisites extends EObject { * @model required="true" * @generated */ + @Override Date getIssueDate(); /** @@ -91,6 +94,7 @@ public interface LicenseRequisites extends EObject { * @model required="true" * @generated */ + @Override String getPlan(); /** @@ -113,6 +117,7 @@ public interface LicenseRequisites extends EObject { * @model containment="true" required="true" * @generated */ + @Override ProductRef getProduct(); /** @@ -135,6 +140,7 @@ public interface LicenseRequisites extends EObject { * @model containment="true" required="true" * @generated */ + @Override ValidityPeriod getValid(); /** diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/PersonalLicenseRequisites.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/PersonalLicenseRequisites.java index 2c80dfabf..b70dda570 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/PersonalLicenseRequisites.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/PersonalLicenseRequisites.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.passage.lic.licenses.model.api; +import org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor; + /** * * A representation of the model object 'Personal License Requisites'. @@ -25,10 +27,10 @@ * * * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getPersonalLicenseRequisites() - * @model + * @model superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisites org.eclipse.passage.lic.licenses.model.api.PersonalLicenseRequisitesDescriptor" * @generated */ -public interface PersonalLicenseRequisites extends LicenseRequisites { +public interface PersonalLicenseRequisites extends LicenseRequisites, PersonalLicenseRequisitesDescriptor { /** * Returns the value of the 'User' attribute. * @@ -39,6 +41,7 @@ public interface PersonalLicenseRequisites extends LicenseRequisites { * @model required="true" * @generated */ + @Override String getUser(); /** diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriod.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriod.java index 131a73e9f..0460dedc9 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriod.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriod.java @@ -13,6 +13,7 @@ package org.eclipse.passage.lic.licenses.model.api; import org.eclipse.emf.ecore.EObject; +import org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor; /** * @@ -21,8 +22,8 @@ * * * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getValidityPeriod() - * @model interface="true" abstract="true" + * @model interface="true" abstract="true" superTypes="org.eclipse.passage.lic.licenses.model.api.ValidityPeriodDescriptor" * @generated */ -public interface ValidityPeriod extends EObject { +public interface ValidityPeriod extends EObject, ValidityPeriodDescriptor { } // ValidityPeriod diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriodClosed.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriodClosed.java index 4844c47c4..c1b240ab4 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriodClosed.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ValidityPeriodClosed.java @@ -13,6 +13,7 @@ package org.eclipse.passage.lic.licenses.model.api; import java.util.Date; +import org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor; /** * @@ -28,10 +29,10 @@ * * * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getValidityPeriodClosed() - * @model + * @model superTypes="org.eclipse.passage.lic.licenses.model.api.ValidityPeriod org.eclipse.passage.lic.licenses.model.api.ValidityPeriodClosedDescriptor" * @generated */ -public interface ValidityPeriodClosed extends ValidityPeriod { +public interface ValidityPeriodClosed extends ValidityPeriod, ValidityPeriodClosedDescriptor { /** * Returns the value of the 'From' attribute. * @@ -42,6 +43,7 @@ public interface ValidityPeriodClosed extends ValidityPeriod { * @model unique="false" required="true" ordered="false" * @generated */ + @Override Date getFrom(); /** @@ -64,6 +66,7 @@ public interface ValidityPeriodClosed extends ValidityPeriod { * @model unique="false" required="true" ordered="false" * @generated */ + @Override Date getUntil(); /** diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesFactoryImpl.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesFactoryImpl.java index a2be46563..62e9cec75 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesFactoryImpl.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesFactoryImpl.java @@ -43,15 +43,14 @@ * An implementation of the model Factory. * * - * * @generated */ public class LicensesFactoryImpl extends EFactoryImpl implements LicensesFactory { /** - * Creates the default factory implementation. + * Creates the default factory implementation. + * * * - * * @generated */ public static LicensesFactory init() { @@ -68,10 +67,10 @@ public static LicensesFactory init() { } /** - * Creates an instance of the factory. + * Creates an instance of the factory. + * * * - * * @generated */ public LicensesFactoryImpl() { @@ -82,7 +81,6 @@ public LicensesFactoryImpl() { * * * - * * @generated */ @Override @@ -129,7 +127,6 @@ public EObject create(EClass eClass) { /** * - * * @generated */ @Override @@ -140,7 +137,6 @@ public LicensePlan createLicensePlan() { /** * - * * @generated */ @Override @@ -153,7 +149,6 @@ public LicensePlanFeature createLicensePlanFeature() { * * * - * * @generated */ @Override @@ -166,7 +161,6 @@ public LicensePack createLicensePack() { * * * - * * @generated */ @Override @@ -177,7 +171,6 @@ public LicenseGrant createLicenseGrant() { /** * - * * @generated */ @Override @@ -188,7 +181,6 @@ public FloatingLicensePack createFloatingLicensePack() { /** * - * * @generated */ @Override @@ -199,7 +191,6 @@ public PersonalLicenseRequisites createPersonalLicenseRequisites() { /** * - * * @generated */ @Override @@ -210,7 +201,6 @@ public FloatingLicenseRequisites createFloatingLicenseRequisites() { /** * - * * @generated */ @Override @@ -221,7 +211,6 @@ public ProductRef createProductRef() { /** * - * * @generated */ @Override @@ -232,7 +221,6 @@ public FloatingServer createFloatingServer() { /** * - * * @generated */ @Override @@ -243,7 +231,6 @@ public UserGrant createUserGrant() { /** * - * * @generated */ @Override @@ -254,7 +241,6 @@ public FeatureGrant createFeatureGrant() { /** * - * * @generated */ @Override @@ -265,7 +251,6 @@ public ValidityPeriodClosed createValidityPeriodClosed() { /** * - * * @generated */ @Override @@ -276,7 +261,6 @@ public EvaluationInstructions createEvaluationInstructions() { /** * - * * @generated */ @Override @@ -287,7 +271,6 @@ public VersionMatch createVersionMatch() { /** * - * * @generated */ @Override @@ -298,7 +281,6 @@ public FloatingLicenseAccess createFloatingLicenseAccess() { /** * - * * @generated */ @Override @@ -309,7 +291,6 @@ public FloatingServerConnection createFloatingServerConnection() { /** * - * * @generated */ @Override @@ -322,7 +303,6 @@ public GrantAcqisition createGrantAcqisition() { * * * - * * @generated */ @Override @@ -334,7 +314,6 @@ public LicensesPackage getLicensesPackage() { * * * - * * @deprecated * @generated */ diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java index f8d371259..66d29769b 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensesPackageImpl.java @@ -17,11 +17,16 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; +import org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor; import org.eclipse.passage.lic.licenses.LicenseGrantDescriptor; import org.eclipse.passage.lic.licenses.LicensePackDescriptor; import org.eclipse.passage.lic.licenses.LicensePlanDescriptor; import org.eclipse.passage.lic.licenses.LicensePlanFeatureDescriptor; +import org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor; +import org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor; import org.eclipse.passage.lic.licenses.ProductRefDescriptor; +import org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor; +import org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor; import org.eclipse.passage.lic.licenses.model.api.EvaluationInstructions; import org.eclipse.passage.lic.licenses.model.api.FeatureGrant; import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; @@ -90,6 +95,41 @@ public class LicensesPackageImpl extends EPackageImpl implements LicensesPackage */ private EClass productRefDescriptorEClass = null; + /** + * + * + * @generated + */ + private EClass licenseRequisitesDescriptorEClass = null; + + /** + * + * + * @generated + */ + private EClass personalLicenseRequisitesDescriptorEClass = null; + + /** + * + * + * @generated + */ + private EClass floatingLicenseRequisitesDescriptorEClass = null; + + /** + * + * + * @generated + */ + private EClass validityPeriodDescriptorEClass = null; + + /** + * + * + * @generated + */ + private EClass validityPeriodClosedDescriptorEClass = null; + /** * * @@ -344,6 +384,56 @@ public EClass getProductRefDescriptor() { return productRefDescriptorEClass; } + /** + * + * + * @generated + */ + @Override + public EClass getLicenseRequisitesDescriptor() { + return licenseRequisitesDescriptorEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getPersonalLicenseRequisitesDescriptor() { + return personalLicenseRequisitesDescriptorEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getFloatingLicenseRequisitesDescriptor() { + return floatingLicenseRequisitesDescriptorEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getValidityPeriodDescriptor() { + return validityPeriodDescriptorEClass; + } + + /** + * + * + * @generated + */ + @Override + public EClass getValidityPeriodClosedDescriptor() { + return validityPeriodClosedDescriptorEClass; + } + /** * * @@ -1295,6 +1385,16 @@ public void createPackageContents() { productRefDescriptorEClass = createEClass(PRODUCT_REF_DESCRIPTOR); + licenseRequisitesDescriptorEClass = createEClass(LICENSE_REQUISITES_DESCRIPTOR); + + personalLicenseRequisitesDescriptorEClass = createEClass(PERSONAL_LICENSE_REQUISITES_DESCRIPTOR); + + floatingLicenseRequisitesDescriptorEClass = createEClass(FLOATING_LICENSE_REQUISITES_DESCRIPTOR); + + validityPeriodDescriptorEClass = createEClass(VALIDITY_PERIOD_DESCRIPTOR); + + validityPeriodClosedDescriptorEClass = createEClass(VALIDITY_PERIOD_CLOSED_DESCRIPTOR); + licensePlanEClass = createEClass(LICENSE_PLAN); createEAttribute(licensePlanEClass, LICENSE_PLAN__IDENTIFIER); createEAttribute(licensePlanEClass, LICENSE_PLAN__NAME); @@ -1435,14 +1535,21 @@ public void initializePackageContents() { // Set bounds for type parameters // Add supertypes to classes + personalLicenseRequisitesDescriptorEClass.getESuperTypes().add(this.getLicenseRequisitesDescriptor()); + floatingLicenseRequisitesDescriptorEClass.getESuperTypes().add(this.getLicenseRequisitesDescriptor()); licensePlanEClass.getESuperTypes().add(this.getLicensePlanDescriptor()); licensePlanFeatureEClass.getESuperTypes().add(this.getLicensePlanFeatureDescriptor()); licensePackEClass.getESuperTypes().add(this.getLicensePackDescriptor()); licenseGrantEClass.getESuperTypes().add(this.getLicenseGrantDescriptor()); + licenseRequisitesEClass.getESuperTypes().add(this.getLicenseRequisitesDescriptor()); personalLicenseRequisitesEClass.getESuperTypes().add(this.getLicenseRequisites()); + personalLicenseRequisitesEClass.getESuperTypes().add(this.getPersonalLicenseRequisitesDescriptor()); floatingLicenseRequisitesEClass.getESuperTypes().add(this.getLicenseRequisites()); + floatingLicenseRequisitesEClass.getESuperTypes().add(this.getFloatingLicenseRequisitesDescriptor()); productRefEClass.getESuperTypes().add(this.getProductRefDescriptor()); + validityPeriodEClass.getESuperTypes().add(this.getValidityPeriodDescriptor()); validityPeriodClosedEClass.getESuperTypes().add(this.getValidityPeriod()); + validityPeriodClosedEClass.getESuperTypes().add(this.getValidityPeriodClosedDescriptor()); // Initialize classes, features, and operations; add parameters initEClass(licensePlanDescriptorEClass, LicensePlanDescriptor.class, "LicensePlanDescriptor", IS_ABSTRACT, //$NON-NLS-1$ @@ -1460,6 +1567,21 @@ public void initializePackageContents() { initEClass(productRefDescriptorEClass, ProductRefDescriptor.class, "ProductRefDescriptor", IS_ABSTRACT, //$NON-NLS-1$ IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); + initEClass(licenseRequisitesDescriptorEClass, LicenseRequisitesDescriptor.class, "LicenseRequisitesDescriptor", //$NON-NLS-1$ + IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); + + initEClass(personalLicenseRequisitesDescriptorEClass, PersonalLicenseRequisitesDescriptor.class, + "PersonalLicenseRequisitesDescriptor", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(floatingLicenseRequisitesDescriptorEClass, FloatingLicenseRequisitesDescriptor.class, + "FloatingLicenseRequisitesDescriptor", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + + initEClass(validityPeriodDescriptorEClass, ValidityPeriodDescriptor.class, "ValidityPeriodDescriptor", //$NON-NLS-1$ + IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); + + initEClass(validityPeriodClosedDescriptorEClass, ValidityPeriodClosedDescriptor.class, + "ValidityPeriodClosedDescriptor", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEClass(licensePlanEClass, LicensePlan.class, "LicensePlan", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); initEAttribute(getLicensePlan_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, //$NON-NLS-1$ diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java index ae9784d17..5351358ad 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java @@ -217,6 +217,146 @@ public interface LicensesPackage extends EPackage { */ int PRODUCT_REF_DESCRIPTOR_OPERATION_COUNT = 0; + /** + * The meta object id for the '{@link org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor License Requisites Descriptor}' class. + * + * + * @see org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor + * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicenseRequisitesDescriptor() + * @generated + */ + int LICENSE_REQUISITES_DESCRIPTOR = 5; + + /** + * The number of structural features of the 'License Requisites Descriptor' class. + * + * + * @generated + * @ordered + */ + int LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT = 0; + + /** + * The number of operations of the 'License Requisites Descriptor' class. + * + * + * @generated + * @ordered + */ + int LICENSE_REQUISITES_DESCRIPTOR_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor Floating License Requisites Descriptor}' class. + * + * + * @see org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor + * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingLicenseRequisitesDescriptor() + * @generated + */ + int FLOATING_LICENSE_REQUISITES_DESCRIPTOR = 7; + + /** + * The meta object id for the '{@link org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor Personal License Requisites Descriptor}' class. + * + * + * @see org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor + * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getPersonalLicenseRequisitesDescriptor() + * @generated + */ + int PERSONAL_LICENSE_REQUISITES_DESCRIPTOR = 6; + + /** + * The number of structural features of the 'Personal License Requisites Descriptor' class. + * + * + * @generated + * @ordered + */ + int PERSONAL_LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Personal License Requisites Descriptor' class. + * + * + * @generated + * @ordered + */ + int PERSONAL_LICENSE_REQUISITES_DESCRIPTOR_OPERATION_COUNT = LICENSE_REQUISITES_DESCRIPTOR_OPERATION_COUNT + 0; + + /** + * The number of structural features of the 'Floating License Requisites Descriptor' class. + * + * + * @generated + * @ordered + */ + int FLOATING_LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 0; + + /** + * The number of operations of the 'Floating License Requisites Descriptor' class. + * + * + * @generated + * @ordered + */ + int FLOATING_LICENSE_REQUISITES_DESCRIPTOR_OPERATION_COUNT = LICENSE_REQUISITES_DESCRIPTOR_OPERATION_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor Validity Period Descriptor}' class. + * + * + * @see org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor + * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getValidityPeriodDescriptor() + * @generated + */ + int VALIDITY_PERIOD_DESCRIPTOR = 8; + + /** + * The number of structural features of the 'Validity Period Descriptor' class. + * + * + * @generated + * @ordered + */ + int VALIDITY_PERIOD_DESCRIPTOR_FEATURE_COUNT = 0; + + /** + * The number of operations of the 'Validity Period Descriptor' class. + * + * + * @generated + * @ordered + */ + int VALIDITY_PERIOD_DESCRIPTOR_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor Validity Period Closed Descriptor}' class. + * + * + * @see org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor + * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getValidityPeriodClosedDescriptor() + * @generated + */ + int VALIDITY_PERIOD_CLOSED_DESCRIPTOR = 9; + + /** + * The number of structural features of the 'Validity Period Closed Descriptor' class. + * + * + * @generated + * @ordered + */ + int VALIDITY_PERIOD_CLOSED_DESCRIPTOR_FEATURE_COUNT = 0; + + /** + * The number of operations of the 'Validity Period Closed Descriptor' class. + * + * + * @generated + * @ordered + */ + int VALIDITY_PERIOD_CLOSED_DESCRIPTOR_OPERATION_COUNT = 0; + /** * The meta object id for the '{@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl License Plan}' class. * @@ -225,7 +365,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicensePlan() * @generated */ - int LICENSE_PLAN = 5; + int LICENSE_PLAN = 10; /** * The feature id for the 'Identifier' attribute. @@ -307,7 +447,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicensePlanFeature() * @generated */ - int LICENSE_PLAN_FEATURE = 6; + int LICENSE_PLAN_FEATURE = 11; /** * The feature id for the 'Feature Identifier' attribute. @@ -372,7 +512,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicensePack() * @generated */ - int LICENSE_PACK = 7; + int LICENSE_PACK = 12; /** * The feature id for the 'Identifier' attribute. @@ -490,7 +630,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicenseGrant() * @generated */ - int LICENSE_GRANT = 8; + int LICENSE_GRANT = 13; /** * The feature id for the 'Identifier' attribute. @@ -620,7 +760,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingLicensePack() * @generated */ - int FLOATING_LICENSE_PACK = 9; + int FLOATING_LICENSE_PACK = 14; /** * The feature id for the 'License' containment reference. @@ -684,7 +824,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicenseRequisites() * @generated */ - int LICENSE_REQUISITES = 10; + int LICENSE_REQUISITES = 15; /** * The feature id for the 'Identifier' attribute. @@ -693,7 +833,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES__IDENTIFIER = 0; + int LICENSE_REQUISITES__IDENTIFIER = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 0; /** * The feature id for the 'Issue Date' attribute. @@ -702,7 +842,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES__ISSUE_DATE = 1; + int LICENSE_REQUISITES__ISSUE_DATE = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 1; /** * The feature id for the 'Plan' attribute. @@ -711,7 +851,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES__PLAN = 2; + int LICENSE_REQUISITES__PLAN = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 2; /** * The feature id for the 'Product' containment reference. @@ -720,7 +860,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES__PRODUCT = 3; + int LICENSE_REQUISITES__PRODUCT = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 3; /** * The feature id for the 'Valid' containment reference. @@ -729,7 +869,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES__VALID = 4; + int LICENSE_REQUISITES__VALID = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 4; /** * The number of structural features of the 'License Requisites' class. @@ -738,7 +878,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES_FEATURE_COUNT = 5; + int LICENSE_REQUISITES_FEATURE_COUNT = LICENSE_REQUISITES_DESCRIPTOR_FEATURE_COUNT + 5; /** * The number of operations of the 'License Requisites' class. @@ -747,7 +887,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int LICENSE_REQUISITES_OPERATION_COUNT = 0; + int LICENSE_REQUISITES_OPERATION_COUNT = LICENSE_REQUISITES_DESCRIPTOR_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.passage.lic.licenses.model.impl.PersonalLicenseRequisitesImpl Personal License Requisites}' class. @@ -757,7 +897,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getPersonalLicenseRequisites() * @generated */ - int PERSONAL_LICENSE_REQUISITES = 11; + int PERSONAL_LICENSE_REQUISITES = 16; /** * The feature id for the 'Identifier' attribute. @@ -839,7 +979,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingLicenseRequisites() * @generated */ - int FLOATING_LICENSE_REQUISITES = 12; + int FLOATING_LICENSE_REQUISITES = 17; /** * The feature id for the 'Identifier' attribute. @@ -921,7 +1061,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getProductRef() * @generated */ - int PRODUCT_REF = 13; + int PRODUCT_REF = 18; /** * The feature id for the 'Product' attribute. @@ -967,7 +1107,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingServer() * @generated */ - int FLOATING_SERVER = 14; + int FLOATING_SERVER = 19; /** * The feature id for the 'Identifier' attribute. @@ -1013,7 +1153,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getUserGrant() * @generated */ - int USER_GRANT = 15; + int USER_GRANT = 20; /** * The feature id for the 'User' attribute. @@ -1059,7 +1199,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFeatureGrant() * @generated */ - int FEATURE_GRANT = 16; + int FEATURE_GRANT = 21; /** * The feature id for the 'Identifier' attribute. @@ -1150,7 +1290,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getValidityPeriod() * @generated */ - int VALIDITY_PERIOD = 17; + int VALIDITY_PERIOD = 22; /** * The number of structural features of the 'Validity Period' class. @@ -1159,7 +1299,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int VALIDITY_PERIOD_FEATURE_COUNT = 0; + int VALIDITY_PERIOD_FEATURE_COUNT = VALIDITY_PERIOD_DESCRIPTOR_FEATURE_COUNT + 0; /** * The number of operations of the 'Validity Period' class. @@ -1168,7 +1308,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int VALIDITY_PERIOD_OPERATION_COUNT = 0; + int VALIDITY_PERIOD_OPERATION_COUNT = VALIDITY_PERIOD_DESCRIPTOR_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.passage.lic.licenses.model.impl.ValidityPeriodClosedImpl Validity Period Closed}' class. @@ -1178,7 +1318,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getValidityPeriodClosed() * @generated */ - int VALIDITY_PERIOD_CLOSED = 18; + int VALIDITY_PERIOD_CLOSED = 23; /** * The feature id for the 'From' attribute. @@ -1224,7 +1364,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getEvaluationInstructions() * @generated */ - int EVALUATION_INSTRUCTIONS = 19; + int EVALUATION_INSTRUCTIONS = 24; /** * The feature id for the 'Type' attribute. @@ -1270,7 +1410,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getVersionMatch() * @generated */ - int VERSION_MATCH = 20; + int VERSION_MATCH = 25; /** * The feature id for the 'Version' attribute. @@ -1316,7 +1456,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingLicenseAccess() * @generated */ - int FLOATING_LICENSE_ACCESS = 21; + int FLOATING_LICENSE_ACCESS = 26; /** * The feature id for the 'User' attribute. @@ -1371,7 +1511,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingServerConnection() * @generated */ - int FLOATING_SERVER_CONNECTION = 22; + int FLOATING_SERVER_CONNECTION = 27; /** * The feature id for the 'Ip' attribute. @@ -1426,7 +1566,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getGrantAcqisition() * @generated */ - int GRANT_ACQISITION = 23; + int GRANT_ACQISITION = 28; /** * The feature id for the 'Identifier' attribute. @@ -1548,6 +1688,61 @@ public interface LicensesPackage extends EPackage { */ EClass getProductRefDescriptor(); + /** + * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor License Requisites Descriptor}'. + * + * + * @return the meta object for class 'License Requisites Descriptor'. + * @see org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor + * @model instanceClass="org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor" + * @generated + */ + EClass getLicenseRequisitesDescriptor(); + + /** + * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor Personal License Requisites Descriptor}'. + * + * + * @return the meta object for class 'Personal License Requisites Descriptor'. + * @see org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor + * @model instanceClass="org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor" superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisitesDescriptor" + * @generated + */ + EClass getPersonalLicenseRequisitesDescriptor(); + + /** + * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor Floating License Requisites Descriptor}'. + * + * + * @return the meta object for class 'Floating License Requisites Descriptor'. + * @see org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor + * @model instanceClass="org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor" superTypes="org.eclipse.passage.lic.licenses.model.api.LicenseRequisitesDescriptor" + * @generated + */ + EClass getFloatingLicenseRequisitesDescriptor(); + + /** + * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor Validity Period Descriptor}'. + * + * + * @return the meta object for class 'Validity Period Descriptor'. + * @see org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor + * @model instanceClass="org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor" + * @generated + */ + EClass getValidityPeriodDescriptor(); + + /** + * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor Validity Period Closed Descriptor}'. + * + * + * @return the meta object for class 'Validity Period Closed Descriptor'. + * @see org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor + * @model instanceClass="org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor" + * @generated + */ + EClass getValidityPeriodClosedDescriptor(); + /** * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.model.api.LicensePlan License Plan}'. * diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesAdapterFactory.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesAdapterFactory.java index 014c16a04..5020a76a1 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesAdapterFactory.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesAdapterFactory.java @@ -16,11 +16,16 @@ 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.licenses.FloatingLicenseRequisitesDescriptor; import org.eclipse.passage.lic.licenses.LicenseGrantDescriptor; import org.eclipse.passage.lic.licenses.LicensePackDescriptor; import org.eclipse.passage.lic.licenses.LicensePlanDescriptor; import org.eclipse.passage.lic.licenses.LicensePlanFeatureDescriptor; +import org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor; +import org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor; import org.eclipse.passage.lic.licenses.ProductRefDescriptor; +import org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor; +import org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor; import org.eclipse.passage.lic.licenses.model.api.*; import org.eclipse.passage.lic.licenses.model.api.LicenseGrant; import org.eclipse.passage.lic.licenses.model.api.LicensePack; @@ -114,6 +119,31 @@ public Adapter caseProductRefDescriptor(ProductRefDescriptor object) { return createProductRefDescriptorAdapter(); } + @Override + public Adapter caseLicenseRequisitesDescriptor(LicenseRequisitesDescriptor object) { + return createLicenseRequisitesDescriptorAdapter(); + } + + @Override + public Adapter casePersonalLicenseRequisitesDescriptor(PersonalLicenseRequisitesDescriptor object) { + return createPersonalLicenseRequisitesDescriptorAdapter(); + } + + @Override + public Adapter caseFloatingLicenseRequisitesDescriptor(FloatingLicenseRequisitesDescriptor object) { + return createFloatingLicenseRequisitesDescriptorAdapter(); + } + + @Override + public Adapter caseValidityPeriodDescriptor(ValidityPeriodDescriptor object) { + return createValidityPeriodDescriptorAdapter(); + } + + @Override + public Adapter caseValidityPeriodClosedDescriptor(ValidityPeriodClosedDescriptor object) { + return createValidityPeriodClosedDescriptorAdapter(); + } + @Override public Adapter caseLicensePlan(LicensePlan object) { return createLicensePlanAdapter(); @@ -305,6 +335,76 @@ public Adapter createProductRefDescriptorAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor License Requisites 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. + * + * @return the new adapter. + * @see org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor + * @generated + */ + public Adapter createLicenseRequisitesDescriptorAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor Personal License Requisites 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. + * + * @return the new adapter. + * @see org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor + * @generated + */ + public Adapter createPersonalLicenseRequisitesDescriptorAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor Floating License Requisites 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. + * + * @return the new adapter. + * @see org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor + * @generated + */ + public Adapter createFloatingLicenseRequisitesDescriptorAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor Validity Period 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. + * + * @return the new adapter. + * @see org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor + * @generated + */ + public Adapter createValidityPeriodDescriptorAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor Validity Period Closed 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. + * + * @return the new adapter. + * @see org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor + * @generated + */ + public Adapter createValidityPeriodClosedDescriptorAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.model.api.LicensePlan License Plan}'. * diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesSwitch.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesSwitch.java index d65e86173..b3da6aa99 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesSwitch.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/util/LicensesSwitch.java @@ -15,14 +15,35 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; +import org.eclipse.passage.lic.licenses.FloatingLicenseRequisitesDescriptor; import org.eclipse.passage.lic.licenses.LicenseGrantDescriptor; import org.eclipse.passage.lic.licenses.LicensePackDescriptor; import org.eclipse.passage.lic.licenses.LicensePlanDescriptor; import org.eclipse.passage.lic.licenses.LicensePlanFeatureDescriptor; +import org.eclipse.passage.lic.licenses.LicenseRequisitesDescriptor; +import org.eclipse.passage.lic.licenses.PersonalLicenseRequisitesDescriptor; import org.eclipse.passage.lic.licenses.ProductRefDescriptor; -import org.eclipse.passage.lic.licenses.model.api.*; +import org.eclipse.passage.lic.licenses.ValidityPeriodClosedDescriptor; +import org.eclipse.passage.lic.licenses.ValidityPeriodDescriptor; +import org.eclipse.passage.lic.licenses.model.api.EvaluationInstructions; +import org.eclipse.passage.lic.licenses.model.api.FeatureGrant; +import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseAccess; +import org.eclipse.passage.lic.licenses.model.api.FloatingLicensePack; +import org.eclipse.passage.lic.licenses.model.api.FloatingLicenseRequisites; +import org.eclipse.passage.lic.licenses.model.api.FloatingServer; +import org.eclipse.passage.lic.licenses.model.api.FloatingServerConnection; +import org.eclipse.passage.lic.licenses.model.api.GrantAcqisition; import org.eclipse.passage.lic.licenses.model.api.LicenseGrant; import org.eclipse.passage.lic.licenses.model.api.LicensePack; +import org.eclipse.passage.lic.licenses.model.api.LicensePlan; +import org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature; +import org.eclipse.passage.lic.licenses.model.api.LicenseRequisites; +import org.eclipse.passage.lic.licenses.model.api.PersonalLicenseRequisites; +import org.eclipse.passage.lic.licenses.model.api.ProductRef; +import org.eclipse.passage.lic.licenses.model.api.UserGrant; +import org.eclipse.passage.lic.licenses.model.api.ValidityPeriod; +import org.eclipse.passage.lic.licenses.model.api.ValidityPeriodClosed; +import org.eclipse.passage.lic.licenses.model.api.VersionMatch; import org.eclipse.passage.lic.licenses.model.meta.LicensesPackage; /** @@ -63,7 +84,8 @@ public LicensesSwitch() { /** * Checks whether this is a switch for the given package. - * + * * * * @param ePackage the package in question. @@ -121,6 +143,45 @@ protected T doSwitch(int classifierID, EObject theEObject) { result = defaultCase(theEObject); return result; } + case LicensesPackage.LICENSE_REQUISITES_DESCRIPTOR: { + LicenseRequisitesDescriptor licenseRequisitesDescriptor = (LicenseRequisitesDescriptor) theEObject; + T result = caseLicenseRequisitesDescriptor(licenseRequisitesDescriptor); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case LicensesPackage.PERSONAL_LICENSE_REQUISITES_DESCRIPTOR: { + PersonalLicenseRequisitesDescriptor personalLicenseRequisitesDescriptor = (PersonalLicenseRequisitesDescriptor) theEObject; + T result = casePersonalLicenseRequisitesDescriptor(personalLicenseRequisitesDescriptor); + if (result == null) + result = caseLicenseRequisitesDescriptor(personalLicenseRequisitesDescriptor); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case LicensesPackage.FLOATING_LICENSE_REQUISITES_DESCRIPTOR: { + FloatingLicenseRequisitesDescriptor floatingLicenseRequisitesDescriptor = (FloatingLicenseRequisitesDescriptor) theEObject; + T result = caseFloatingLicenseRequisitesDescriptor(floatingLicenseRequisitesDescriptor); + if (result == null) + result = caseLicenseRequisitesDescriptor(floatingLicenseRequisitesDescriptor); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case LicensesPackage.VALIDITY_PERIOD_DESCRIPTOR: { + ValidityPeriodDescriptor validityPeriodDescriptor = (ValidityPeriodDescriptor) theEObject; + T result = caseValidityPeriodDescriptor(validityPeriodDescriptor); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case LicensesPackage.VALIDITY_PERIOD_CLOSED_DESCRIPTOR: { + ValidityPeriodClosedDescriptor validityPeriodClosedDescriptor = (ValidityPeriodClosedDescriptor) theEObject; + T result = caseValidityPeriodClosedDescriptor(validityPeriodClosedDescriptor); + if (result == null) + result = defaultCase(theEObject); + return result; + } case LicensesPackage.LICENSE_PLAN: { LicensePlan licensePlan = (LicensePlan) theEObject; T result = caseLicensePlan(licensePlan); @@ -167,6 +228,8 @@ protected T doSwitch(int classifierID, EObject theEObject) { case LicensesPackage.LICENSE_REQUISITES: { LicenseRequisites licenseRequisites = (LicenseRequisites) theEObject; T result = caseLicenseRequisites(licenseRequisites); + if (result == null) + result = caseLicenseRequisitesDescriptor(licenseRequisites); if (result == null) result = defaultCase(theEObject); return result; @@ -176,6 +239,10 @@ protected T doSwitch(int classifierID, EObject theEObject) { T result = casePersonalLicenseRequisites(personalLicenseRequisites); if (result == null) result = caseLicenseRequisites(personalLicenseRequisites); + if (result == null) + result = casePersonalLicenseRequisitesDescriptor(personalLicenseRequisites); + if (result == null) + result = caseLicenseRequisitesDescriptor(personalLicenseRequisites); if (result == null) result = defaultCase(theEObject); return result; @@ -185,6 +252,10 @@ protected T doSwitch(int classifierID, EObject theEObject) { T result = caseFloatingLicenseRequisites(floatingLicenseRequisites); if (result == null) result = caseLicenseRequisites(floatingLicenseRequisites); + if (result == null) + result = caseFloatingLicenseRequisitesDescriptor(floatingLicenseRequisites); + if (result == null) + result = caseLicenseRequisitesDescriptor(floatingLicenseRequisites); if (result == null) result = defaultCase(theEObject); return result; @@ -222,6 +293,8 @@ protected T doSwitch(int classifierID, EObject theEObject) { case LicensesPackage.VALIDITY_PERIOD: { ValidityPeriod validityPeriod = (ValidityPeriod) theEObject; T result = caseValidityPeriod(validityPeriod); + if (result == null) + result = caseValidityPeriodDescriptor(validityPeriod); if (result == null) result = defaultCase(theEObject); return result; @@ -231,6 +304,10 @@ protected T doSwitch(int classifierID, EObject theEObject) { T result = caseValidityPeriodClosed(validityPeriodClosed); if (result == null) result = caseValidityPeriod(validityPeriodClosed); + if (result == null) + result = caseValidityPeriodClosedDescriptor(validityPeriodClosed); + if (result == null) + result = caseValidityPeriodDescriptor(validityPeriodClosed); if (result == null) result = defaultCase(theEObject); return result; @@ -277,10 +354,9 @@ protected T doSwitch(int classifierID, EObject theEObject) { /** * Returns the result of interpreting the object as an instance of 'License Plan 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 'License Plan Descriptor'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -292,10 +368,9 @@ public T caseLicensePlanDescriptor(LicensePlanDescriptor object) { /** * Returns the result of interpreting the object as an instance of 'License Plan 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 'License Plan Feature Descriptor'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -341,10 +416,9 @@ public T caseLicenseGrantDescriptor(LicenseGrantDescriptor object) { /** * Returns the result of interpreting the object as an instance of 'Product Ref 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 'Product Ref Descriptor'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -354,12 +428,80 @@ public T caseProductRefDescriptor(ProductRefDescriptor object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'License Requisites Descriptor'. + * 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 'License Requisites Descriptor'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseLicenseRequisitesDescriptor(LicenseRequisitesDescriptor object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Personal License Requisites Descriptor'. + * 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 'Personal License Requisites Descriptor'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T casePersonalLicenseRequisitesDescriptor(PersonalLicenseRequisitesDescriptor object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Floating License Requisites Descriptor'. + * 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 'Floating License Requisites Descriptor'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseFloatingLicenseRequisitesDescriptor(FloatingLicenseRequisitesDescriptor object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Validity Period Descriptor'. + * 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 'Validity Period Descriptor'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseValidityPeriodDescriptor(ValidityPeriodDescriptor object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Validity Period Closed Descriptor'. + * 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 'Validity Period Closed Descriptor'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseValidityPeriodClosedDescriptor(ValidityPeriodClosedDescriptor object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'License Plan'. - * - * 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 'License Plan'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -371,10 +513,8 @@ public T caseLicensePlan(LicensePlan object) { /** * Returns the result of interpreting the object as an instance of 'License Plan 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 'License Plan Feature'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -420,10 +560,8 @@ public T caseLicenseGrant(LicenseGrant object) { /** * Returns the result of interpreting the object as an instance of 'Floating License Pack'. - * - * 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 'Floating License Pack'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -435,10 +573,8 @@ public T caseFloatingLicensePack(FloatingLicensePack object) { /** * Returns the result of interpreting the object as an instance of 'License Requisites'. - * - * 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 'License Requisites'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -450,10 +586,9 @@ public T caseLicenseRequisites(LicenseRequisites object) { /** * Returns the result of interpreting the object as an instance of 'Personal License Requisites'. - * - * 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 'Personal License Requisites'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -465,10 +600,9 @@ public T casePersonalLicenseRequisites(PersonalLicenseRequisites object) { /** * Returns the result of interpreting the object as an instance of 'Floating License Requisites'. - * - * 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 'Floating License Requisites'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -480,10 +614,8 @@ public T caseFloatingLicenseRequisites(FloatingLicenseRequisites object) { /** * Returns the result of interpreting the object as an instance of 'Product Ref'. - * - * 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 'Product Ref'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -495,10 +627,8 @@ public T caseProductRef(ProductRef object) { /** * Returns the result of interpreting the object as an instance of 'Floating Server'. - * - * 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 'Floating Server'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -510,10 +640,8 @@ public T caseFloatingServer(FloatingServer object) { /** * Returns the result of interpreting the object as an instance of 'User Grant'. - * - * 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 'User Grant'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -525,10 +653,8 @@ public T caseUserGrant(UserGrant object) { /** * Returns the result of interpreting the object as an instance of 'Feature Grant'. - * - * 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 Grant'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -540,10 +666,8 @@ public T caseFeatureGrant(FeatureGrant object) { /** * Returns the result of interpreting the object as an instance of 'Validity Period'. - * - * 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 'Validity Period'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -555,10 +679,9 @@ public T caseValidityPeriod(ValidityPeriod object) { /** * Returns the result of interpreting the object as an instance of 'Validity Period Closed'. - * - * 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 'Validity Period Closed'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -570,10 +693,9 @@ public T caseValidityPeriodClosed(ValidityPeriodClosed object) { /** * Returns the result of interpreting the object as an instance of 'Evaluation Instructions'. - * - * 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 'Evaluation Instructions'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -585,10 +707,8 @@ public T caseEvaluationInstructions(EvaluationInstructions object) { /** * Returns the result of interpreting the object as an instance of 'Version Match'. - * - * 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 'Version Match'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -600,10 +720,9 @@ public T caseVersionMatch(VersionMatch object) { /** * Returns the result of interpreting the object as an instance of 'Floating License Access'. - * - * 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 'Floating License Access'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -615,10 +734,9 @@ public T caseFloatingLicenseAccess(FloatingLicenseAccess object) { /** * Returns the result of interpreting the object as an instance of 'Floating Server Connection'. - * - * 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 'Floating Server Connection'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) @@ -630,10 +748,8 @@ public T caseFloatingServerConnection(FloatingServerConnection object) { /** * Returns the result of interpreting the object as an instance of 'Grant Acqisition'. - * - * 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 'Grant Acqisition'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/FloatingLicenseRequisitesDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/FloatingLicenseRequisitesDescriptor.java new file mode 100644 index 000000000..9ffe44d72 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/FloatingLicenseRequisitesDescriptor.java @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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.licenses; + +/** + * @since 1.1 + */ +public interface FloatingLicenseRequisitesDescriptor extends LicenseRequisitesDescriptor { + + String getCompany(); + +} diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicenseRequisitesDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicenseRequisitesDescriptor.java new file mode 100644 index 000000000..8fc8c8f69 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicenseRequisitesDescriptor.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * 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.licenses; + +import java.util.Date; + +/** + * @since 1.1 + */ + +public interface LicenseRequisitesDescriptor { + + String getIdentifier(); + + Date getIssueDate(); + + String getPlan(); + + ProductRefDescriptor getProduct(); + + ValidityPeriodDescriptor getValid(); + +} diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/PersonalLicenseRequisitesDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/PersonalLicenseRequisitesDescriptor.java new file mode 100644 index 000000000..aac4d803b --- /dev/null +++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/PersonalLicenseRequisitesDescriptor.java @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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.licenses; + +/** + * @since 1.1 + */ +public interface PersonalLicenseRequisitesDescriptor extends LicenseRequisitesDescriptor { + + String getUser(); + +} diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ValidityPeriodClosedDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ValidityPeriodClosedDescriptor.java new file mode 100644 index 000000000..fd5e143e1 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ValidityPeriodClosedDescriptor.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.licenses; + +import java.util.Date; + +/** + * @since 1.1 + */ +public interface ValidityPeriodClosedDescriptor extends ValidityPeriodDescriptor { + + Date getFrom(); + + Date getUntil(); + +} diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ValidityPeriodDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ValidityPeriodDescriptor.java new file mode 100644 index 000000000..ba89757a2 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ValidityPeriodDescriptor.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * 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.licenses; + +/** + * @since 1.1 + */ +public interface ValidityPeriodDescriptor { + +}