From ecbe0a26d9c2fe03c36f90205e4fb302317b71c2 Mon Sep 17 00:00:00 2001
From: Stefan Herrnleben <s.herrnleben@syslex.de>
Date: Tue, 8 Aug 2017 23:30:09 +0200
Subject: [PATCH] force reference to network infrastructure on adaptation
points meta-model
---
tools.descartes.dni.adaptation/model/DNIMM3AP.xcore | 2 +-
.../src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java | 2 +-
.../src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
index a44bdb1e..a2d791ce 100644
--- a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
+++ b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
@@ -10,7 +10,7 @@ package tools.descartes.dni.dnimm3ap
class AdaptationPoints {
contains AdaptationRepository repositories
contains AdaptationGroups groups
- refers tools.descartes.dni.dnimm3.NetworkInfrastructure networkInfrastructure
+ refers tools.descartes.dni.dnimm3.NetworkInfrastructure[1] networkInfrastructure
}
//
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java
index df354dc7..a1323bbc 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java
@@ -88,7 +88,7 @@ public interface AdaptationPoints extends EObject {
* @return the value of the '<em>Network Infrastructure</em>' reference.
* @see #setNetworkInfrastructure(NetworkInfrastructure)
* @see tools.descartes.dni.dnimm3ap.DNIAPPackage#getAdaptationPoints_NetworkInfrastructure()
- * @model
+ * @model required="true"
* @generated
*/
NetworkInfrastructure getNetworkInfrastructure();
diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java
index 04c7a854..f739d8d5 100644
--- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java
@@ -1263,7 +1263,7 @@ public class DNIAPPackageImpl extends EPackageImpl implements DNIAPPackage {
initEClass(adaptationPointsEClass, AdaptationPoints.class, "AdaptationPoints", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getAdaptationPoints_Repositories(), this.getAdaptationRepository(), null, "repositories", null, 0, 1, AdaptationPoints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getAdaptationPoints_Groups(), this.getAdaptationGroups(), null, "groups", null, 0, 1, AdaptationPoints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getAdaptationPoints_NetworkInfrastructure(), theDNIPackage.getNetworkInfrastructure(), null, "networkInfrastructure", null, 0, 1, AdaptationPoints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getAdaptationPoints_NetworkInfrastructure(), theDNIPackage.getNetworkInfrastructure(), null, "networkInfrastructure", null, 1, 1, AdaptationPoints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(adaptationRepositoryEClass, AdaptationRepository.class, "AdaptationRepository", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getAdaptationRepository_Nodes(), this.getAdaptableNode(), null, "nodes", null, 0, -1, AdaptationRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
--
GitLab