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 d463419ce..0e28bcd12 100644
--- a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
+++ b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
@@ -253,6 +253,12 @@
iD="true"/>
+
+
+
+
+
diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
index a0a9fc74b..fc72f8872 100644
--- a/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
+++ b/bundles/org.eclipse.passage.lic.licenses.edit/plugin.properties
@@ -208,3 +208,4 @@ _UI_AgreementData_hash_feature = Hash
_UI_AgreementData_content_feature = Content
_UI_LicenseRequisites_agreements_feature = Agreements
_UI_AgreementData_contentType_feature = Content Type
+_UI_LicensePlan_agreements_feature = Agreements
diff --git a/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanItemProvider.java b/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanItemProvider.java
index a53951d35..f90bfe1fb 100644
--- a/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanItemProvider.java
+++ b/bundles/org.eclipse.passage.lic.licenses.edit/src-gen/org/eclipse/passage/lic/licenses/edit/providers/LicensePlanItemProvider.java
@@ -66,6 +66,7 @@ public List getPropertyDescriptors(Object object) {
addIdentifierPropertyDescriptor(object);
addNamePropertyDescriptor(object);
addDescriptionPropertyDescriptor(object);
+ addAgreementsPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -118,6 +119,23 @@ protected void addDescriptionPropertyDescriptor(Object object) {
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
+ /**
+ * This adds a property descriptor for the Agreements feature.
+ *
+ *
+ * @since 2.1
+ * @generated
+ */
+ protected void addAgreementsPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_LicensePlan_agreements_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_LicensePlan_agreements_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_LicensePlan_type"), //$NON-NLS-1$
+ LicensesPackage.eINSTANCE.getLicensePlan_Agreements(), true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ }
+
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
@@ -209,6 +227,7 @@ public void notifyChanged(Notification notification) {
case LicensesPackage.LICENSE_PLAN__IDENTIFIER:
case LicensesPackage.LICENSE_PLAN__NAME:
case LicensesPackage.LICENSE_PLAN__DESCRIPTION:
+ case LicensesPackage.LICENSE_PLAN__AGREEMENTS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
case LicensesPackage.LICENSE_PLAN__FEATURES:
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/model/licenses.genmodel b/bundles/org.eclipse.passage.lic.licenses.model/model/licenses.genmodel
index 6ee346211..1314ddc23 100644
--- a/bundles/org.eclipse.passage.lic.licenses.model/model/licenses.genmodel
+++ b/bundles/org.eclipse.passage.lic.licenses.model/model/licenses.genmodel
@@ -105,6 +105,7 @@
+
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePlan.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePlan.java
index a61711d51..de8b55330 100644
--- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePlan.java
+++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/api/LicensePlan.java
@@ -30,6 +30,7 @@
* {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getIdentifier Identifier}
* {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getName Name}
* {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getDescription Description}
+ * {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getAgreements Agreements}
* {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getFeatures Features}
* {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getPersonal Personal}
* {@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getFloating Floating}
@@ -109,6 +110,22 @@ public interface LicensePlan extends EObject, LicensePlanDescriptor {
*/
void setDescription(String value);
+ /**
+ * Returns the value of the 'Agreements' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ *
+ *
+ *
+ * @since 2.1
+ *
+ * @return the value of the 'Agreements' attribute list.
+ * @see org.eclipse.passage.lic.licenses.model.meta.LicensesPackage#getLicensePlan_Agreements()
+ * @model
+ * @generated
+ */
+ @Override
+ EList getAgreements();
+
/**
* Returns the value of the 'Features' containment reference list.
* The list contents are of type {@link org.eclipse.passage.lic.licenses.model.api.LicensePlanFeature}.
diff --git a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePlanImpl.java b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePlanImpl.java
index 8d6892e25..ffb03184e 100644
--- a/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePlanImpl.java
+++ b/bundles/org.eclipse.passage.lic.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/impl/LicensePlanImpl.java
@@ -26,6 +26,7 @@
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.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -47,6 +48,7 @@
* {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getIdentifier Identifier}
* {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getName Name}
* {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getDescription Description}
+ * {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getAgreements Agreements}
* {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getFeatures Features}
* {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getPersonal Personal}
* {@link org.eclipse.passage.lic.licenses.model.impl.LicensePlanImpl#getFloating Floating}
@@ -115,6 +117,17 @@ public class LicensePlanImpl extends MinimalEObjectImpl.Container implements Lic
*/
private String description = DESCRIPTION_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getAgreements() Agreements}' attribute list.
+ *
+ *
+ * @see #getAgreements()
+ * @since 2.1
+ * @generated
+ * @ordered
+ */
+ protected EList agreements;
+
/**
* The cached value of the '{@link #getFeatures() Features}' containment reference list.
*
@@ -241,6 +254,20 @@ public void setDescription(String newDescription) {
}
}
+ /**
+ *
+ *
+ * @since 2.1
+ * @generated
+ */
+ @Override
+ public EList getAgreements() {
+ if (agreements == null) {
+ agreements = new EDataTypeUniqueEList(String.class, this, LicensesPackage.LICENSE_PLAN__AGREEMENTS);
+ }
+ return agreements;
+ }
+
/**
*
*
@@ -335,6 +362,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
return getName();
case LicensesPackage.LICENSE_PLAN__DESCRIPTION:
return getDescription();
+ case LicensesPackage.LICENSE_PLAN__AGREEMENTS:
+ return getAgreements();
case LicensesPackage.LICENSE_PLAN__FEATURES:
return getFeatures();
case LicensesPackage.LICENSE_PLAN__PERSONAL:
@@ -364,6 +393,10 @@ public void eSet(int featureID, Object newValue) {
case LicensesPackage.LICENSE_PLAN__DESCRIPTION:
setDescription((String) newValue);
return;
+ case LicensesPackage.LICENSE_PLAN__AGREEMENTS:
+ getAgreements().clear();
+ getAgreements().addAll((Collection extends String>) newValue);
+ return;
case LicensesPackage.LICENSE_PLAN__FEATURES:
getFeatures().clear();
getFeatures().addAll((Collection extends LicensePlanFeature>) newValue);
@@ -399,6 +432,9 @@ public void eUnset(int featureID) {
case LicensesPackage.LICENSE_PLAN__DESCRIPTION:
setDescription(DESCRIPTION_EDEFAULT);
return;
+ case LicensesPackage.LICENSE_PLAN__AGREEMENTS:
+ getAgreements().clear();
+ return;
case LicensesPackage.LICENSE_PLAN__FEATURES:
getFeatures().clear();
return;
@@ -428,6 +464,8 @@ public boolean eIsSet(int featureID) {
return !Objects.equals(NAME_EDEFAULT, name);
case LicensesPackage.LICENSE_PLAN__DESCRIPTION:
return !Objects.equals(DESCRIPTION_EDEFAULT, description);
+ case LicensesPackage.LICENSE_PLAN__AGREEMENTS:
+ return agreements != null && !agreements.isEmpty();
case LicensesPackage.LICENSE_PLAN__FEATURES:
return features != null && !features.isEmpty();
case LicensesPackage.LICENSE_PLAN__PERSONAL:
@@ -456,6 +494,8 @@ public String toString() {
result.append(name);
result.append(", description: "); //$NON-NLS-1$
result.append(description);
+ result.append(", agreements: "); //$NON-NLS-1$
+ result.append(agreements);
result.append(')');
return result.toString();
}
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 cb732b181..3f7342bfd 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
@@ -882,6 +882,17 @@ public EAttribute getLicensePlan_Description() {
return (EAttribute) licensePlanEClass.getEStructuralFeatures().get(2);
}
+ /**
+ *
+ *
+ * @since 2.1
+ * @generated
+ */
+ @Override
+ public EAttribute getLicensePlan_Agreements() {
+ return (EAttribute) licensePlanEClass.getEStructuralFeatures().get(3);
+ }
+
/**
*
*
@@ -890,7 +901,7 @@ public EAttribute getLicensePlan_Description() {
*/
@Override
public EReference getLicensePlan_Features() {
- return (EReference) licensePlanEClass.getEStructuralFeatures().get(3);
+ return (EReference) licensePlanEClass.getEStructuralFeatures().get(4);
}
/**
@@ -901,7 +912,7 @@ public EReference getLicensePlan_Features() {
*/
@Override
public EReference getLicensePlan_Personal() {
- return (EReference) licensePlanEClass.getEStructuralFeatures().get(4);
+ return (EReference) licensePlanEClass.getEStructuralFeatures().get(5);
}
/**
@@ -912,7 +923,7 @@ public EReference getLicensePlan_Personal() {
*/
@Override
public EReference getLicensePlan_Floating() {
- return (EReference) licensePlanEClass.getEStructuralFeatures().get(5);
+ return (EReference) licensePlanEClass.getEStructuralFeatures().get(6);
}
/**
@@ -2043,6 +2054,7 @@ public void createPackageContents() {
createEAttribute(licensePlanEClass, LICENSE_PLAN__IDENTIFIER);
createEAttribute(licensePlanEClass, LICENSE_PLAN__NAME);
createEAttribute(licensePlanEClass, LICENSE_PLAN__DESCRIPTION);
+ createEAttribute(licensePlanEClass, LICENSE_PLAN__AGREEMENTS);
createEReference(licensePlanEClass, LICENSE_PLAN__FEATURES);
createEReference(licensePlanEClass, LICENSE_PLAN__PERSONAL);
createEReference(licensePlanEClass, LICENSE_PLAN__FLOATING);
@@ -2385,6 +2397,9 @@ public void initializePackageContents() {
initEAttribute(getLicensePlan_Description(), ecorePackage.getEString(), "description", null, 0, 1, //$NON-NLS-1$
LicensePlan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
+ initEAttribute(getLicensePlan_Agreements(), ecorePackage.getEString(), "agreements", null, 0, -1, //$NON-NLS-1$
+ LicensePlan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEReference(getLicensePlan_Features(), this.getLicensePlanFeature(), this.getLicensePlanFeature_Plan(),
"features", null, 1, -1, LicensePlan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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 a83d3aa07..1730d7db2 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
@@ -1681,6 +1681,16 @@ public interface LicensesPackage extends EPackage {
*/
int LICENSE_PLAN__DESCRIPTION = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 2;
+ /**
+ * The feature id for the 'Agreements' attribute list.
+ *
+ *
+ * @since 2.1
+ * @generated
+ * @ordered
+ */
+ int LICENSE_PLAN__AGREEMENTS = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 3;
+
/**
* The feature id for the 'Features' containment reference list.
*
@@ -1689,7 +1699,7 @@ public interface LicensesPackage extends EPackage {
* @generated
* @ordered
*/
- int LICENSE_PLAN__FEATURES = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 3;
+ int LICENSE_PLAN__FEATURES = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 4;
/**
* The feature id for the 'Personal' containment reference list.
@@ -1699,7 +1709,7 @@ public interface LicensesPackage extends EPackage {
* @generated
* @ordered
*/
- int LICENSE_PLAN__PERSONAL = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 4;
+ int LICENSE_PLAN__PERSONAL = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 5;
/**
* The feature id for the 'Floating' containment reference list.
@@ -1709,7 +1719,7 @@ public interface LicensesPackage extends EPackage {
* @generated
* @ordered
*/
- int LICENSE_PLAN__FLOATING = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 5;
+ int LICENSE_PLAN__FLOATING = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 6;
/**
* The number of structural features of the 'License Plan' class.
@@ -1718,7 +1728,7 @@ public interface LicensesPackage extends EPackage {
* @generated
* @ordered
*/
- int LICENSE_PLAN_FEATURE_COUNT = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 6;
+ int LICENSE_PLAN_FEATURE_COUNT = LICENSE_PLAN_DESCRIPTOR_FEATURE_COUNT + 7;
/**
* The number of operations of the 'License Plan' class.
@@ -3342,6 +3352,18 @@ public interface LicensesPackage extends EPackage {
*/
EAttribute getLicensePlan_Description();
+ /**
+ * Returns the meta object for the attribute list '{@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getAgreements Agreements}'.
+ *
+ *
+ * @return the meta object for the attribute list 'Agreements'.
+ * @see org.eclipse.passage.lic.licenses.model.api.LicensePlan#getAgreements()
+ * @see #getLicensePlan()
+ * @since 2.1
+ * @generated
+ */
+ EAttribute getLicensePlan_Agreements();
+
/**
* Returns the meta object for the containment reference list '{@link org.eclipse.passage.lic.licenses.model.api.LicensePlan#getFeatures Features}'.
*
diff --git a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicensePlanDescriptor.java b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicensePlanDescriptor.java
index b2adfb6c1..430824410 100644
--- a/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicensePlanDescriptor.java
+++ b/bundles/org.eclipse.passage.lic.licenses/src/org/eclipse/passage/lic/licenses/LicensePlanDescriptor.java
@@ -50,6 +50,11 @@ public interface LicensePlanDescriptor {
*/
String getDescription();
+ /**
+ * @since 2.1
+ */
+ List getAgreements();
+
/**
* Returns the "License Plan Features"
(s) contained in this license
* plan. This is the value of its "licensePlanFeatures"
reference.