From 84f93adf6e4e747285ee121f849142613a9aad0d Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Apr 2021 11:12:27 +0300 Subject: [PATCH 1/2] Bug 572650 upgrade `licenses` domain model Invite 'descriptors' for floating license model part: ProductRef Signed-off-by: eparovyshnaya --- .../model/licenses.ecore | 4 +- .../META-INF/MANIFEST.MF | 10 ++- .../model/licenses..genmodel | 1 + .../lic/licenses/model/api/ProductRef.java | 7 +- .../model/impl/LicensesPackageImpl.java | 24 ++++++ .../licenses/model/meta/LicensesPackage.java | 81 ++++++++++++++----- .../model/util/LicensesAdapterFactory.java | 20 +++++ .../licenses/model/util/LicensesSwitch.java | 25 ++++++ .../META-INF/MANIFEST.MF | 2 +- .../lic/licenses/ProductRefDescriptor.java | 24 ++++++ 10 files changed, 170 insertions(+), 28 deletions(-) create mode 100644 bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ProductRefDescriptor.java 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 0054c0e02..b54b761f2 100644 --- a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore +++ b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore @@ -10,6 +10,8 @@ abstract="true" interface="true"/> + @@ -94,7 +96,7 @@ - + + diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ProductRef.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ProductRef.java index a18820a9f..3d324d6a8 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ProductRef.java +++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/ProductRef.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.ProductRefDescriptor; /** * @@ -28,10 +29,10 @@ * * * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getProductRef() - * @model + * @model superTypes="org.eclipse.passage.lic.licenses.model.api.ProductRefDescriptor" * @generated */ -public interface ProductRef extends EObject { +public interface ProductRef extends EObject, ProductRefDescriptor { /** * Returns the value of the 'Product' attribute. * @@ -42,6 +43,7 @@ public interface ProductRef extends EObject { * @model required="true" * @generated */ + @Override String getProduct(); /** @@ -64,6 +66,7 @@ public interface ProductRef extends EObject { * @model required="true" * @generated */ + @Override String getVersion(); /** 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 a736daca1..da2b12754 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 @@ -21,6 +21,7 @@ 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.ProductRefDescriptor; 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; @@ -80,6 +81,13 @@ public class LicensesPackageImpl extends EPackageImpl implements LicensesPackage */ private EClass licenseGrantDescriptorEClass = null; + /** + * + * + * @generated + */ + private EClass productRefDescriptorEClass = null; + /** * * @@ -310,6 +318,16 @@ public EClass getLicenseGrantDescriptor() { return licenseGrantDescriptorEClass; } + /** + * + * + * @generated + */ + @Override + public EClass getProductRefDescriptor() { + return productRefDescriptorEClass; + } + /** * * @@ -1229,6 +1247,8 @@ public void createPackageContents() { licenseGrantDescriptorEClass = createEClass(LICENSE_GRANT_DESCRIPTOR); + productRefDescriptorEClass = createEClass(PRODUCT_REF_DESCRIPTOR); + licensePlanEClass = createEClass(LICENSE_PLAN); createEAttribute(licensePlanEClass, LICENSE_PLAN__IDENTIFIER); createEAttribute(licensePlanEClass, LICENSE_PLAN__NAME); @@ -1368,6 +1388,7 @@ public void initializePackageContents() { licensePlanFeatureEClass.getESuperTypes().add(this.getLicensePlanFeatureDescriptor()); licensePackEClass.getESuperTypes().add(this.getLicensePackDescriptor()); licenseGrantEClass.getESuperTypes().add(this.getLicenseGrantDescriptor()); + productRefEClass.getESuperTypes().add(this.getProductRefDescriptor()); validityPeriodClosedEClass.getESuperTypes().add(this.getValidityPeriod()); // Initialize classes, features, and operations; add parameters @@ -1383,6 +1404,9 @@ public void initializePackageContents() { initEClass(licenseGrantDescriptorEClass, LicenseGrantDescriptor.class, "LicenseGrantDescriptor", IS_ABSTRACT, //$NON-NLS-1$ IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); + initEClass(productRefDescriptorEClass, ProductRefDescriptor.class, "ProductRefDescriptor", IS_ABSTRACT, //$NON-NLS-1$ + IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); + 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 efad0cbd7..8c65c56ca 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 @@ -189,6 +189,34 @@ public interface LicensesPackage extends EPackage { */ int LICENSE_GRANT_DESCRIPTOR_OPERATION_COUNT = 0; + /** + * The meta object id for the '{@link org.eclipse.passage.lic.licenses.ProductRefDescriptor Product Ref Descriptor}' class. + * + * + * @see org.eclipse.passage.lic.licenses.ProductRefDescriptor + * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getProductRefDescriptor() + * @generated + */ + int PRODUCT_REF_DESCRIPTOR = 4; + + /** + * The number of structural features of the 'Product Ref Descriptor' class. + * + * + * @generated + * @ordered + */ + int PRODUCT_REF_DESCRIPTOR_FEATURE_COUNT = 0; + + /** + * The number of operations of the 'Product Ref Descriptor' class. + * + * + * @generated + * @ordered + */ + int PRODUCT_REF_DESCRIPTOR_OPERATION_COUNT = 0; + /** * The meta object id for the '{@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl License Plan}' class. * @@ -197,7 +225,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicensePlan() * @generated */ - int LICENSE_PLAN = 4; + int LICENSE_PLAN = 5; /** * The feature id for the 'Identifier' attribute. @@ -279,7 +307,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicensePlanFeature() * @generated */ - int LICENSE_PLAN_FEATURE = 5; + int LICENSE_PLAN_FEATURE = 6; /** * The feature id for the 'Feature Identifier' attribute. @@ -344,7 +372,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicensePack() * @generated */ - int LICENSE_PACK = 6; + int LICENSE_PACK = 7; /** * The feature id for the 'Identifier' attribute. @@ -462,7 +490,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicenseGrant() * @generated */ - int LICENSE_GRANT = 7; + int LICENSE_GRANT = 8; /** * The feature id for the 'Identifier' attribute. @@ -592,7 +620,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingLicensePack() * @generated */ - int FLOATING_LICENSE_PACK = 8; + int FLOATING_LICENSE_PACK = 9; /** * The feature id for the 'License' containment reference. @@ -656,7 +684,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getLicenseRequisites() * @generated */ - int LICENSE_REQUISITES = 9; + int LICENSE_REQUISITES = 10; /** * The feature id for the 'Identifier' attribute. @@ -738,7 +766,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getProductRef() * @generated */ - int PRODUCT_REF = 10; + int PRODUCT_REF = 11; /** * The feature id for the 'Product' attribute. @@ -747,7 +775,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF__PRODUCT = 0; + int PRODUCT_REF__PRODUCT = PRODUCT_REF_DESCRIPTOR_FEATURE_COUNT + 0; /** * The feature id for the 'Version' attribute. @@ -756,7 +784,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF__VERSION = 1; + int PRODUCT_REF__VERSION = PRODUCT_REF_DESCRIPTOR_FEATURE_COUNT + 1; /** * The number of structural features of the 'Product Ref' class. @@ -765,7 +793,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF_FEATURE_COUNT = 2; + int PRODUCT_REF_FEATURE_COUNT = PRODUCT_REF_DESCRIPTOR_FEATURE_COUNT + 2; /** * The number of operations of the 'Product Ref' class. @@ -774,7 +802,7 @@ public interface LicensesPackage extends EPackage { * @generated * @ordered */ - int PRODUCT_REF_OPERATION_COUNT = 0; + int PRODUCT_REF_OPERATION_COUNT = PRODUCT_REF_DESCRIPTOR_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.passage.lic.licenses.model.impl.FloatingServerImpl Floating Server}' class. @@ -784,7 +812,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingServer() * @generated */ - int FLOATING_SERVER = 11; + int FLOATING_SERVER = 12; /** * The feature id for the 'Identifier' attribute. @@ -830,7 +858,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getUserGrant() * @generated */ - int USER_GRANT = 12; + int USER_GRANT = 13; /** * The feature id for the 'User' attribute. @@ -876,7 +904,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFeatureGrant() * @generated */ - int FEATURE_GRANT = 13; + int FEATURE_GRANT = 14; /** * The feature id for the 'Identifier' attribute. @@ -967,7 +995,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getValidityPeriod() * @generated */ - int VALIDITY_PERIOD = 14; + int VALIDITY_PERIOD = 15; /** * The number of structural features of the 'Validity Period' class. @@ -995,7 +1023,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getValidityPeriodClosed() * @generated */ - int VALIDITY_PERIOD_CLOSED = 15; + int VALIDITY_PERIOD_CLOSED = 16; /** * The feature id for the 'From' attribute. @@ -1041,7 +1069,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getEvaluationInstructions() * @generated */ - int EVALUATION_INSTRUCTIONS = 16; + int EVALUATION_INSTRUCTIONS = 17; /** * The feature id for the 'Type' attribute. @@ -1087,7 +1115,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getVersionMatch() * @generated */ - int VERSION_MATCH = 17; + int VERSION_MATCH = 18; /** * The feature id for the 'Version' attribute. @@ -1133,7 +1161,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingLicenseAccess() * @generated */ - int FLOATING_LICENSE_ACCESS = 18; + int FLOATING_LICENSE_ACCESS = 19; /** * The feature id for the 'User' attribute. @@ -1188,7 +1216,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getFloatingServerConnection() * @generated */ - int FLOATING_SERVER_CONNECTION = 19; + int FLOATING_SERVER_CONNECTION = 20; /** * The feature id for the 'Ip' attribute. @@ -1243,7 +1271,7 @@ public interface LicensesPackage extends EPackage { * @see org.eclipse.passage.lic.licenses.model.impl.LicensesPackageImpl#getGrantAcqisition() * @generated */ - int GRANT_ACQISITION = 20; + int GRANT_ACQISITION = 21; /** * The feature id for the 'Identifier' attribute. @@ -1354,6 +1382,17 @@ public interface LicensesPackage extends EPackage { */ EClass getLicenseGrantDescriptor(); + /** + * Returns the meta object for class '{@link org.eclipse.passage.lic.licenses.ProductRefDescriptor Product Ref Descriptor}'. + * + * + * @return the meta object for class 'Product Ref Descriptor'. + * @see org.eclipse.passage.lic.licenses.ProductRefDescriptor + * @model instanceClass="org.eclipse.passage.lic.licenses.ProductRefDescriptor" + * @generated + */ + EClass getProductRefDescriptor(); + /** * 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 8a0e8735d..c4d0cc4ca 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 @@ -20,6 +20,7 @@ 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.ProductRefDescriptor; 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; @@ -108,6 +109,11 @@ public Adapter caseLicenseGrantDescriptor(LicenseGrantDescriptor object) { return createLicenseGrantDescriptorAdapter(); } + @Override + public Adapter caseProductRefDescriptor(ProductRefDescriptor object) { + return createProductRefDescriptorAdapter(); + } + @Override public Adapter caseLicensePlan(LicensePlan object) { return createLicensePlanAdapter(); @@ -275,6 +281,20 @@ public Adapter createLicenseGrantDescriptorAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.passage.lic.licenses.ProductRefDescriptor Product Ref 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.ProductRefDescriptor + * @generated + */ + public Adapter createProductRefDescriptorAdapter() { + 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 ea58988c2..70ac8c789 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 @@ -19,6 +19,7 @@ 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.ProductRefDescriptor; 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; @@ -113,6 +114,13 @@ protected T doSwitch(int classifierID, EObject theEObject) { result = defaultCase(theEObject); return result; } + case LicensesPackage.PRODUCT_REF_DESCRIPTOR: { + ProductRefDescriptor productRefDescriptor = (ProductRefDescriptor) theEObject; + T result = caseProductRefDescriptor(productRefDescriptor); + if (result == null) + result = defaultCase(theEObject); + return result; + } case LicensesPackage.LICENSE_PLAN: { LicensePlan licensePlan = (LicensePlan) theEObject; T result = caseLicensePlan(licensePlan); @@ -166,6 +174,8 @@ protected T doSwitch(int classifierID, EObject theEObject) { case LicensesPackage.PRODUCT_REF: { ProductRef productRef = (ProductRef) theEObject; T result = caseProductRef(productRef); + if (result == null) + result = caseProductRefDescriptor(productRef); if (result == null) result = defaultCase(theEObject); return result; @@ -311,6 +321,21 @@ public T caseLicenseGrantDescriptor(LicenseGrantDescriptor object) { return null; } + /** + * 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. + * + * @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) + * @generated + */ + public T caseProductRefDescriptor(ProductRefDescriptor object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'License Plan'. * diff --git a/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF index faa1419e7..3145d1634 100644 --- a/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.licenses/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.licenses Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.licenses -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ProductRefDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ProductRefDescriptor.java new file mode 100644 index 000000000..084370397 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/ProductRefDescriptor.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * 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 ProductRefDescriptor { + + String getProduct(); + + String getVersion(); + +} From e1e3f7554dfdd1fea2a75e10805c0f9ff3c34297 Mon Sep 17 00:00:00 2001 From: Elena Parovyshnaia Date: Wed, 14 Apr 2021 11:13:13 +0300 Subject: [PATCH 2/2] Bug 572650 upgrade `licenses` domain model Move emf forms view models from licenses#1.0.0 to 1.1.0 Signed-off-by: eparovyshnaya --- .../viewmodels/LicenseGrant.view | 18 +++++++++--------- .../viewmodels/LicensePack.view | 10 +++++----- .../viewmodels/LicensePlan.view | 8 ++++---- .../viewmodels/LicensePlanFeature.view | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicenseGrant.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicenseGrant.view index 7e66016d0..bea467ee8 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicenseGrant.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicenseGrant.view @@ -1,21 +1,21 @@ - + - + - + - + @@ -24,12 +24,12 @@ - + - + @@ -38,18 +38,18 @@ - + - + - + diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePack.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePack.view index 252a597d6..d56e150e3 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePack.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePack.view @@ -1,24 +1,24 @@ - + - + - + - + - + /org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view index deaf62c2c..c93195087 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlan.view @@ -1,19 +1,19 @@ - + - + - + - + /org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore diff --git a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view index f3d33f295..ba6b25099 100644 --- a/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view +++ b/bundles/org.eclipse.passage.loc.licenses.emfforms/viewmodels/LicensePlanFeature.view @@ -1,19 +1,19 @@ - + - + - + - + /org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore